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

fix: don't spawn grenade launchers installed on magazines #4192

Merged
merged 3 commits into from
Feb 5, 2024

Conversation

chaosvolt
Copy link
Member

@chaosvolt chaosvolt commented Feb 4, 2024

Purpose of change

So recently I spotted a weird lil error: when a gun spawn (like zombie soldier drops) generates the grenadier variant, it also spawns M203s attached to the spare magazines that spawn, leading to this oddity when you try to unload them:
e

Along the way I spotted another smol mistake that I figured is minor enough to bundle in this.

Describe the solution

  1. Redefined contents of military_standard_grenadier to define grenadier-specific versions of the sub-itemgroups in military_standard_assault_rifles instead of using the itemgroup wholesale, so it won't also apply the gunmod to the spare mags derp.
  2. Defined the above-mentioned variants of the relevant everyday-carry itemgroups, which spawn the relevant gun with military_accessories_grenadier added to them, then the relevant spare mags.
  3. Misc: Fixed clothing_tactical_leg having two calls to spawn hand grenade pouches instead of one call to that and a call to grenade ammo pouches.

Describe alternatives you've considered

Screaming.

Testing

  1. Checked affected files for syntax and lint errors.
  2. Ported JSON changes to test build, spawned in and debug-killed a bunch of zombie soldiers.
  3. Sifted through for grenadier-variant weapon drops, confirmed the rifles correctly have a grenade launcher attatched while the spare STANAG mags don't let me unload M203s off them.

Additional context

Checklist

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Feb 4, 2024
@chaosvolt chaosvolt merged commit 345f3b3 into cataclysmbnteam:main Feb 5, 2024
9 checks passed
@chaosvolt chaosvolt deleted the grenadier-ammo-spawn-fix branch February 5, 2024 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants