Simplified ammo naming

[Uwuewsky]

Summary

Interface "Simplify ammo names"

Purpose of change

What is the difference between 7.62x39mm and 7.62x51mm? What is 66/27.3x278 Diyua multipurpose? Is 9x18mm RG028 better than 9x18mm 57-N-181S? While I'm still working on renaming guns, I'll publish the renaming of ammunition in a more simplified manner, as is already done for guns.

Describe the solution

Some cartridges have had designations removed/changed. Using the example of the cartridges already available, the remaining cartridges, where applicable, were renamed according as FMJ, JHP/JSP, AP, P+ and a few others. Some ammo now have more descriptive names.
Ok, at the end of the day PR is basically making sure the ammo, ammo types, and casings match up with each other.

Table of changes

OLD:	NEW:
H&K 12mm	H&K 12mm slug
.22 FMJ	.22 LR FMJ
.22 FMJ, reloaded	.22 LR FMJ, reloaded
.22 FMJ, matchhead powder	.22 LR FMJ, matchhead powder
5.56 NATO Mk 262	5.56x45mm NATO Mk 262
5.56 NATO Mk318	5.56x45mm NATO Mk318
5.56 NATO M855	5.56x45mm NATO M855
5.56 NATO M855A1	5.56x45mm NATO M855A1
5.56 NATO tracer	5.56x45mm NATO tracer
5.56 NATO M995	5.56x45mm NATO M995 AP
5.56 NATO, black powder	5.56x45mm NATO, black powder
5.56 NATO tracer, black powder	5.56x45mm NATO tracer, black powder
5.56 NATO, reloaded	5.56x45mm NATO, reloaded
5.56 NATO tracer, reloaded	5.56x45mm NATO tracer, reloaded
7.62x51mm M80	7.62x51mm NATO M80
7.62x51mm NATO M993	7.62x51mm NATO M993 AP
7.62x51mm, black powder	7.62x51mm NATO, black powder
7.62x51mm tracer, black powder	7.62x51mm NATO tracer, black powder
7.62x51mm, reloaded	7.62x51mm NATO, reloaded
7.62x51mm tracer, reloaded	7.62x51mm NATO tracer, reloaded
.30 Carbine, black powder	.30 Carbine FMJ, black powder
.30 Carbine, reloaded	.30 Carbine FMJ, reloaded
.30 Carbine, matchhead powder	.30 Carbine FMJ, matchhead powder
.32 ACP, black powder	.32 ACP FMJ, black powder
.32 ACP, reloaded	.32 ACP FMJ, reloaded
.32 ACP, matchhead powder	.32 ACP FMJ, matchhead powder
.410 000 shot	.410 buckshot
.410 000 shot, reloaded	.410 buckshot, reloaded
.410 000 shot, black powder	.410 buckshot, black powder
.410 scrap shot	.410 scrap shot, reloaded
.44 Magnum, reloaded	.44 Magnum JHP, reloaded
.44 Magnum, black powder	.44 Magnum JHP, black powder
.45 FMJ, reloaded	.45 ACP FMJ, reloaded
.45 FMJ, matchhead powder	.45 ACP FMJ, matchhead powder
.450 Xtreme Hunter, reloaded	.450 Bushmaster Xtreme Hunter, reloaded
.45-70 +P penetrator	.45-70 +P
.45-70 +P penetrator, reloaded	.45-70 +P, reloaded
.458 WM JSP	.458 Winchester Magnum
.458 WM, reloaded	.458 Winchester Magnum, reloaded
.458 WM, black powder	.458 Winchester Magnum, black powder
4.6x30mm	4.6x30mm AP
5.45x39mm FMJ	5.45x39mm Soviet FMJ
5.45x39mm 7N6	5.45x39mm Soviet AP
5.45x39mm, reloaded	5.45x39mm Soviet FMJ, reloaded
5.45x39mm AP, reloaded	5.45x39mm Soviet AP, reloaded
5.45x39mm, black powder	5.45x39mm Soviet FMJ, black powder
5.45x39mm AP, black powder	5.45x39mm Soviet AP, black powder
5.7x28mm, black powder	5.7x28mm FMJ, black powder
5.7x28mm, reloaded	5.7x28mm FMJ, reloaded
7.62x39mm FMJ	7.62x39mm Soviet FMJ
7.62x39mm JHP	7.62x39mm Soviet JHP
7.62x39mm JHP, reloaded	7.62x39mm Soviet JHP, reloaded
7.62x39mm JHP, black powder	7.62x39mm Soviet JHP, black powder
7.62x39mm FMJ, reloaded	7.62x39mm Soviet FMJ, reloaded
7.62x39mm FMJ, black powder	7.62x39mm Soviet FMJ, black powder
7.62x25mm JHP	7.62x25mm Tokarev FMJ
7.62x25mm FMJ hot load	7.62x25mm Tokarev +P
7.62x25mm Type P	7.62x25mm Tokarev Type P
7.62x25mm FMJ, black powder	7.62x25mm Tokarev FMJ, black powder
7.62x25mm FMJ, reloaded	7.62x25mm Tokarev FMJ, reloaded
7.62x25mm FMJ, matchhead powder	7.62x25mm Tokarev FMJ, matchhead powder
7.7x58mm Japanese JSP	7.7x58mm Arisaka JSP
7.7x58mm Japanese JSP, black powder	7.7x58mm Arisaka JSP, black powder
7.7x58mm Japanese JSP, reloaded	7.7x58mm Arisaka JSP, reloaded
84x245mm HE	84x245mm HE cartridge
84x245mm HEDP	84x245mm HEDP cartridge
84x245mm smoke	84x245mm smoke cartridge
8x40mm FMJ	8x40mm caseless FMJ
8x40mm SCX	8x40mm caseless SCX
9x18mm 57-N-181S	9x18mm Makarov FMJ
9x18mm SP-7	9x18mm Makarov +P+
9x18mm RG028	9x18mm Makarov AP
9x18mm, black powder	9x18mm Makarov FMJ, black powder
9x18mm FMJ, black powder	9x18mm Makarov AP, black powder
9x18mm, reloaded	9x18mm Makarov FMJ, reloaded
9x18mm +P+, reloaded	9x18mm Makarov +P+, reloaded
9x18mm FMJ, reloaded	9x18mm Makarov AP, reloaded
9x18mm FMJ, matchhead powder	9x18mm Makarov AP, matchhead powder
9x18mm, matchhead powder	9x18mm Makarov FMJ, matchhead powder
12.3ln, reloaded	12.3ln round, reloaded
12.3ln, black powder	12.3ln round, black powder
27.3x110 Diyua canister	27.3x110 Diyua buckshot
27.3x44 Diyua star	27.3x44 Diyua flare grenade
27.3x44 Diyua practice	27.3x44 Diyua practice grenade
27.3x44 Diyua thermobaric	27.3x44 Diyua thermobaric grenade
27.3x44 Diyua high explosive	27.3x44 Diyua high explosive grenade
66/27.3x278 Diyua multipurpose	66/27.3x278 Diyua multipurpose rocket
3.3 naval, FMJ	3.3 naval FMJ
12 gauge buckshot, scrap loaded	12 gauge scrap shot, reloaded
12 gauge, black powder, scrap loaded	12 gauge scrap shot, black powder

