Add SW 617, Ruger PCC, Marlin 60 (#79602)

* Add Ruger PCC, Marlin 60, SW 617

* Proper handling with mods

* Add guns to itemgroups

* "Generify" 617 & PCC

* Fix generic gun failure

data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json

@@ -37,7 +37,8 @@
       { "group": "nested_cp33", "prob": 16 },
       { "group": "nested_ruger_mk4", "prob": 113 },
       { "group": "nested_ruger_charger", "prob": 16 },
-      { "group": "nested_1911_22", "prob": 100 }
+      { "group": "nested_1911_22", "prob": 100 },
+      { "group": "nested_sw617", "prob": 46 }
     ]
   },
   {
@@ -201,7 +202,8 @@
       { "item": "ruger_lcr_22", "prob": 2, "charges": [ 0, -1 ] },
       { "item": "ruger_mk4", "prob": 16, "charges": [ 0, -1 ] },
       { "item": "1911_22", "prob": 20, "charges": [ 0, -1 ] },
-      { "item": "cp33", "prob": 3, "charges": [ 0, -1 ] }
+      { "item": "cp33", "prob": 3, "charges": [ 0, -1 ] },
+      { "item": "sw617", "prob": 8, "charges": [ 0, -1 ] }
     ]
   },
   {
@@ -331,7 +333,8 @@
       { "item": "cp33", "prob": 16 },
       { "item": "ruger_mk4", "prob": 113 },
       { "item": "ruger_charger", "prob": 16 },
-      { "item": "1911_22", "prob": 100 }
+      { "item": "1911_22", "prob": 100 },
+      { "item": "sw617", "prob": 46 }
     ]
   },
   {
@@ -489,7 +492,8 @@
       { "group": "nested_rossi_gallery", "prob": 11 },
       { "group": "nested_ar15_retool_22", "prob": 2 },
       { "group": "nested_rio_bravo", "prob": 15 },
-      { "group": "nested_henry_golden_boy", "prob": 31 }
+      { "group": "nested_henry_golden_boy", "prob": 31 },
+      { "group": "nested_marlin60", "prob": 20 }
     ]
   },
   {
@@ -541,7 +545,7 @@
   {
     "type": "item_group",
     "id": "guns_rifle_common_9mm",
-    "items": [ { "group": "nested_ksub2000", "prob": 100 } ]
+    "items": [ { "group": "nested_ksub2000", "prob": 84 }, { "group": "nested_rugerpcc", "prob": 100 } ]
   },
   {
     "type": "item_group",
@@ -664,7 +668,8 @@
       { "item": "marlin_9a", "prob": 3 },
       { "group": "ar15_22", "prob": 2 },
       { "item": "rio_bravo", "prob": 15 },
-      { "item": "henry_golden_boy", "prob": 31 }
+      { "item": "henry_golden_boy", "prob": 31 },
+      { "item": "marlin60", "prob": 20 }
     ]
   },
   {
@@ -717,7 +722,7 @@
   {
     "type": "item_group",
     "id": "guns_rifle_common_display_9mm",
-    "items": [ { "item": "ksub2000", "prob": 100 } ]
+    "items": [ { "item": "ksub2000", "prob": 84 }, { "item": "rugerpcc", "prob": 100 } ]
   },
   {
     "type": "item_group",

data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json

@@ -243,7 +243,8 @@
       { "group": "boxed_cp33", "prob": 16 },
       { "group": "boxed_ruger_mk4", "prob": 113 },
       { "group": "boxed_ruger_charger", "prob": 16 },
-      { "group": "boxed_1911_22", "prob": 100 }
+      { "group": "boxed_1911_22", "prob": 100 },
+      { "group": "boxed_sw617", "prob": 46 }
     ]
   },
   {
@@ -307,6 +308,13 @@
     "container-item": "box_pistol",
     "items": [ { "item": "1911_22" }, { "group": "firearm_box_extras" }, { "item": "1911_22_mag", "count": [ 1, 2 ] } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "boxed_sw617",
+    "container-item": "box_pistol",
+    "items": [ { "item": "sw617" }, { "group": "firearm_box_extras" } ]
+  },
   {
     "type": "item_group",
     "id": "guns_pistol_common_boxed_45",
@@ -818,7 +826,8 @@
           { "item": "marlin_9a", "prob": 3 },
           { "item": "rossi_gallery", "prob": 11 },
           { "item": "rio_bravo", "prob": 15 },
-          { "item": "henry_golden_boy", "prob": 31 }
+          { "item": "henry_golden_boy", "prob": 31 },
+          { "item": "marlin60", "prob": 20 }
         ]
       }
     ]
