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: follow-up fixes to carry gun spawns, speedloaders, ammo belts #4838

Merged

Conversation

chaosvolt
Copy link
Member

@chaosvolt chaosvolt commented Jun 20, 2024

Checklist

Required

Purpose of change

I missed a few needed updates to carried gun groups due to lazy regex work, plus a couple other lil consistency fixes and follow-ups to Viss/Lamadus' new guns.

Describe the solution

  1. Fixed some carried gun groups lacking charges-min for their magazine spawns, causing them to spawn empty.
  2. Removed ammo percentage from some recently-added carry groups so they won't override the charges setting and always spawn full.
  3. Set the spare belts for LMG carry groups to have 1-100 charges as with all other carry groups varying in mag loadout. Minimum of 1 instead of 0 since a belt with 0 charges shouldn't exist since they all use the ammo link system.
  4. Fixed a case of wrong ammo spawning in an ammo belt.

Describe alternatives you've considered

screm

Testing

  1. Checked affected files for syntax and lint errors.
  2. Ported file change to playthrough build and load-tested.
  3. Did itemgroup tests on thge P226 and Python, confirming both now correctly generate random amounts of ammo in their mags/speedloaders when run through itemgroup test.
  4. Used my fucking eyes for once to actually confirm all relevant groups have charges-min defined for their mags.

image
image

Additional context

@chaosvolt chaosvolt enabled auto-merge (squash) June 20, 2024 05:32
@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label Jun 20, 2024
@chaosvolt
Copy link
Member Author

This now contains a fix for a mistake I made when assigning ammo to ammobelt spawns that causes an error on triggering that spawn, in addition to the fixes for the annoying but less overt empty mag/speedloader spawns, so might be good to get this one out of the way when we can.

@chaosvolt chaosvolt requested a review from scarf005 June 22, 2024 00:54
@chaosvolt chaosvolt merged commit 07455e0 into cataclysmbnteam:main Jun 22, 2024
10 checks passed
@chaosvolt chaosvolt deleted the python-and-other-carried-gun-fixes branch June 22, 2024 00:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants