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

New guns #38683

Merged
merged 40 commits into from
Apr 11, 2020
Merged

New guns #38683

merged 40 commits into from
Apr 11, 2020

Conversation

GennFaol
Copy link
Contributor

@GennFaol GennFaol commented Mar 10, 2020

Summary

SUMMARY: Content "Adds 1 new shotgun, 2 new handguns in 2 different calibers for a total of 4, and a French assault rifle."

Purpose of change

To add more guns.

Describe the solution

Guns were implemented, with values derived via tools and methods supplied by Discord-User Tonkatsu/everything-in-10mm. New magazines were added where appropriate with values similarly derived. Guns and magazines were added to itemgroups with the chance of spawning decided by comparing to other items within the same itemgroup.

The volume of the KSG was lowered because it was too high compared to the volume of the bigger KSG-25, and the new volume was derived via the same process Tonkatsu used.

Guns added were:

KSG-25: A long-barreled version of the KSG, with equally longer mag tubes. Technically has a 24+1 capacity.
Beretta 90two: A more modern-looking variation of the Beretta 92, though the almost futuristic-looking part is just a cover for the underbarrel rail. Added the 9mm and the .40 S&W version.
Beretta Px4: Another neat-looking Beretta, this one using more lightweight polymer parts. Added the 9mm and the .40 S&W version.
FAMAS: Specifically the FAMAS G2, which uses STANAG-compatible magazines. Was used mostly by the French armed forces as well as some others, so any occurrences of it ingame are probably the work of illegal importation.

Describe alternatives you've considered

Not implementing the guns?

Testing

Loaded a new world with the aforementioned changes, used the debug feature to test item group spawning, spawned in the items themselves to test if they worked. No problems were discovered.

Some values may require tweaking after feedback, but all were set in good faith and based on information provided by the manuals, reviews, and derived from tools supplied by the aforementioned user whose Github handle I am sadly unaware of.

Additional Context

KSG-25: Weight 4200g, Overall length 965.2mm, Width 56mm: https://www.keltecweapons.com/firearms/shotguns/ksg/
Surface Area:
KSG-25

90two: Weight 920g, Overall length 216mm, Width 38mm: https://usarmorment.com/pdf/90%20two_eng.pdf
Surface Area:
90two

Px4: Weight 785g, Overall length 192mm, Width 36mm: http://gunsmanuals.com/wp-content/plugins/pdfjs-viewer-shortcode/pdfjs/web/viewer.php?file=http%3A%2F%2Fgunsmanuals.com%2Fwp-content%2Fuploads%2F2017%2F03%2Fberetta_px4.pdf&download=true&print=true&openfile=false
Surface Area:
Px4

FAMAS: Weight 3610g, Overall length 757mm, Width 44mm(approximation because finding any real information was impossible): http://nazarian.no/images/wep/461_MAS_223_en_manual.pdf
Surface Area:
FAMAS

Prevalence for all guns save the FAMAS was decided by comparing listings on Gunbroker.com against other guns in the same group. Unfortunately as I wasn't aware I should list it, I did not write down which guns I compared them against and might have to try and reverse-engineer the result.

GennFaol added 7 commits March 7, 2020 23:04
A handful of guns I was missing in the game, starting with the big brother of the KSG, the ridiculous KSG-25.
Added the Beretta 90two and the Px4 Storm, in both 9mm and .40 S&W variations. Also added appropriate magazines for the .40 S&W variants. 9mm share the M9 magazine, for now.
Added the FAMAS G2. Quite how it ended up in New England, we'll never know... should be sufficiently rare to suggest possible illegal important by a crazy gun collector, but values may require tweaking.
Linted guns.json
GennFaol and others added 3 commits March 10, 2020 14:43
@ZhilkinSerg ZhilkinSerg added 0.E Content Freeze [JSON] Changes (can be) made in JSON Ranged Ranged (firearms, bows, crossbows, throwing), balance, tactics labels Mar 10, 2020
GennFaol and others added 3 commits March 11, 2020 20:10
Added a proprietary magazine for the MAS 223.
Fixed missing closing bracket.
GennFaol and others added 8 commits March 11, 2020 20:19
Resolved conflict (hopefully).
Added separate mag for the Px4 as well as the necessary GG migration/blacklist entries.
Forgot to actually change the probability before.
@GennFaol
Copy link
Contributor Author

I've added a separate magazine for the Px4. Its weight in itemgroups was determined by comparing it to the M1911 magazine and comparing results on Gunbroker.com, resulting in the following calculation:
(25)*59/27=~55

25 is the current weight of the M1911 mag, 59 the number of results specifically for the Px4 17rd magazine when searching for Px4 17rd with only the Pistol Magazines & Pistol Clips category selected, 27 the number of results when doing the same for M1911. While the M1911 was specifically suggested by tenmillimaster as a good comparison, that would make the Px4 magazine the magazine with the highest weight in the common magazine itemgroup. I'd like to hear people's opinions on if this needs adjusting and how.

I have also not yet added the FAMAS/MAS 223 magazine to the itemgroups tables, and I am debating if I even should, as it does not necessarily seem like something you can easily get your hands on. I have only really found complete sets of the Century imports for sale, and those tend to go for upwards of 20,000 USD. They do come with an extra magazine. Otherwise I only found one person who sold a single magazine separately, for the price of 115 USD. Personally, that makes it seem to me as if the magazine is not something you'd just find on its own anywhere, but on the other hand, the aforementioned sets do come with 2 magazines.

@kevingranade kevingranade merged commit c5b249c into CleverRaven:master Apr 11, 2020
@GennFaol GennFaol deleted the New-Guns branch April 11, 2020 08:10
@ghost ghost mentioned this pull request Jun 18, 2020
@ghost ghost mentioned this pull request Jun 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON Ranged Ranged (firearms, bows, crossbows, throwing), balance, tactics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants