gun renaming

data/json/items/gun/10mm.json

@@ -10,7 +10,7 @@
     "variants": [
       {
         "id": "sw_610",
-        "name": { "str": "S&W 610 revolver" },
+        "name": { "str": "S&W 610" },
         "description": "The Smith and Wesson 610 is a classic six-shooter revolver chambered for 10mm rounds, or for S&W's own .40 round."
       }
     ],
@@ -45,13 +45,13 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_19",
     "type": "GUN",
-    "name": { "str": "compact Glock pistol" },
+    "name": { "str": "Glock compact pistol" },
     "description": "A small pistol accepting Glock magazines and chambered in 10mm.  Because of its size, it is easy to carry, but it has rather fierce recoil.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "glock_29",
-        "name": { "str": "Glock 29 pistol" },
+        "name": { "str": "Glock 29" },
         "description": "A modestly sized version of the highly successful Glock, chambered in hard-hitting 10mm Auto.  It is easy to carry because of its small size, but also recoils fiercely."
       }
     ],
@@ -90,7 +90,7 @@
     "variants": [
       {
         "id": "glock_20",
-        "name": { "str": "Glock 20 pistol" },
+        "name": { "str": "Glock 20" },
         "description": "A full-sized version of the highly successful Glock, chambered in hard-hitting 10mm Auto.  The third model of Glock designed, all other full-sized, large framed Glocks are adaptations of this one."
       }
     ],
@@ -117,13 +117,13 @@
     "copy-from": "glock_20",
     "looks_like": "glock_20",
     "type": "GUN",
-    "name": { "str": "hunter Glock pistol" },
+    "name": { "str": "Glock hunter pistol" },
     "description": "A full-sized, long-slide version of the highly successful Glock, chambered in hard-hitting 10mm Auto.  The extra barrel length makes for slightly more accurate and powerful shots, and the extra slide length means the sights are a little easier to use.  It also features Glock's Modular Optic System, making aftermarket optics much easier to mount.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "glock_40",
-        "name": { "str": "Glock 40 pistol" },
+        "name": { "str": "Glock 40" },
         "description": "A full-sized, long-slide version of the highly successful Glock, chambered in hard-hitting 10mm Auto.  The extra barrel length makes for slightly more accurate and powerful shots, and the extra slide length means the sights are a little easier to use."
       }
     ],
@@ -147,7 +147,7 @@
     "variants": [
       {
         "id": "hk_mp5_10_semi",
-        "name": { "str": "BA10 rifle" },
+        "name": { "str": "BA10" },
         "description": "The MP5/10 served the FBI briefly alongside their 10mm Auto pistols, adding to the caliber's overall mystique.  Though the gun's usage was short-lived, a handful of clones were made and sold occasionally.  This semi-automatic clone manufactured by Brethren Arms features a welded-on M1913 rail and a collapsible arm brace."
       }
     ],
@@ -176,7 +176,7 @@
     "variants": [
       {
         "id": "m1911_10",
-        "name": { "str": "Colt Delta Elite pistol" },
+        "name": { "str": "Colt Delta Elite" },
         "description": "A modernized, match-grade variant of the venerable M1911 chambered in hard-hitting 10mm Auto.  Early variants were known to crack frames; modern 1911s, like this one, are slotted to prevent such crack formation."
       }
     ],
@@ -209,7 +209,7 @@
     "variants": [
       {
         "id": "witness_10",
-        "name": { "str": "EAA Witness 10mm pistol" },
+        "name": { "str": "EAA Witness", "str_pl": "EAA Witnesses" },
         "description": "The EAA Witness is a modified variant of the CZ-75, produced in Italy by Tanfoglio.  This is the standard steel framed version chambered in 10mm Auto."
       }
     ],
@@ -239,7 +239,7 @@
     "variants": [
       {
         "id": "p220_10",
-        "name": { "str": "SIG P220 10mm pistol" },
+        "name": { "str": "SIG P220" },
         "description": "The SIG Sauer P220 was developed for the Swiss military in 1975, and its simplified action was later used in most other SIG Sauer designs, including the P226.  The all-steel construction adds heft to this model, which is chambered in hard-hitting 10mm Auto."
       }
     ],
@@ -271,7 +271,7 @@
     "variants": [
       {
         "id": "xd_10",
-        "name": { "str": "XD-M Competition 10mm pistol" },
+        "name": { "str": "XD-M Competition" },
         "description": "Designed by HS Produkt in Croatia, the HS2000 has become a commercial success for Springfield Armory, who imports and markets it as the eXtreme Duty.  The XD has since been offered in a variety of chamberings and sizes, including this full-sized match grade variant in 10mm Auto."
       }
     ],
@@ -308,7 +308,7 @@
     "variants": [
       {
         "id": "TDI_10",
-        "name": { "str": "Vector SDP 10mm pistol" },
+        "name": { "str": "Vector SDP" },
         "description": "The Vector SDP is a delayed blowback \"pistol\" with a unique, downward reciprocating bolt that helps combat muzzle climb.  This one is chambered in 10mm Auto."
       }
     ],
@@ -334,7 +334,7 @@
     "variants": [
       {
         "id": "STI_DS_10",
-        "name": { "str": "STI Tactical 2011 DS 10mm pistol" },
+        "name": { "str": "STI Tactical 2011 DS" },
         "description": "A next-gen model of the venerable 1911, ready to win World War Z.  Modernized and manufactured by Staccato, sporting a double-stack magwell, sleek solid-steel frame, and ergonomic grip; favored by certain dog-loving assassins.  This model is chambered in 10mm Auto.",
         "weight": 1
       }

data/json/items/gun/20x66mm.json

@@ -11,7 +11,7 @@
     "variants": [
       {
         "id": "rm120c",
-        "name": { "str": "RM120c shotgun" },
+        "name": { "str": "RM120c" },
         "description": "Utilizing a powerful and unusual caliber, the Rivtech RM120c caseless pump-action shotgun was designed for hunting big game, with durability and ease of use as priorities."
       }
     ],
@@ -58,7 +58,7 @@
     "variants": [
       {
         "id": "rm20",
-        "name": { "str": "RM20 autoshotgun" },
+        "name": { "str": "RM20" },
         "description": "Utilizing a powerful and unusual caliber, the Rivtech RM20 caseless automatic combat shotgun was designed with durability and overwhelming power in mind."
       }
     ],
@@ -105,7 +105,7 @@
     "variants": [
       {
         "id": "rm228",
-        "name": { "str": "RM228 PDW" },
+        "name": { "str": "RM228" },
         "description": "Chambering the powerful 20x66mm caseless shotgun cartridge, the Rivtech RM228 PDW was designed for the civilian personal defense market with durability and ease of use as priorities.  While lauded for its small size and light weight, its hefty price tag kept it out of the reach of casual collectors."
       }
     ],

data/json/items/gun/22.json

@@ -10,7 +10,7 @@
     "variants": [
       {
         "id": "marlin_9a",
-        "name": { "str": "Marlin 39A rifle" },
+        "name": { "str": "Marlin 39A" },
         "description": "The oldest and longest-produced shoulder firearm in the world.  Though it fires the weak .22 round, it is highly accurate and damaging, and has essentially no recoil."
       }
     ],
@@ -103,7 +103,7 @@
     "variants": [
       {
         "id": "ruger_1022",
-        "name": { "str": "Ruger 10/22 rifle" },
+        "name": { "str": "Ruger 10/22" },
         "description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters.  Even though it fires the weak .22 round, it's perfectly capable of killing."
       }
     ],
@@ -169,7 +169,7 @@
     "variants": [
       {
         "id": "ruger_1022_auto",
-        "name": { "str": "full-auto Ruger 10/22 rifle" },
+        "name": { "str": "full-auto Ruger 10/22" },
         "description": "A Ruger 10/22 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."
       }
     ],
@@ -187,7 +187,7 @@
     "variants": [
       {
         "id": "ruger_lcr_22",
-        "name": { "str": "Ruger LCR .22 revolver" },
+        "name": { "str": "Ruger LCR .22" },
         "description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame."
       }
     ],
@@ -211,7 +211,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str": "firefly training pistol" },
+    "name": { "str": "Firefly training pistol" },
     "//": "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",
@@ -266,7 +266,7 @@
     "variants": [
       {
         "id": "walther_p22",
-        "name": { "str": "Walther P22 pistol" },
+        "name": { "str": "Walther P22" },
         "description": "The Walther P22 is a blowback operated semi-automatic pistol intended for training with a platform very similar to more defensive handguns.  It is about half the size of most Walthers.  It is made mostly with plastic, with the slide and key components (other than the barrel) being made of die-cast zinc alloy."
       }
     ],
@@ -299,7 +299,7 @@
       {
         "id": "cp33",
         "name": { "str": "CP33" },
-        "description": "The Kel-Tec CP33, standing for Competition Pistol 33, is a .22 semi automatic pistol targeted towards competition shooters and recreational shooters alike, with the ability to feed from 33 round quad stack magazines, or even 50 with an extension.  While in a fairly weak cartridge, the capacity makes it quite a formidable weapon in the right hands."
+        "description": "The Kel-Tec CP33, standing for Competition Pistol 33, is a .22 semi-automatic pistol targeted towards competition shooters and recreational shooters alike, with the ability to feed from 33 round quad stack magazines, or even 50 with an extension.  While in a fairly weak cartridge, the capacity makes it quite a formidable weapon in the right hands."
       }
     ],
     "weight": "669 g",

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.",
@@ -69,18 +69,18 @@
     "variants": [
       {
         "id": "modular_h&k416a5",
-        "name": { "str": "H&K416 A5 rifle" },
+        "name": { "str": "H&K416 A5" },
         "description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable."
       },
       {
         "id": "modular_m27iar",
-        "name": { "str": "M27 IAR carbine" },
+        "name": { "str": "M27 IAR" },
         "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.",
         "ascii_picture": "m27_iar"
       },
       {
         "id": "modular_m38dmr",
-        "name": { "str": "M38 DMR rifle" },
+        "name": { "str": "M38 DMR" },
         "description": "The M38 Designated Marksman Rifle is an M27 IAR, itself derived from a H&K416, selected for accuracy, and outfitted with a variable power scope and a QDSS suppressor."
       }
     ],
@@ -111,7 +111,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",
@@ -177,7 +177,7 @@
     "looks_like": "modular_ar15",
     "type": "GUN",
     "name": { "str": "SL8 civilian rifle" },
-    "description": "A semi-automatic clone of an older German assault rifle.  Due to importation bans, it is semi-auto and can only feed from 10 round magazines.",
+    "description": "The SL8 is an importation-legal gun similar to the German G36, made to be semi-auto only, and to only feed from 10 round single stack magazines.  It also features a distinctive thumbhole stock, a polymer handguard, and a top rail for mounting optics.",
     "weight": "3901 g",
     "volume": "3919 ml",
     "longest_side": "987 mm",
@@ -304,13 +304,13 @@
     "variants": [
       {
         "id": "modular_m4a1",
-        "name": { "str": "M4A1 carbine" },
+        "name": { "str": "M4A1" },
         "description": "A popular carbine, long used by the US military.  Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.",
         "ascii_picture": "modular_m4a1"
       },
       {
         "id": "m4_cqbr",
-        "name": { "str": "Mk 18 CQBR carbine" },
+        "name": { "str": "Mk 18 CQBR" },
         "description": "This is a shorter M4 carbine with a 10.3 inch barrel, intended for confined spaces and close quarters battle situations.",
         "weight": 0
       }
@@ -347,7 +347,7 @@
     "variants": [
       {
         "id": "modular_m16a4",
-        "name": { "str": "M16A4 rifle" },
+        "name": { "str": "M16A4" },
         "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."
       }
     ],
@@ -375,12 +375,12 @@
     "variants": [
       {
         "id": "modular_m16a3",
-        "name": { "str": "M16A3 rifle" },
+        "name": { "str": "M16A3" },
         "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."
       },
       {
         "id": "modular_acr",
-        "name": { "str": "Remington ACR carbine" },
+        "name": { "str": "Remington ACR" },
         "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."
       }
     ],
@@ -593,7 +593,7 @@
     "variants": [
       {
         "id": "zpap85",
-        "name": { "str": "ZPAP 85 rifle" },
+        "name": { "str": "ZPAP 85" },
         "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.  This one is shorter and without a stock."
       }
     ],
@@ -637,7 +637,7 @@
     "variants": [
       {
         "id": "mdrx",
-        "name": { "str": "Desert Tech MDRX carbine" },
+        "name": { "str": "Desert Tech MDRX" },
         "description": "Bringing a compact, highly modular, and soft-recoiling weapon system to the table, the Desert Tech Micro Dynamic Rifle Extreme (MDRX) is a gas-operated bullpup carbine originally unveiled in 2014, with this updated model of the weapon having been released in 2019.  One of the rifle's most notable features is the utter simplicity of swapping the carbine's chambering, with an easy change of the barrel, bolt, and a handful of other components being all the steps required to chamber the MDRX for either .223 Remington, .308 Winchester, or .300 AAC Blackout."
       }
     ],
@@ -710,7 +710,7 @@
     "variants": [
       {
         "id": "bren2_556",
-        "name": { "str": "CZ Bren 2 carbine" },
+        "name": { "str": "CZ Bren 2" },
         "description": "Hailing from the Czech Republic, this modular carbine supplanted the older CZ 805 rifle within Czech military use, improving upon the former's features and bringing fully ambidextrous controls, a streamlined design, and an easily adjustable gas system to the table.  Chambered for the 5.56x45mm NATO cartridge, this particular weapon possesses a 16.5-inch barrel and is a civilian MS, 'modular semi-automatic,' model.  Incorporating a number of US-made parts, the weapon features a removable muzzle break rather than the flash hider that comes standard with military rifles."
       }
     ],
@@ -779,7 +779,7 @@
     "variants": [
       {
         "id": "cz600",
-        "name": { "str": "CZ 600 TRAIL rifle" },
+        "name": { "str": "CZ 600 TRAIL" },
         "description": "A handy bolt-action offering from CZ, the 600 Trail is a box magazine-fed ranch rifle that utilizes an aluminum chassis to keep its overall heft to a minimum.  Possessing an extendable buttstock, extensive modularity, and a quick-swap barrel assembly switchable to accommodate the firing of either .223 or 7.62x39mm ammunition, the rifle was intended for use by backpackers, trail hikers, and preppers."
       }
     ],
@@ -822,7 +822,7 @@
     "variants": [
       {
         "id": "rdb_223",
-        "name": { "str": "Kel-Tec RDB rifle" },
+        "name": { "str": "Kel-Tec RDB" },
         "description": "This is a semi-automatic bullpup rifle with a lightened body due to the use of polymers and aluminum, using standard magazines from the AR-15 platform and the 5.56 NATO cartridge.  The name stands for rifle, downward-ejection, bullpup, and its design was intended to incorporate some technical solutions, such as downward case ejection and convenience for left-handers, to solve some problems with bullpup guns.  However, the good idea's execution is not as perfect as the manufacturer (and user) would like.  No good idea from Kel-Tec is immune to Kel-Tec manufacturing issues, sadly."
       }
     ],

data/json/items/gun/270win.json

@@ -10,7 +10,7 @@
     "variants": [
       {
         "id": "remington700_270",
-        "name": { "str": "Remington 700 .270 Win rifle" },
+        "name": { "str": "Remington 700 .270 Win" },
         "description": "A classic bolt-action rifle chambered for .270 Winchester, very popular among hunters.  This is a CDL SF model with a forged, fluted, 416 stainless steel barrel threaded into the receiver and a recessed bolt face.  It has checkered walnut furniture and a recoil pad to reduce perceived recoil."
       }
     ],