Describe alternatives you've considered

Testing

The game loads successfully. The modified dialog with ammo conversion at the gunsmith also works.

Additional context

[RenechCDDA]

I skimmed through it. This is not a comprehensive review.

I can see some reasoning behind this PR, but overall I don't like a lot of the choices you're making here. Just my personal opinion.

[Holli-Git]

Overall I find this PR to be kinda vague and contradicting in its goals. I see it's trying to simplify ammo names, but why? What's the goal? Changing 30-06 M2 AP to 30-06 AP doesn't really change anything.

[kevingranade]

We are using the real names of these rounds and in most cases that is not subject to change.

I stopped reviewing individual entries after the first few because nearly everything I've was seeing is not an ok change.

In broad strokes

1. cartridge length is part of the name and should not be removed.
2. Designations like CB, LR, AUTO, Cowboy, S&W, and many more are part of the name and should not be removed or replaced.
3. Ammunition type designations like FMJ, HEAT, and others are terms of art, not vague descriptors. The specificity is better.

[ZhilkinSerg]

This looks like it does not belong to a base game, so I strongly advise you to create a mod for the changes you desire.

[github-actions]

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

Click to expand

• .410 birdshots
• .410 birdshots, black powder
• .410 birdshots, reloaded
• .410 buckshots
• .410 buckshots, black powder
• .410 buckshots, reloaded
• 27.3x110 Diyua buckshots
• 27.3x110 Diyua flockshots
• 40x46mm M118 buckshots, black powder
• 40x46mm M118 buckshots, reloaded
• 40x46mm M199 buckshots, black powder
• 40x46mm M199 buckshots, reloaded
• 40x46mm buckshots
• 40x53mm buckshots, black powder
• 40x53mm buckshots, reloaded

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.