@@ -1023,7 +1032,7 @@
   {
     "type": "item_group",
     "id": "guns_rifle_common_boxed_9mm",
-    "items": [ { "group": "boxed_ksub2000", "prob": 100 } ]
+    "items": [ { "group": "boxed_ksub2000", "prob": 84 }, { "group": "boxed_rugerpcc", "prob": 100 } ]
   },
   {
     "type": "item_group",
@@ -1032,6 +1041,13 @@
     "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" },
     "items": [ { "item": "ksub2000" }, { "group": "firearm_box_extras" }, { "item": "glockmag", "count": [ 1, 2 ] } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "boxed_rugerpcc",
+    "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" },
+    "items": [ { "item": "rugerpcc" }, { "group": "firearm_box_extras" }, { "item": "glockmag", "count": [ 1, 2 ] } ]
+  },
   {
     "type": "item_group",
     "id": "guns_rifle_common_boxed_3006",

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -267,6 +267,14 @@
       { "group": "on_hand_22" }
     ]
   },
+  {
+    "id": "nested_marlin60",
+    "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": "marlin60", "charges": [ 0, 14 ] }, { "group": "on_hand_22" } ]
+  },
   {
     "id": "nested_sw_610",
     "type": "item_group",
@@ -734,6 +742,14 @@
     "ammo": 100,
     "entries": [ { "item": "rough_rider_pistol_9", "charges": [ 0, 6 ] }, { "group": "on_hand_22" } ]
   },
+  {
+    "id": "nested_sw617",
+    "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": "sw617", "charges": [ 0, 10 ] }, { "group": "on_hand_22" } ]
+  },
   {
     "id": "nested_sig_40",
     "type": "item_group",
@@ -1414,6 +1430,19 @@
       { "group": "on_hand_9mm" }
     ]
   },
+  {
+    "id": "nested_rugerpcc",
+    "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": "rugerpcc", "charges": [ 0, 15 ] },
+      { "item": "glockmag" },
+      { "item": "glockmag", "prob": 50 },
+      { "group": "on_hand_9mm" }
+    ]
+  },
   {
     "id": "nested_m1a",
     "type": "item_group",

data/json/items/gun/22.json

@@ -752,5 +752,92 @@
     "flags": [ "RELOAD_ONE", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 16 } } ],
     "melee_damage": { "bash": 12 }
+  },
+  {
+    "id": "marlin60",
+    "looks_like": "ruger1022",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "tube fed varmint rifle" },
+    "description": "A lightweight and modular pistol caliber hunting carbine, firing the low power .22 LR cartridge.  Before the Cataclysm, a mix of high customizability, cheap ammunition, and low recoil made this a very popular varmint rifle among civilian shooters.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "marlin60",
+        "name": { "str": "Marlin Model 60" },
+        "description": "The Model 60 is a semi-automatic rifle chambered in .22 LR, and looks awfully familiar to a 10/22.  However, instead of a detachable magazine, it features a tubular magazine below the barrel.  While out of production, a large number of them have been made since the 60s, making it a very commonplace rifle."
+      }
+    ],
+    "ascii_picture": "ruger1022",
+    "weight": "2500 g",
+    "volume": "2100 ml",
+    "longest_side": "953 mm",
+    "barrel_length": "483 mm",
+    "price": "250 USD",
+    "price_postapoc": "7 USD",
+    "to_hit": { "grip": "none", "length": "short", "surface": "point", "balance": "good" },
+    "material": [ "steel", "wood" ],
+    "symbol": "(",
+    "color": "brown",
+    "range": 6,
+    "ammo": [ "22" ],
+    "skill": "rifle",
+    "ranged_damage": { "damage_type": "bullet", "amount": 3 },
+    "dispersion": 110,
+    "durability": 8,
+    "min_cycle_recoil": 39,
+    "clip_size": 14,
+    "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", "fault_stovepipe", "fault_double_feed" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 14 } } ],
+    "melee_damage": { "bash": 12 }
+  },
+  {
+    "id": "sw617",
+    "copy-from": "pistol_revolver",
+    "type": "GUN",
+    "name": { "str": "high capacity revolver" },
+    "description": "A revolver chambered in .22 LR, with 10 shots and a 6 inch barrel.",
+    "ascii_picture": "redhawk",
+    "weight": "1307 g",
+    "volume": "638 ml",
+    "longest_side": "325 mm",
+    "//": "barrel length (153mm) + cylinder length (25mm)",
+    "barrel_length": "178 mm",
+    "price": "979 USD",
+    "price_postapoc": "7 USD 50 cent",
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "clumsy" },
+    "material": [ "steel" ],
+    "symbol": "(",
+    "color": "light_gray",
+    "ammo": [ "22" ],
+    "dispersion": 300,
+    "durability": 8,
+    "reload": 150,
+    "blackpowder_tolerance": 56,
+    "clip_size": 10,
+    "valid_mod_locations": [ [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock", 1 ] ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ],
+    "melee_damage": { "bash": 5 },
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "sw617",
+        "name": { "str": "S&W 617" },
+        "description": "The S&W 617 is a fine revolver, chambered in .22 LR.  However, instead of more common 6 rounds revolvers come in, this revolver has a 10 round capacity cylinder.  While still a revolver, and to boot a revolver in .22 LR, 10 is still bigger than 6."
+      }
+    ]
   }
 ]

data/json/items/gun/9mm.json

@@ -453,7 +453,7 @@
     "looks_like": "hk_mp5",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str": "Glock carbine" },
+    "name": { "str": "folding Glock carbine" },
     "description": "With its claim to fame being its ease of portability when compared to other conventional rifles and carbines, this is a uniquely-designed pistol caliber carbine sporting an integral folding mechanism and chambered for 9x19mm cartridges, making use of regular Glock compatible magazines.  With its mechanism engaged, the barrel assembly swings rearwards and causes the firearm to fold to half its regular length, packing up into a very compact package with ergonomics unfortunately having to take a backseat to allow for the weapon's extreme portability.  With a mainly polymer constructed receiver, the carbine is relatively light and incredibly transportable when fully folded.",
     "variant_type": "gun",
     "variants": [
@@ -1305,5 +1305,61 @@
       }
     ],
     "melee_damage": { "bash": 6 }
+  },
+  {
+    "id": "rugerpcc",
+    "looks_like": "modular_ar15",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "Glock carbine" },
+    "description": "A lightweight pistol caliber carbine, chambered in 9mm and accepting Glock magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "rugerpcc",
+        "name": { "str": "Ruger PCC" },
+        "description": "The Ruger PCC is a pistol caliber carbine, made by Ruger.  It's quite commonplace, thanks to its low recoil, reliability, and use of readily available magazines."
+      }
+    ],
+    "weight": "3084 g",
+    "volume": "2264 ml",
+    "longest_side": "879 mm",
+    "barrel_length": "409 mm",
+    "price": "779 USD",
+    "price_postapoc": "10 USD",
+    "to_hit": { "grip": "solid", "length": "short", "surface": "point", "balance": "good" },
+    "material": [ "steel", "plastic", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "9mm" ],
+    "skill": "rifle",
+    "range": 6,
+    "ranged_damage": { "damage_type": "bullet", "amount": 4 },
+    "dispersion": 180,
+    "durability": 8,
+    "min_cycle_recoil": 450,
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "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" ],
+    "//": "Assuming glock magwell, the other magwell for Ruger magazines can be added with the ruger pistol",
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ]
+      }
+    ],
+    "melee_damage": { "bash": 8 }
   }
 ]

data/mods/Generic_Guns/firearms/gg_firearms_migration.json

@@ -160,7 +160,17 @@
     "replace": "pistol_medium"
   },
   {
-    "id": [ "ksub2000", "calico", "hk_mp5_10_semi", "mp40semi", "hpt3895", "uberti_1873", "rossi_r92_357_16", "rossi_r92_357_20" ],
+    "id": [
+      "ksub2000",
+      "calico",
+      "hk_mp5_10_semi",
+      "mp40semi",
+      "hpt3895",
+      "uberti_1873",
+      "rossi_r92_357_16",
+      "rossi_r92_357_20",
+      "rugerpcc"
+    ],
     "type": "MIGRATION",
     "replace": "pistol_pcc"
   },
@@ -198,7 +208,7 @@
     "replace": "pistol_smg"
   },
   {
-    "id": [ "ruger_1022", "ruger_1022_auto", "ruger_charger_auto", "rossi_gallery" ],
+    "id": [ "ruger_1022", "ruger_1022_auto", "ruger_charger_auto", "rossi_gallery", "marlin60" ],
     "type": "MIGRATION",
     "replace": "pistol_tiny_rifle"
   },
@@ -217,7 +227,8 @@
       "rough_rider_pistol_9",
       "1911_22",
       "rio_bravo",
-      "henry_golden_boy"
+      "henry_golden_boy",
+      "sw617"
     ],
     "type": "MIGRATION",
     "replace": "pistol_tiny_target"