Obsolete the cx4 in favor of a ruger PCC

CleverRaven · Apr 16, 2024 · ee2a016 · ee2a016
1 parent 73b6cf7
commit ee2a016
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 64 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -461,8 +461,8 @@
       { "group": "nested_garand", "prob": 1 },
       { "group": "nested_ar10", "prob": 1 },
       { "group": "nested_ar15", "prob": 15 },
-      { "group": "nested_cx4", "prob": 1 },
       { "group": "nested_ksub2000", "prob": 1 },
+      { "group": "nested_ruger_pcc", "prob": 1 },
       { "group": "nested_m1a", "prob": 1 },
       { "group": "nested_marlin_9a", "prob": 2 },
       { "group": "nested_mosin44", "prob": 1 },
@@ -506,7 +506,7 @@
       { "item": "garand", "prob": 1, "charges-min": 0, "charges-max": 8 },
       { "item": "ar10", "prob": 1, "charges-min": 0, "charges-max": 20 },
       { "group": "modular_ar15", "prob": 15, "charges-min": 0, "charges-max": 30 },
-      { "item": "cx4", "prob": 1, "charges-min": 0, "charges-max": 15 },
+      { "item": "ruger_pcc", "prob": 1, "charges-min": 0, "charges-max": 15 },
       { "item": "ksub2000", "prob": 1, "charges-min": 0, "charges-max": 15 },
       { "item": "m1a", "prob": 1, "charges-min": 0, "charges-max": 5 },
       { "item": "marlin_9a", "prob": 2, "charges-min": 0, "charges-max": 19 },
@@ -548,7 +548,7 @@
     "items": [
       { "item": "ar10", "prob": 35 },
       { "group": "modular_ar15", "prob": 45 },
-      { "item": "cx4", "prob": 30 },
+      { "item": "ruger_pcc", "prob": 30 },
       { "item": "hpt3895", "prob": 1 },
       { "item": "ksub2000", "prob": 10 },
       { "item": "remington700_270", "prob": 25 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -1360,15 +1360,15 @@
     ]
   },
   {
-    "id": "nested_cx4",
+    "id": "nested_ruger_pcc",
     "type": "item_group",
     "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "cx4", "charges-min": 0, "charges-max": 15 },
-      { "item": "m9mag" },
-      { "item": "m9mag", "prob": 50 },
+      { "item": "ruger_pcc", "charges-min": 0, "charges-max": 17 },
+      { "item": "glockmag" },
+      { "item": "glockmag", "prob": 50 },
       { "group": "on_hand_9mm" }
     ]
   },

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
@@ -49,61 +49,6 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "calicomag", "calicomag_100rd" ] } ],
     "melee_damage": { "bash": 9 }
   },
-  {
-    "id": "cx4",
-    "looks_like": "modular_ar15",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": "9x19mm pistol-caliber carbine" },
-    "description": "Designed to be a companion rifle with provided M9 handguns, this compact and light weight pistol-caliber carbine makes use of the same 9x19mm magazines.  Originally intended for use by law enforcement units, this style of small caliber, semi-automatic carbine failed to achieve the same level of popularity as regular and more potent rifles.  However, despite being inadequate for their original purpose, before the Cataclysm these modestly sized weapons still found a home in sport shooting and self-defense civilian roles.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "cx4",
-        "name": { "str": "Cx4 Storm carbine" },
-        "description": "A small pistol caliber carbine designed for police use and civilian self-defense, the Cx4 Storm uses magazines that are interchangeable with other Beretta 9x19mm handguns."
-      }
-    ],
-    "weight": "2575 g",
-    "volume": "4458 ml",
-    "longest_side": "762 mm",
-    "barrel_length": "423 mm",
-    "price": 90000,
-    "price_postapoc": 4000,
-    "to_hit": -1,
-    "material": [ "steel", "plastic" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "9mm" ],
-    "skill": "rifle",
-    "range": 6,
-    "ranged_damage": { "damage_type": "bullet", "amount": 2 },
-    "dispersion": 180,
-    "durability": 10,
-    "min_cycle_recoil": 450,
-    "barrel_volume": "250 ml",
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "stock accessory", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "item_restriction": [ "m9bigmag", "m9mag_10rd", "m9mag", "m9mag_17rd", "m9mag_18rd", "m9mag_20rd", "m9mag_32rd", "m9mag_35rd" ]
-      }
-    ],
-    "melee_damage": { "bash": 8 }
-  },
   {
     "id": "glock_19",
     "copy-from": "pistol_base",
@@ -664,6 +609,51 @@
     ],
     "melee_damage": { "bash": 8 }
   },
+  {
+    "id": "ruger_pcc",
+    "looks_like": "garand",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "Ruger PC carbine" },
+    "description": "The Ruger PC-9 Pistol Caliber Carbine is a blowback centerfire semi-automatic pistol-caliber carbine, designed as a companion to certain Ruger P series semi-automatic pistols, using the same cartridges and magazines of the P-Series pistols.",
+    "weight": "3200 g",
+    "volume": "1240 ml",
+    "longest_side": "860 mm",
+    "barrel_length": "412 mm",
+    "price": 75000,
+    "price_postapoc": 3000,
+    "to_hit": -1,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "9mm" ],
+    "skill": "rifle",
+    "range": 6,
+    "ranged_damage": { "damage_type": "bullet", "amount": 3 },
+    "dispersion": 180,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ]
+    ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ]
+      }
+    ],
+    "melee_damage": { "bash": 8 }
+  },
   {
     "id": "smg_9mm",
     "copy-from": "smg_base",

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1254,5 +1254,10 @@
     "type": "MIGRATION",
     "replace": "con_mix_foldable",
     "reset_item_vars": true
+  },
+  {
+    "id": "cx4",
+    "type": "MIGRATION",
+    "replace": "ruger_pcc"
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -141,7 +141,7 @@
     "replace": "pistol_medium"
   },
   {
-    "id": [ "cx4", "hk_mp5_semi_pistol", "ksub2000", "calico", "hk_mp5_10_semi", "TDI_10", "mp40semi", "hpt3895" ],
+    "id": [ "hk_mp5_semi_pistol", "ruger_pcc", "ksub2000", "calico", "hk_mp5_10_semi", "TDI_10", "mp40semi", "hpt3895" ],
     "type": "MIGRATION",
     "replace": "pistol_pcc"
   },

diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json
@@ -185,7 +185,6 @@
       "btmp9mag_9x19mm_30",
       "btmp9mag_9x19mm_50rd",
       "coilgun",
-      "cx4",
       "depowered_armor",
       "depowered_helmet",
       "emp_gun",
@@ -342,6 +341,7 @@
       "ruger_lcr_22",
       "22_speedloader8",
       "ruger_lcr_38",
+      "ruger_pcc",
       "38_speedloader5",
       "saiga_12",
       "saiga10mag",

diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
@@ -1005,6 +1005,7 @@ cecaelia
 cecaelian
 Celsius
 Celtic
+centerfire
 centrigrades
 centrosaurus
 CEO