Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust military/police magazines #76016

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Conversation

Holli-Git
Copy link
Contributor

@Holli-Git Holli-Git commented Aug 28, 2024

Summary

Bugfixes "Adjust police/military magazines"

Purpose of change

Currently, large capacity magazines like drum mags can spawn inside military and police locations, despite those not being used.

Describe the solution

A) Removes some rare magazines from mags_milspec and adds the M14 in, as that magazine is still in service. Removes APC9 mags as there's a very low amount of them inside, removes the smaller mags, larger mags, and some Rivtech magazines.
B) Removes drum mags and extendos from arsenal.json, as those aren't in service.
C) Removes the MP7 from police armories. MP7s aren't in any NE police branch that I'm aware of.

Describe alternatives you've considered

Testing

Loaded into a world, didn't see any MP7s or drum mags in itemgroup testing
This is stanag_mags
image

Additional context

I was gonna do this in #75925 but figured it would be considered scope creep

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Magazines Ammo holding items and objects. Spawn Creatures, items, vehicles, locations appearing on map Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions labels Aug 28, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Aug 28, 2024
@Hyperseeker
Copy link
Contributor

Just to sanity-check this: would removing stuff from item groups reduce the spawn of the magazines removed, overall?

@Holli-Git
Copy link
Contributor Author

Just to sanity-check this: would removing stuff from item groups reduce the spawn of the magazines removed, overall?

No, unless it was a collections subtype of itemgroup

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 29, 2024
@Maleclypse Maleclypse merged commit 673d845 into CleverRaven:master Aug 29, 2024
24 checks passed
Knut-Aage-Hofseth pushed a commit to Knut-Aage-Hofseth/Cataclysm-DDA that referenced this pull request Aug 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Magazines Ammo holding items and objects. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants