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

Adding the rare gun H&K USC 45 carbine #58636

Merged
merged 7 commits into from Jun 26, 2022

Conversation

Ilurker
Copy link
Contributor

@Ilurker Ilurker commented Jun 22, 2022

Summary

Content "Adds rare gun - H&K USC 45 Carbine"

Purpose of change

Adds the uncommon, civilian carbine variant of the UMP submachine gun, the USC 45 Carbine. This fills a neglected role for 45 ACP ammunition, which does not have any rifles in its niche, while providing the interesting addition of a high-accurary, low damage long gun.

Describe the solution

Adds the USC 45 carbine and its magazines to the rare gun spawn tables. All stats were pulled from manufacturer pages whenever possible and damage was assigned per the table under GAME_BALANCE.md

Describe alternatives you've considered

Feeling kind of sad whenever I loot yet another UMP I'll never use.

Testing

Spawned all items and verified they behaved as expected.

Additional context

https://hk-usa.com/hk-models/usc/
https://promagindustries.com/hk-usc-45-acp-carbine-10-rd-black-polymer/
https://promagindustries.com/hk-usc-45-acp-carbine-15-rd-black-polymer/
https://promagindustries.com/hk-usc-45-acp-carbine-20-rd-black-polymer/
https://hk-usa.com/wp-content/uploads/USC-Operators-Manual-8_3_20.pdf

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Magazines Ammo holding items and objects. Spawn Creatures, items, vehicles, locations appearing on map astyled astyled PR, label is assigned by github actions labels Jun 22, 2022
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jun 22, 2022
@github-actions github-actions bot added Mods Issues related to mods or modding Mods: Generic Guns Anything to do with Generic Guns labels Jun 22, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 23, 2022
Copy link
Contributor

@bombasticSlacks bombasticSlacks left a comment

Choose a reason for hiding this comment

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

Looks good to me. I'm sleepy so I'll let at least 1 more set of eyes get on it

Ilurker and others added 2 commits June 22, 2022 22:33
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
@TheShadowFerret
Copy link
Contributor

No bonus range like the CX4 Storm gives to 9mm?

@Ilurker
Copy link
Contributor Author

Ilurker commented Jun 23, 2022

No bonus range like the CX4 Storm gives to 9mm?

That's a good point. Does anyone know the formula being used to determine range increases like that? Average carbine range seems to be approximately 36, it looks like the CX4 boosts the 9mm to 32. Applying the same +20 modifier would land the range of the USC at exactly 36 as well.

@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jun 23, 2022
@bombasticSlacks bombasticSlacks merged commit a64c5c9 into CleverRaven:master Jun 26, 2022
tornikeo pushed a commit to tornikeo/Cataclysm-DDA that referenced this pull request Jun 26, 2022
* Add USC 45 carbine

* Always with the linting

* Generic guns migration already

* Text style

* Update data/json/items/gun/45.json

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>

* Update data/json/items/gun/45.json

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>

* Added range increase

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Drew4484 pushed a commit to Drew4484/Cataclysm-DDA that referenced this pull request Jun 26, 2022
* Add USC 45 carbine

* Always with the linting

* Generic guns migration already

* Text style

* Update data/json/items/gun/45.json

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>

* Update data/json/items/gun/45.json

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>

* Added range increase

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
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 Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Magazines Ammo holding items and objects. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Generic Guns Anything to do with Generic Guns Mods Issues related to mods or modding Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants