Skip to content

Shot ammo mass value fix #1833

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.

Sign up for GitHub

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

Jump to bottom
Merged
SamaelGray merged 4 commits into from
Sep 7, 2022
Merged

Shot ammo mass value fix #1833

SamaelGray merged 4 commits into from
Sep 7, 2022

Conversation

@SamaelGray
Copy link
Contributor

@SamaelGray SamaelGray commented Sep 7, 2022 •
edited
Loading

Changes

  • Fixed the shot ammo mass value formula which was incorrectly calculated in the spreadsheet due to it not taking pellet counts into account when calculating cartridge mass. The new formula is included in the linked spreadsheet which correctly calculates cartridge mass based on pellet counts.
  • Changed the 23x75mm shot shells from firing # 1 shots to 00 buck.

References

Testing

Check tests you have performed:

  • Compiles without warnings
  • Game runs without errors

@SamaelGray SamaelGray requested review from a team as code owners September 7, 2022 10:52
@github-actions
Copy link

github-actions bot commented Sep 7, 2022

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-3007036037.zip

@github-actions github-actions bot added the Download in Comments This PR has a zipfile download available. label Sep 7, 2022
@github-actions
Copy link

github-actions bot commented Sep 7, 2022

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-3007087419.zip

@github-actions
Copy link

github-actions bot commented Sep 7, 2022

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-3007092387.zip

Airomeda
Airomeda previously approved these changes Sep 7, 2022
View reviewed changes
Copy link
Contributor

@Airomeda Airomeda left a comment

Choose a reason for hiding this comment

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

ready for a merge.

@github-actions
Copy link

github-actions bot commented Sep 7, 2022

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-3009073165.zip

@Airomeda Airomeda self-requested a review September 7, 2022 16:06
@SamaelGray SamaelGray merged commit e9241fc into Development Sep 7, 2022
@SamaelGray SamaelGray deleted the ItsSamGray-BuckshotAmmo branch September 7, 2022 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Airomeda Airomeda Airomeda approved these changes

Assignees

No one assigned

Labels

Download in Comments This PR has a zipfile download available.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@SamaelGray @Airomeda