Adds the Charger Pistol (#74321)

* Add the gun * Add to item groups * Readjust commonality * Adds to item_demographics * Adds mod compat * Updates skill used
CleverRaven · Jun 7, 2024 · 9461bb9 · 9461bb9
1 parent 7b4efa6
commit 9461bb9
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 6 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -26,7 +26,8 @@
       { "group": "nested_sig_mosquito", "prob": 15 },
       { "group": "nested_sw_22", "prob": 40 },
       { "group": "nested_cp33", "prob": 8 },
-      { "group": "nested_ruger_mk4", "prob": 60 }
+      { "group": "nested_ruger_mk4", "prob": 60 },
+      { "group": "nested_ruger_charger", "prob": 1 }
     ]
   },
   {
@@ -200,7 +201,8 @@
       { "item": "walther_p22", "prob": 35 },
       { "item": "ruger_lcr_22", "prob": 70 },
       { "item": "cp33", "prob": 11 },
-      { "item": "ruger_mk4", "prob": 60 }
+      { "item": "ruger_mk4", "prob": 60 },
+      { "item": "ruger_charger", "prob": 9 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -280,6 +280,19 @@
       { "group": "on_hand_22" }
     ]
   },
+  {
+    "id": "nested_ruger_charger",
+    "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": "ruger_charger", "charges": [ 0, 10 ] },
+      { "item": "ruger1022mag" },
+      { "item": "ruger1022mag", "prob": 50 },
+      { "group": "on_hand_22" }
+    ]
+  },
   {
     "id": "nested_sw_610",
     "type": "item_group",

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -498,5 +498,59 @@
       { "rigid": false, "magazine_well": "96 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger_mk4_mag" ] }
     ],
     "melee_damage": { "bash": 8 }
+  },
+  {
+    "id": "ruger_charger",
+    "looks_like": "ar_pistol",
+    "type": "GUN",
+    "//": "Stats are from https://ruger.com/products/22Charger/specSheets/4923.html",
+    "reload_noise_volume": 10,
+    "name": { "str": "varmint pistol" },
+    "description": "Essentially a varmint rifle with no stock and a shorter barrel, this gun loses out on a bit of energy with its shorter barrel and is a bit more uncomfortable to hold, but a fair bit lighter.  Includes a bipod.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger_charger",
+        "name": { "str": "Ruger 22 Charger" },
+        "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."
+      }
+    ],
+    "ascii_picture": "ruger1022",
+    "weight": "1418 g",
+    "volume": "1358 ml",
+    "longest_side": "509 mm",
+    "barrel_length": "254 mm",
+    "price": "399 USD",
+    "price_postapoc": "4 USD",
+    "to_hit": -1,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "brown",
+    "range": 3,
+    "ammo": [ "22" ],
+    "skill": "pistol",
+    "ranged_damage": { "damage_type": "bullet", "amount": 1 },
+    "dispersion": 140,
+    "durability": 8,
+    "min_cycle_recoil": 39,
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock mount", 1 ],
+      [ "stock accessory", 2 ],
+      [ "underbarrel mount", 1 ]
+    ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "built_in_mods": [ "bipod" ],
+    "pocket_data": [
+      { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger1022mag", "ruger1022bigmag" ] }
+    ],
+    "melee_damage": { "bash": 12 }
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -135,7 +135,8 @@
       "m11",
       "m18",
       "p226_9mm",
-      "sp2022"
+      "sp2022",
+      "ruger_charger"
     ],
     "type": "MIGRATION",
     "replace": "pistol_medium"

diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json
@@ -698,7 +698,8 @@
             "sw_22": 10,
             "j22": 10,
             "walther_p22": 10,
-            "cp33": 10
+            "cp33": 10,
+            "ruger_charger": 10
           }
         },
         {
@@ -1058,7 +1059,8 @@
             "walther_ppq_9mm": 1,
             "winchester_1887": 1,
             "witness_10": 1,
-            "xd_10": 1
+            "xd_10": 1,
+            "ruger_charger": 1
           }
         },
         {

diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json
@@ -397,7 +397,8 @@
       "cp33_mag",
       "cp33_mag_50",
       "ruger_mk4",
-      "ruger_mk4_mag"
+      "ruger_mk4_mag",
+      "ruger_charger"
     ]
   }
 ]