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

feat(balance): implement armor_multiplier for several shotgun-type items lacking it #6036

Merged

Conversation

chaosvolt
Copy link
Member

@chaosvolt chaosvolt commented Feb 2, 2025

Purpose of change (The Why)

This fixes some damage rebalancing that got lost along the way when AoE shotshells got tweaked a while back, and adds some other consistency updates as well.

Describe the solution (The How)

  1. Added an armor multiplier of 2 to 20x66mm shotshells, with slugs and flechettes updated accordingly. This one I didn't see being removed by revert: bring aoe shotshell again #4950 so I suspect it might just be a case where it got overlooked back when shotshells started getting armor multipliers added to them.
  2. Added the expected armor mults to all 40mm buckshot. Again, I dunno whether that just got yoinked by an even earlier PR or if it just got overlooked to begin with.
  3. Added armor mult to .410 shot.
  4. Restored flintlock shot's damage back to a rounded result of 60 damage with the standard shot armor mult.
  5. Fixed blunderbuss armor mults having somehow got done up weirdly such that slugs had worse armor multiplier than shot.
  6. We also missed ratshot entirely, oops.
  7. And added to our much-underloved shotcanisters too, varied them up a bit since their shtick seems to mainly be varying types of shot.

Describe alternatives you've considered

Try to remember how to PR into an existing PR and offer them up as direct changes in #6034

Testing

  1. Checked affected files for syntax and lint errors.
  2. Load-tested in compiled test build.
  3. Confirmed .22 ratshot still has the same listed damage as CPHP but the 3x armor multiplier typical of birdshot.
  4. Confirmed 20mm flechette correctly doesn't mention armor mult, meaning it's 1x.
  5. Checked a few other ammo items and didn't spot any oddities.

Additional context

Checklist

Mandatory

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Feb 2, 2025
Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Under the assumption that "armor_multiplier": -1 means that it's resetting flechette back to standard arpen (Because its copying from buckshot) This is fine

@chaosvolt
Copy link
Member Author

yee
image

@chaosvolt chaosvolt merged commit 70e9157 into cataclysmbnteam:main Feb 2, 2025
13 checks passed
@chaosvolt chaosvolt deleted the I-am-once-again-scrungled branch February 2, 2025 07:29
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