Fix identifier check for more guns

CleverRaven · Jun 15, 2024 · a6e5691 · a6e5691
1 parent 3a12119
commit a6e5691
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 67 deletions.
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -606,7 +606,7 @@
     "copy-from": "rifle_semi",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "5.56x45mm AK rifle" },
+    "name": { "str": "ZPAP AK-style rifle" },
     "description": "A civilian AK pattern rifle, chambered in 5.56x45 NATO.",
     "variant_type": "gun",
     "variants": [
@@ -651,14 +651,14 @@
     "copy-from": "pistol_base",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "5.56x45mm Mini Draco rifle" },
-    "description": "A civilian AK pattern rifle, chambered in 5.56x45 NATO.  This one is shorter and without a stock",
+    "name": { "str": "ZPAP Mini AK-style rifle" },
+    "description": "A civilian AK pattern rifle, chambered in 5.56x45 NATO.  This one is shorter and without a stock.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "zpap85",
         "name": { "str": "ZPAP 85 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.  This one is shorter and without a stock"
+        "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."
       }
     ],
     "weight": "2563 g",

diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
@@ -41,8 +41,8 @@
     "looks_like": "modular_ar15",
     "type": "GUN",
     "variant_type": "gun",
-    "name": { "str": "German battle rifle" },
-    "description": "A semi-automatic, domestically produce clone of an early battle rifle developed after the end of WWII.  The PTR 91 is a fantastically reliable, cheap to produce rifle that continues to serve in conflict regions.  Though the action is legendary, its handling characteristics and harsher recoil leave something to be desired.",
+    "name": { "str": "G3 battle rifle" },
+    "description": "A semi-automatic, domestically produced clone of an early battle rifle developed after the end of WWII.  Known as the PTR 91, it is a fantastically reliable, cheap to produce rifle that continues to serve in conflict regions.  Though the action is legendary, its handling characteristics and harsher recoil leave something to be desired.",
     "variants": [
       {
         "id": "g3_ptr",
@@ -360,8 +360,16 @@
     "copy-from": "rifle_auto",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "HK417 A2 rifle" },
+    "name": { "str": "HK417 rifle" },
     "description": "A German battle rifle with a 13\" barrel and telescopic stock.  It is a gas-operated, rotating bolt rifle with a short-stroke piston design similar to that of the G36.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "hk417_13",
+        "name": { "str": "HK417 A2 rifle" },
+        "description": "A German battle rifle with a 13\" barrel and telescopic stock.  It is a gas-operated, rotating bolt rifle with a short-stroke piston design similar to that of the G36."
+      }
+    ],
     "weight": "4220 g",
     "volume": "4000 ml",
     "longest_side": "914 mm",
@@ -386,8 +394,16 @@
     "copy-from": "rifle_semi",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "M110A1 rifle" },
-    "description": "A derivative of H&K's G28 with an aluminum upper receiver to meet US Army weight requirements.  It is a gas-operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.",
+    "variant_type": "gun",
+    "name": { "str": "HK417 marksman's rifle" },
+    "description": "A gas-operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition, and featuring an aluminum upper receiver for reduced weight.",
+    "variants": [
+      {
+        "id": "m110a1",
+        "name": { "str": "M110A1 rifle" },
+        "description": "A derivative of H&K's G28 with an aluminum upper receiver to meet US Army weight requirements.  It is a gas-operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition."
+      }
+    ],
     "weight": "3800 g",
     "volume": "4000 ml",
     "longest_side": "1028 mm",
@@ -411,7 +427,7 @@
     "copy-from": "rifle_semi",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "7.62x51mm AK rifle" },
+    "name": { "str": "PAP AK-style rifle" },
     "description": "A civilian AK pattern rifle, chambered in 7.62x51mm NATO.",
     "variant_type": "gun",
     "variants": [

diff --git a/data/json/items/gun/338lapua.json b/data/json/items/gun/338lapua.json
@@ -4,7 +4,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": ".338 bolt-action sniper rifle" },
+    "name": { "str": "AI bolt-action sniper rifle" },
     "description": "A high-precision bolt-action sniper rifle, in service with special operations members of the US Navy prior to the cataclysm.  Firing the powerful .338 Lapua cartridge, the weapon feeds from detachable five round Accuracy International magazines.",
     "variant_type": "gun",
     "variants": [

diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
@@ -236,8 +236,16 @@
     "copy-from": "smg_base",
     "looks_like": "hk_mp5",
     "type": "GUN",
-    "name": { "str": ".45 Luty submachine gun" },
+    "name": { "str": "MAC-10 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 .45 ACP cartridges and accepts MAC-10 compatible magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "smg_45",
+        "name": { "str": ".45 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 .45 ACP cartridges and accepts MAC-10 compatible magazines."
+      }
+    ],
     "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.",
     "weight": "3520 g",
     "volume": "1110 ml",
@@ -394,7 +402,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "Hi-Point pistol" },
+    "name": { "str": "Model JHP pistol" },
     "description": "A semi-automatic pistol chambered in .45 ACP and accepting Hi-Point magazines.",
     "variant_type": "gun",
     "variants": [

diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json
@@ -53,7 +53,7 @@
     "looks_like": "hk_mp5",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str": "5.7mm automatic PDW" },
+    "name": { "str": "P90 automatic PDW" },
     "description": "A late 90s manufactured personal defense weapon (PDW), this automatic firearm fires the high-velocity, proprietary 5.7x28mm cartridge.  Making use of top-mounted 50-round custom magazines which lock into the receiver of the weapon behind the grip, this little submachine gun packs quite the nasty payload.  Its small, high-speed caliber makes it excellent at both defeating armored opponents and firing short bursts manageably.",
     "variant_type": "gun",
     "variants": [
@@ -99,8 +99,8 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str": "high-capacity 5.7mm handgun" },
-    "description": "A large and retro-looking semi-automatic pistol firing the high-velocity 5.7x28mm cartridge, mainly constructed out of polymer-based materials.  Making use of standard 5.7x28mm 50-round magazines which are inserted horizontally over the grip, the top of the gun swings forwards and away from the frame to facilitate reloading.  If you were looking to add a touch of retro-futuristic spice to your new life in the ruins of New England, this firearm just might become your best friend.",
+    "name": { "str": "high-capacity P90 handgun" },
+    "description": "A large and retro-looking semi-automatic pistol firing the high-velocity 5.7x28mm cartridge, mainly constructed out of polymer-based materials.  Making use of standard P90 50-round magazines which are inserted horizontally over the grip, the top of the gun swings forwards and away from the frame to facilitate reloading.  If you were looking to add a touch of retro-futuristic spice to your new life in the ruins of New England, this firearm just might become your best friend.",
     "variant_type": "gun",
     "variants": [
       {
@@ -201,7 +201,7 @@
     "id": "fn_ps90",
     "copy-from": "fn_p90",
     "type": "GUN",
-    "name": { "str": "semi-automatic 5.7mm carbine" },
+    "name": { "str": "semi-automatic P90 carbine" },
     "description": "The civilian version of the older 5.7mm PDW, this carbine features a 16 inch long barrel, feeds from the same 50-round magazines as its predecessor, and is only capable of semi-automatic fire in order to keep it in line with American firearm restrictions.",
     "variant_type": "gun",
     "variants": [

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
@@ -42,9 +42,17 @@
     "copy-from": "rifle_auto",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "Beretta ARX-160 rifle" },
+    "name": { "str": "Beretta AK rifle" },
     "//": "Total unloaded weight of gun 3000 grams.  Current weight of folding stock 200 grams.",
-    "description": "The Beretta ARX-160 was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine.  It failed to replace it, but it is widely used by military all around the world.  This version is chambered for 7.62x39mm.",
+    "description": "This rifle was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine.  It failed to replace it, but it is widely used by military all around the world.  This version is chambered for 7.62x39mm.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "arx160",
+        "name": { "str": "Beretta ARX-160 rifle" },
+        "description": "The Beretta ARX-160 was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine.  It failed to replace it, but it is widely used by military all around the world.  This version is chambered for 7.62x39mm."
+      }
+    ],
     "weight": "3080 g",
     "volume": "6323 ml",
     "longest_side": "91 cm",
@@ -169,8 +177,16 @@
     "copy-from": "pistol_base",
     "looks_like": "modular_ar15",
     "type": "GUN",
-    "name": { "str": "Mini Draco \"pistol\"", "str_pl": "Mini Draco \"pistols\"" },
+    "name": { "str": "AK \"pistol\"", "str_pl": "AK \"pistols\"" },
     "description": "Essentially a semi-auto AK with a short barrel and no stock, this unwieldy \"pistol\" has seen some popularity with civilian shooters and gangbangers alike.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "draco",
+        "name": { "str": "Mini Draco \"pistol\"", "str_pl": "Mini Draco \"pistols\"" },
+        "description": "Essentially a semi-auto AK with a short barrel and no stock, this unwieldy \"pistol\" has seen some popularity with civilian shooters and gangbangers alike."
+      }
+    ],
     "weight": "2563 g",
     "volume": "1286 ml",
     "longest_side": "46 cm",
@@ -202,9 +218,17 @@
   {
     "id": "mk47",
     "type": "GUN",
-    "name": { "str": "Mk47 Mutant rifle" },
     "copy-from": "rifle_semi",
+    "name": { "str": "American AK rifle" },
     "description": "The CMMG Mk47 Mutant is an American rifle, natively chambered for 7.62x39mm ammo.  Features a characteristic free-floating handguard, with a similar action mechanism to the AR-15, repurposed for the bigger, more potent ammo.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "mk47",
+        "name": { "str": "Mk47 Mutant rifle" },
+        "description": "The CMMG Mk47 Mutant is an American rifle, natively chambered for 7.62x39mm ammo.  Features a characteristic free-floating handguard, with a similar action mechanism to the AR-15, repurposed for the bigger, more potent ammo."
+      }
+    ],
     "weight": "2540 g",
     "volume": "2300 ml",
     "longest_side": "930 mm",