Gun Pluralization Template Standardization

[sadenar]

Summary

Content "Standardizing most guns to follow the same pluralization template"

Purpose of change

Some previous incomplete passes among the guns within the project changed the way we pluralize multiple copies of a given gun from:

• [gun name]s

To:

• [gun name] + [kind of gun (pistol/rifle/shotgun...)]s

This PR just applies this template to every gun I could find that wasn't already pluralized like this within vanilla CDDA as well as Aftershock and Magiclysm.

Describe the solution

Pluralization template applied everywhere it made sense with what I thought was the closest and most fitting "type" of firearm to the given gun, although I'm by no means a gun person so perhaps @DoctorBoomstick may have comments on my choices.

Did not add obviously redundant descriptors behind abbreviations such as GL or HMG, this is subject to discussion, it just didn't feel necessary.

Removed almost every str_sp gun name string as this pluralization template makes them obsolete.

May impact or conflict with #74530 ? @anothersimulacrum

Describe alternatives you've considered

• Add gun types behind obvious abbreviations
• Keep this merged with a misc string fixes PR I was working on, decided it was too big to keep it together
• Get a bit more specific on some weapons and their types and less on others

Testing

Simple string changes.

Additional context

[github-actions]

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

Click to expand

• FN Five-seveN suppressor pistol
• FN Five-seveN suppressor pistols
• GSG Firefly pistol
• GSG Firefly pistols
• Milkor MGLs
• Pistolet modèle Gardes de la Marine flintlock pistols
• Pistolet modèle Gardes de la Marine flintlock pistolss
• SIG SG 556 rifle
• SIG SG 556 rifles
• The GSG Firefly is a .22 semi-automatic handgun. While the GSG Firefly started off as the SIG Mosquito, after the Mosquito ceased production, German Sport Guns picked it up and renamed it to the Firefly.
• av-22 laser pistol
• av-22 laser pistols

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.

[John-Candlebury]

I rather dont like this for aftershock. Most the guns are non standard enough that the clarifier is actually a source of confusion.

Example: The Gibson S86. is either an auto shotgun, a grenade launcher or an M2 HMG equivalent depending on the ammo you load.

I think it would be best to exclude the mod from this.

[DoctorBoomstick]

On the whole, vanilla looks great. Most of the comments I left are with regards to elements of the names present before your changes, but that might be wise to address while you are fiddling with names and adding extra words.

[sadenar]

Applied all changes suggested by Boomstick and should have reverted all the fiddling I did with Aftershock as per Candlebury's request.

[anothersimulacrum]

Can you remove the ids of all the guns you've touched in this PR from this list?

Cataclysm-DDA/tools/json_tools/gun_variant_validator.py

Line 126 in 3a12119

NAME_CHECK_BLACKLIST = {

[anothersimulacrum]

You have merge conflicts that need to be resolved.

[Holli-Git]

Machine pistol is a specific term for automatic pistols. The Charger is semi-automatic

[Holli-Git]

I honestly do not like this, as I think the name of a gun should be the name of the gun and nothing more. Adding the extra "rifle", "pistol", etc feels weird for brand name guns, as people who already know about the firearm, either from previous knowledge or just remembering know it as "Oh, AK? That's a rifle" or "P226? That's a pistol", and this new system makes it redundant. For people who don't know, but don't mind the bit of learning can inspect the gun either from range or from close. The generic named guns should be the naming system to cover for people who aren't familiar with guns or want on-sight recognition, or both.

These two naming systems should remain more separate, and it can also bring up some issues of naming. "Should I call this a revolver, a handgun, a machine pistol?" "Should this be a carbine, or a rifle?", "Is this a battle rifle or a hunting rifle?", "Is this a PDW, an SMG?". I think the best way to do this would be to have it based off of the skill of the gun, and nothing else. So just "handgun", "shotgun", etc, but that also has issues for different platforms in different calibers.

I understand where this is coming from, but IMO I think it should be worked the opposite way instead. Though, this is just my own personal opinion, I may be in the minority here.

[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.

[Night-Pryanik]

Closing as stale. If you wish to continue working on this, ping me to reopen.