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

Misc gun damage fix #68815

Merged
merged 6 commits into from
Oct 23, 2023
Merged

Conversation

Holli-Git
Copy link
Contributor

@Holli-Git Holli-Git commented Oct 22, 2023

Summary

Bugfixes "Adjust damage bonuses of guns"

Purpose of change

Some gun damages felt off, so I fixed it. Also made the streetsweeper no longer a burst fire weapon, and the bootleg shotgun no longer has -2 damage, as the terminator gun I assume it was based off of still had a barrel of 18 inches

Describe the solution

Plug all the numbers into that calc and put those numbers in the game.

Describe alternatives you've considered

Vehicular manslaghter

Testing

Done did tested done dided worked'd fine

Additional context

image
Marlin SBL ^
image
1874 Sharps ^
image
Colt lightning ^ (Both 26 and 24.5 barrels rounded to the extra 10 damage)
image
Mini draco ^ My heart burns.
image
SKS ^ (Assumed a 20 inch barrel)
image
Henry Big Boy

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Oct 22, 2023
@Maleclypse Maleclypse merged commit 6280104 into CleverRaven:master Oct 23, 2023
detahramet pushed a commit to detahramet/Cataclysm-DDA that referenced this pull request Nov 6, 2023
* Update 44.json

* Update 4570.json

* Update 45colt.json

* Update shot.json

* Update 762.json

* Update shot.json
Maleclypse pushed a commit to Maleclypse/Cataclysm-DDA that referenced this pull request Nov 16, 2023
* Update 44.json

* Update 4570.json

* Update 45colt.json

* Update shot.json

* Update 762.json

* Update shot.json
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) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants