Gun Pluralization Template Standardization

data/json/items/gun/22.json

@@ -260,14 +260,14 @@
     "type": "GUN",
     "reload_noise_volume": 10,
     "name": { "str": "firefly training pistol" },
-    "//": "Was the sig mosquito, has been renamed to the more common GSG firefly",
+    "//": "Was the SIG Mosquito, has been renamed to the more common GSG Firefly",
     "description": "A medium sized, .22 caliber semi-automatic pistol, for training with a pistol similar to more powerful pistols.  Built from aluminum and polymer components, the weapon is lightweight and concealable, but its chambering is not very powerful.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "sig_mosquito",
-        "name": { "str": "GSG Firefly", "str_pl": "GSG Fireflies" },
-        "description": "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."
+        "name": { "str": "GSG Firefly pistol" },
+        "description": "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."
       }
     ],
     "ascii_picture": "sig_mosquito",
@@ -395,13 +395,13 @@
       },
       {
         "id": "ruger_mk3",
-        "name": { "str": "Ruger Mark III" },
+        "name": { "str": "Ruger Mark III pistol" },
         "description": "The 3rd version of the Ruger Standard, which replaced production of the Mark II in 2005 and continued until 2016.  Features a 5.5 inch barrel and feeds from a 10 round magazine.",
         "weight": 19
       },
       {
         "id": "ruger_mk4",
-        "name": { "str": "Ruger Mark IV" },
+        "name": { "str": "Ruger Mark IV pistol" },
         "description": "The 4th, and most modern version of the Ruger Standard.  Still in production since 2016, and has a simplified disassembly feature.  Has a 5.5 inch barrel and feeds from a 10 round magazine.",
         "weight": 135
       }
@@ -439,7 +439,7 @@
     "variants": [
       {
         "id": "ruger_charger",
-        "name": { "str": "Ruger 22 Charger" },
+        "name": { "str": "Ruger 22 Charger pistol" },
         "description": "This gun is essentially a shortened 10/22, feeding from the same magazines.  While it does feature a shorter barrel and a lack of a stock, it is a fair bit lighter, and comes included with a bipod to more steadily plink away at the undead."
       }
     ],
@@ -491,7 +491,7 @@
     "variants": [
       {
         "id": "ruger_charger_auto",
-        "name": { "str": "full-auto Ruger 22 Charger" },
+        "name": { "str": "full-auto Ruger 22 Charger pistol" },
         "description": "A Ruger 22 Charger modified post-Cataclysm to selective fire.  While the .22 round isn't very powerful, full auto makes it a lot more effective, and still easily controllable in full auto even with the lack of a stock."
       }
     ],

data/json/items/gun/223.json

@@ -2,7 +2,7 @@
   {
     "id": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "AR-15" },
+    "name": { "str": "AR-15 rifle" },
     "copy-from": "rifle_auto",
     "//": "This is assumed to be the standard model matching the (currently not in-game) M16. Tileset whitelist for rifles",
     "description": "This ubiquitous rifle is the forefather of the M16 rifle series.  It is lightweight and accurate, but will malfunction if not properly maintained.  This one is a semi-automatic civilian version.",
@@ -93,7 +93,7 @@
     "copy-from": "rifle_semi",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "FS2000" },
+    "name": { "str": "FS2000 carbine" },
     "description": "A sleek bullpup carbine designed by FN Herstal, complete with an integrated sight accessory rail.  The forward ejecting action and ambidextrous controls make firing comfortable for both left and right-handed shooting.  The whole rifle is well sealed from mud and dust for reliability, but this makes it incompatible with many aftermarket magazines.",
     "weight": "3319 g",
     "volume": "7986 ml",
@@ -182,7 +182,7 @@
     "id": "scar_l",
     "copy-from": "rifle_semi",
     "type": "GUN",
-    "name": { "str": "FN SCAR-L" },
+    "name": { "str": "FN SCAR-L assault rifle" },
     "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command.  The 'L' in its name stands for light, as it uses the lightweight .223 round.",
     "ascii_picture": "scar-L",
     "weight": "3490 g",
@@ -439,7 +439,7 @@
     "variants": [
       {
         "id": "modular_m16a3",
-        "name": { "str": "M16A3 rifle" },
+        "name": { "str": "M16A3 assault rifle" },
         "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years.  It is a gas-operated, rotating bolt rifle known for its accuracy and controllable recoil.  This one is a relatively rare M16A3, with full auto capability."
       },
       {
@@ -514,7 +514,7 @@
     "variants": [
       {
         "id": "sig553",
-        "name": { "str": "SIG SG 556" },
+        "name": { "str": "SIG SG 556 rifle" },
         "description": "The SG 556 is a civilian model of the Swiss SIG SG 550 series, manufactured in New Hampshire.  It lacks any automatic fire capability and has a 16 inch barrel, but still retains a folding stock, with the feature of feeding from STANAG magazines instead of the SG 550 series magazines."
       }
     ],
@@ -612,7 +612,7 @@
     "variants": [
       {
         "id": "zpapm90",
-        "name": { "str": "ZPAP M90" },
+        "name": { "str": "ZPAP M90 rifle" },
         "description": "A Serbian-made AK pattern rifle made by Zastava in 5.56x45mm NATO.  To avoid import restrictions, Zastava USA has added a number of American-made parts."
       }
     ],

data/json/items/gun/300.json

@@ -4,7 +4,7 @@
     "copy-from": "rifle_base",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str_sp": "M2010 ESR" },
+    "name": { "str": "M2010 ESR sniper rifle" },
     "//": "http://www.guns.com/2012/05/17/remington-xm2010-army-sniper-system-esr-now-in-stores/.",
     "description": "A bolt-action, box-magazine-fed sniper rifle chambered in the powerful .300 Winchester Magnum round.  The M2010 had completely replaced the M24 rifle series by 2017.",
     "weight": "5443 g",
@@ -28,7 +28,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str_sp": "Weatherby Mark V" },
+    "name": { "str": "Weatherby Mark V rifle" },
     "//": "MSRP, believe it or not.",
     "description": "The Weatherby Mark V is one of the world's finest bolt-action rifles.  Designed in 1955 by Roy Weatherby and Fred Jennie, it has a strong action designed to safely fire high-pressure cartridges.  These rifles were presented to celebrities as part of a marketing campaign.",
     "weight": "3730 g",
@@ -67,7 +67,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str_sp": "Winchester Model 70" },
+    "name": { "str": "Winchester Model 70 rifle" },
     "description": "The Winchester Model 70 is a bolt-action sporting rifle.  It has an iconic place in American sporting culture and has been held in high regard by shooters since it was introduced in 1936.",
     "weight": "3520 g",
     "volume": "3205 ml",

data/json/items/gun/300BLK.json

@@ -4,7 +4,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "Remington ACR .300BLK" },
+    "name": { "str": "Remington ACR .300BLK carbine" },
     "description": "This carbine was developed for military use in the early 21st century.  It is damaging and accurate, though its rate of fire is a bit slower than competing carbines.  This version is chambered for the .300 AAC Blackout round.",
     "weight": "3419 g",
     "volume": "3310 ml",
@@ -55,7 +55,7 @@
     "copy-from": "rifle_semi",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "IWI Tavor X95 .300BLK" },
+    "name": { "str": "IWI Tavor X95 .300BLK assault rifle" },
     "description": "The IWI Tavor X95 (also called Micro-Tavor or MTAR) is an Israeli bullpup assault rifle designed and produced by Israel Weapon Industries.  This is the civilian version chambered for .300 AAC Blackout.",
     "weight": "3610 g",
     "volume": "2400 ml",
@@ -116,7 +116,7 @@
     "copy-from": "rifle_semi",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "SIG MCX Rattler SBR" },
+    "name": { "str": "SIG MCX Rattler SBR rifle" },
     "description": "A gas-operated rifle, with a short 5.5 inch barrel, built-in thin folding stock, and full rail mount on the upper receiver.  This particular one is a select-fire military version.",
     "weight": "2590 g",
     "volume": "2850 ml",

data/json/items/gun/338lapua.json

@@ -10,7 +10,7 @@
     "variants": [
       {
         "id": "tac338",
-        "name": { "str": "McMillan Tac-338 rifle" },
+        "name": { "str": "McMillan Tac-338 sniper rifle" },
         "description": "Chambering the .338 Lapua cartridge, the Tac-338 is a high-precision, bolt-action sniper rifle that, before the Cataclysm, complemented the arsenal of the US Navy Special Warfare unit.  Providing Navy SEAL marksmen with the capability to land effective shots on targets at a typical range of 1600 meters, a valuable capability for the long-distance engagements prevalent during the US army's war on terror, the rifle comes kitted with an adjustable cheek pad, butt hook, and muzzle break."
       }
     ],
@@ -136,7 +136,7 @@
     "variants": [
       {
         "id": "axmc",
-        "name": { "str": "Accuracy International AXMC rifle" },
+        "name": { "str": "Accuracy International AXMC sniper rifle" },
         "description": "Produced by the British precision rifle company Accuracy International, the AX Modular Caliber Weapon System is a highly-accurate combat sniper rifle offered to military, law enforcement, and civilian precision marksmen.  The rifle is compatible with a wide range of aftermarket components, including caliber conversion kits, and is built upon a base aluminum chassis, into which the weapon's parts may be installed or removed at the user's discretion."
       }
     ],

data/json/items/gun/357sig.json

@@ -4,7 +4,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "SIG P226" },
+    "name": { "str": "SIG P226 pistol" },
     "description": "A SIG Sauer P226 chambered for .357 SIG.  The P226 is a DA/SA, short-recoil operated semi-automatic pistol.",
     "weight": "964 g",
     "volume": "549 ml",
@@ -29,7 +29,7 @@
     "id": "glock_31",
     "copy-from": "glock_22",
     "type": "GUN",
-    "name": { "str": "Glock 31" },
+    "name": { "str": "Glock 31 pistol" },
     "description": "A full size .357 SIG Glock pistol.  It is extremely similar to the Glock 22, and could be converted to fire .40 S&W by switching the barrel.",
     "ascii_picture": "glock_20",
     "weight": "660 g",
@@ -46,7 +46,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "SIG P320 Compact" },
+    "name": { "str": "SIG P320 Compact pistol" },
     "description": "The P320 Compact is a semi-automatic, short recoil operated pistol.  This one is chambered for .357 SIG.",
     "ascii_picture": "sig_p320",
     "weight": "731 g",

data/json/items/gun/36paper.json

@@ -4,7 +4,7 @@
     "copy-from": "pistol_revolver_cap_ball",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": { "str_sp": "Colt M1861 Navy" },
+    "name": { "str": "Colt M1861 Navy revolver" },
     "description": "The Colt Model 1861 Navy cap & ball .36-caliber revolver was a six-shot, single-action percussion weapon produced by Colt's Manufacturing Company from 1861 until 1873.",
     "weight": "1184 g",
     "volume": "540 ml",

data/json/items/gun/38.json

@@ -4,7 +4,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str": "2 Shot Special" },
+    "name": { "str": "2 Shot Special pistol" },
     "//": "Volume+barrel length based off a Bond Arms derringer. with extra length in the barrel.",
     "description": "A crudely made double barrel pistol firing .38 Special ammo.  Unfortunately, the name is less about the double barrels and more about the number of shots you'll get before it breaks down on you.",
     "ascii_picture": "2_shot_special",
@@ -37,7 +37,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": { "str_sp": "S&W Model 10" },
+    "name": { "str": "S&W Model 10 revolver" },
     "description": "A six-shot revolver, produced since 1899 and known as the most popular handgun of the 20th century.  It has a swing-out cylinder for ease of reloading.",
     "weight": "975 g",
     "volume": "402 ml",
@@ -69,7 +69,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": { "str_sp": "Manurhin MR 73" },
+    "name": { "str": "Manurhin MR 73 revolver" },
     "description": "A finely made .357 Magnum revolver with a 4 inch barrel.  It has adjustable sights, big plastic grips and a very smooth trigger.",
     "weight": "970 g",
     "volume": "600 ml",
@@ -112,7 +112,7 @@
     "copy-from": "gun_base",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "pipe rifle: .38 Special", "str_pl": "pipe rifles: .38 Special" },
+    "name": { "str": ".38 Special pipe rifle" },
     "description": "A home-made rifle.  It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
     "ascii_picture": "ps_pipe_gun",
     "weight": "2114 g",
@@ -152,7 +152,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": { "str_sp": "Ruger LCR .38" },
+    "name": { "str": "Ruger LCR .38 revolver" },
     "description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame.",
     "weight": "382 g",
     "volume": "321 ml",
@@ -194,7 +194,7 @@
     "copy-from": "pistol_revolver",
     "//": "Tileset whitelist for revolvers.",
     "type": "GUN",
-    "name": { "str_sp": "S&W 619" },
+    "name": { "str": "S&W 619 revolver" },
     "description": "A seven-round .357 revolver sold by Smith & Wesson.  Can also fire .38 Special.  It features a fixed rear sight and a reinforced frame.",
     "ascii_picture": "sw_610",
     "weight": "1074 g",

data/json/items/gun/38super.json

@@ -4,7 +4,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str_sp": "AF2011A1 .38 Super" },
+    "name": { "str": "AF2011A1 .38 Super pistol" },
     "description": "A double-barrel semi-automatic pistol of Italian origin, firing two bullets per shot, a derivative of the M1911 pistol.",
     "weight": "2041 g",
     "volume": "716 ml",
@@ -42,7 +42,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "M1911A1" },
+    "name": { "str": "M1911A1 pistol" },
     "description": "The M1911A1 is an extremely popular pistol known for its reliability.  This one is chambered for .38 Super.",
     "weight": "1157 g",
     "volume": "462 ml",

data/json/items/gun/40.json

@@ -4,7 +4,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "Beretta 90-two .40 S&W" },
+    "name": { "str": "Beretta 90-two .40 S&W pistol" },
     "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large part to the polymer underbarrel rail cover.  This one is chambered in .40 S&W.",
     "weight": "905 g",
     "volume": "554 ml",
@@ -28,7 +28,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str_sp": "Glock 22" },
+    "name": { "str": "Glock 22 pistol" },
     "description": "A .40 S&W variant of the popular Glock 17 pistol.  The standard-issue firearm of the FBI and of countless other law enforcement agencies worldwide.",
     "ascii_picture": "glock_17",
     "weight": "645 g",
@@ -69,7 +69,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "Beretta Px4 Storm .40 S&W" },
+    "name": { "str": "Beretta Px4 Storm .40 S&W pistol" },
     "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utilizing light-weight polymer construction with steel inserts.  Its shape was also optimized for concealed carry.  This one is chambered in .40 S&W.",
     "weight": "785 g",
     "volume": "520 ml",
@@ -94,7 +94,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str_sp": "SIG Pro .40" },
+    "name": { "str": "SIG Pro .40 pistol" },
     "description": "Originally marketed as a lightweight and compact alternative to older SIG handguns, the Pro .40 is popular among European police forces.",
     "ascii_picture": "sig_pro_40",
     "weight": "822 g",
@@ -134,7 +134,7 @@
     "copy-from": "smg_base",
     "looks_like": "hk_mp5",
     "type": "GUN",
-    "name": { "str": "Luty SMG: .40 S&W", "str_pl": "Luty SMGs: .40 S&W" },
+    "name": { "str": ".40 S&W Luty SMG" },
     "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 .40 S&W cartridges and accepts custom-made makeshift magazines.",
     "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game. No factory mags until UMP40, mp5/40, or other straight .40 mags are implemented.",
     "weight": "3520 g",
@@ -174,7 +174,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "Browning Hi-Power .40 S&W" },
+    "name": { "str": "Browning Hi-Power .40 S&W pistol" },
     "description": "The Browning Hi-Power is a semi-automatic handgun developed shortly before the Second World War.  Widely issued since then, it remains in use by India, Canada, and Australia.  This is a commercial variant produced by Browning Arms in .40 S&W.",
     "weight": "907 g",
     "volume": "274 ml",
@@ -199,7 +199,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "Walther PPQ .40 S&W" },
+    "name": { "str": "Walther PPQ .40 S&W pistol" },
     "description": "The Walther PPQ is a semi-automatic pistol originating from the Walther P99QA, and maintains compatibility with some of its predecessor's accessories.  This model is chambered in .40 S&W.",
     "weight": "625 g",
     "volume": "440 ml",
@@ -229,7 +229,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str_sp": "Hi-Point Model JCP" },
+    "name": { "str": "Hi-Point Model JCP pistol" },
     "description": "The Hi-Point Model JCP is a blowback operated semi-automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable.  Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
     "weight": "990 g",
     "volume": "546 ml",

data/json/items/gun/40x46mm.json

@@ -99,7 +99,7 @@
     "copy-from": "launcher_base",
     "looks_like": "m79",
     "type": "GUN",
-    "name": { "str_sp": "Milkor MGL" },
+    "name": { "str": "Milkor MGL" },
     "description": "The Milkor Multi-Grenade Launcher is designed to compensate for the drawback of single-shot grenade launchers by allowing sustained heavy firepower.  However, it is still slow to reload and must be used with careful planning.",
     "weight": "5300 g",
     "volume": "4230 ml",