Gun Naming Standardization

[Uwuewsky]

Summary

None

Purpose of change

Rename new guns to match documentation.

Describe the solution

#74787 (comment)

Describe alternatives you've considered

Testing

The game loads correctly.

Additional context

Some (actually most of them) general names are not general enough and still include the full name of the weapon.

[Holli-Git]

That documentation is for when the gun brand names are off. You're changing the name for when gun brand names are on

[Uwuewsky]

Oh wait, that's right. But all other variants are named according to the same rules.

If we should rename it back, then we need to do this for every variant. This PR just brings names to the general style for now.

[github-actions]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

[Uwuewsky]

Okay, I did it differently now.
Variants (with the firearm brands option enabled) no longer have the gun type in the name: Colt Model 635
Without this option, they do: H&K MP5A2 submachine gun
Now they all have a plural form with "-s": Calico M960s/Glock 40s/Colt Delta Elites but Mossberg 500s Security. Google sources say that this is how it should be, but I'm not sure myself.

Small things:
Combined several descriptions into one.
We had two .357 revolvers. I renamed them and removed the variants. Although they generally have the same parameters, in order to combine them as variants of one.
Renamed and added variants for Exodii magazines.
Brought several names to a common style.
Removed .45 Luty variant to be consistent with other calibers of this weapon.

[Holli-Git]

Why remove the variants for the Luty and 357 revolvers?

[Uwuewsky]

Why remove the variants for the Luty

All other Luty for different calibers also have no brand names. Probably because it is a makeshift firearm.

Cataclysm-DDA/data/json/items/gun/9mm.json

Lines 644 to 645 in 293f801

	"name": { "str": "STEN Luty submachine gun" },
	"description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using advanced powered hand tools; likely one of the most complex guns that is feasible to make outside of a machine shop, but still very unreliable. This one is chambered for 9x19mm cartridges and accepts STEN-compatible magazines.",

357 revolvers

Because I moved the brand name to the general one. But sure I can return them back if necessary.

[Holli-Git]

All other Luty for different calibers also have no brand names. Probably because it is a makeshift firearm.

It's still called a "luty", the non-brand name is to make it clear it accepts MAC-10 magazines

Because I moved the brand name to the general one. But sure I can return them back if necessary.

Isn't this defeating the purpose of the non-brand names option?

[Uwuewsky]

The .357 revolver variants are back, with one of them being slightly renamed instead.

[Uwuewsky]

Fixed a couple of things and updated names in old_guns form Bombastic Perks, which btw had priority over the names from the core game, at least in translations. These changes have also been tested.

[esotericist]

i don't think removing the type identifiers from any of the weapons improves anything. someone can want to see brand names and still not have all of the weapon types memorized.

[github-actions]

Auto-requesting reviews from non-collaborators: @bombasticSlacks

[github-actions]

Auto-requesting reviews from non-collaborators: @jbytheway

[github-actions]

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand

• .45 USPs
• A mahoosive rifle of military pedigree, fitted with a telescopic gun scope peeking over its giant cocking mechanism and resting upon a bipod to control recoil from the equally big .50-calibre munitions it is designed for. Originally employed for detonating unexploded ordnance in combat conditions and defeating light vehicular and structural targets, in the post-Cataclysm it serves as an admirable conduit of kinetic energy to the biggest and baddest of the new world's critters.
• Accuracy International AXMCs
• Barrett MRAD SMRs
• Brogyagas
• Brogyekis '23
• CZ 600 TRAILs
• CZ 805 Brens
• Desert Tech MDRXs
• Essentially a giant steel box with a long barrel peering from one end and dual spade grips mounted upon the other, this venerable machine gun design served the United States military since the First World War, mounted on everything from tanks to patrol boats to aircraft, and even tripod-mounted for stand-alone use. Part and parcel with its size and munition payload of .50-calibre ammo belts, however, is the fact that, to operate it, one must mount it upon suitable furniture, terrain features, or vehicles.
• FN Five-seveN
• FN Five-seveNs
• FN SLPs MK I
• Glock 19Ms MOS
• H&K UMPs
• Hi-Point Model JHPs
• Hub 01 FSPs
• Kel-Tec KSGs
• Kel-Tec RDBs
• Kel-Tec RFBs
• Lee-Enfields No. 4 Mk I
• M1 Garands
• M27 IARs
• Makarov PMs
• Marlin 1895 SBLs
• Milkor MGLs
• Mk 18 CQBRs
• Mosin-Nagant 1891/30-EBRs
• Mosin-Nagant M44-EBRs
• Mossberg 930 SPXs
• PAs md. 68
• PAs md. 71z
• Ree 3.3
• Ree 3.3 4-round magazine
• Ree 3.3 4-round magazines
• Ree 3.3 53-round box magazine
• Ree 3.3 53-round box magazines
• Rees 3.3
• Rossi RP63
• Rossi RP63s
• Rubik's PAs md. 68
• Ruger LCRs .22
• Ruger M77 Hawkeyes
• Ruger Redhawks
• Rugers Mark II
• Rugers Mark III
• Rugers Mark IV
• SMLEs No. 1 Mk III
• Sapras '36
• Vector SDPs
• mountable PAs md. 68

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary

• If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
• For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.