Adds Uberti 1873

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -194,6 +194,7 @@
       { "group": "guns_rifle_common_762", "prob": 230 },
       { "group": "guns_rifle_common_9mm", "prob": 180 },
       { "group": "guns_rifle_common_3006", "prob": 149 },
+      { "group": "guns_rifle_common_357", "prob": 108 },
       { "group": "guns_rifle_common_44", "prob": 81 },
       { "group": "guns_rifle_common_762R", "prob": 70 },
       { "group": "guns_rifle_common_270win", "prob": 57 },
@@ -231,6 +232,7 @@
       { "group": "guns_rifle_common_display_762", "prob": 230 },
       { "group": "guns_rifle_common_display_9mm", "prob": 180 },
       { "group": "guns_rifle_common_display_3006", "prob": 149 },
+      { "group": "guns_rifle_common_display_357", "prob": 108 },
       { "group": "guns_rifle_common_display_44", "prob": 81 },
       { "group": "guns_rifle_common_display_762R", "prob": 70 },
       { "group": "guns_rifle_common_display_270win", "prob": 57 },

data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json

@@ -554,6 +554,13 @@
       { "group": "nested_m1903", "prob": 26 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_rifle_common_357",
+    "items": [
+      { "group": "nested_uberti_1873", "prob": 100 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "guns_rifle_common_44",
@@ -721,6 +728,13 @@
       { "item": "m1903", "prob": 26 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_rifle_common_display_357",
+    "items": [
+      { "item": "uberti_1873", "prob": 100 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "guns_rifle_common_display_44",

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -1665,6 +1665,14 @@
     "ammo": 100,
     "entries": [ { "item": "rossi_r92_44_20", "charges": [ 0, 10 ] }, { "group": "on_hand_44" } ]
   },
+  {
+    "id": "nested_uberti_1873",
+    "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": "uberti_1873", "charges": [ 0, 10 ] }, { "group": "on_hand_357" } ]
+  },
   {
     "id": "nested_m14ebr",
     "type": "item_group",

data/json/items/gun/38.json

@@ -351,5 +351,49 @@
       }
     ],
     "melee_damage": { "bash": 6 }
+  },
+  {
+    "id": "uberti_1873",
+    "copy-from": "rifle_manual",
+    "looks_like": "modular_ar15",
+    "type": "GUN",
+    "name": { "str": ".357 lever-action rifle" },
+    "description": "This fine lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 20\" barrel with a tube fed magazine.  Go get 'em cowboy!",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "uberti_1873",
+        "name": { "str": "Uberti 1873" },
+        "description": "The 1873 is a rifle platform developed all the way in, unsurprisingly, 1873.  This one is a fairly faithful Uberti reproduction, although the original 1873s pre-dated .357 Magnum, and even .38 Special.  This one has a case-hardened finish, wood furniture, and octagonal barrel."
+      }
+    ],
+    "//": "Stats from the .357 Short Rifle https://www.uberti-usa.com/cartridge-rifles/1873-rifle-and-carbine",
+    "weight": "3719 g",
+    "volume": "2718 ml",
+    "longest_side": "1117 cm",
+    "barrel_length": "508 mm",
+    "price": "1429 USD",
+    "price_postapoc": "15 USD",
+    "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" },
+    "material": [ "steel", "wood" ],
+    "color": "dark_gray",
+    "range": 7,
+    "ammo": [ "357mag", "38" ],
+    "dispersion": 140,
+    "durability": 8,
+    "blackpowder_tolerance": 32,
+    "clip_size": 10,
+    "valid_mod_locations": [
+      [ "grip", 1 ],
+      [ "mechanism", 2 ],
+      [ "sights mount", 1 ],
+      [ "sling", 1 ],
+      [ "stock mount", 1 ],
+      [ "rail mount", 1 ],
+      [ "underbarrel mount", 1 ]
+    ],
+    "flags": [ "NO_TURRET" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "357mag": 10, "38": 10 } } ],
+    "melee_damage": { "bash": 12 }
   }
 ]

data/mods/Generic_Guns/firearms/gg_firearms_migration.json

@@ -155,7 +155,17 @@
     "replace": "pistol_medium"
   },
   {
-    "id": [ "hk_mp5_semi_pistol", "ksub2000", "calico", "hk_mp5_10_semi", "TDI_10", "mp40semi", "hpt3895", "draco_9mm" ],
+    "id": [
+      "hk_mp5_semi_pistol",
+      "ksub2000",
+      "calico",
+      "hk_mp5_10_semi",
+      "TDI_10",
+      "mp40semi",
+      "hpt3895",
+      "draco_9mm",
+      "uberti_1873"
+    ],
     "type": "MIGRATION",
     "replace": "pistol_pcc"
   },

data/mods/TEST_DATA/item_demographics.json

@@ -767,7 +767,7 @@
             "bren2_762": 1
           }
         },
-        { "type": "357mag", "weight": 34, "items": { "sw_619": 1, "rp63": 1, "chiappa_rhino": 1 } },
+        { "type": "357mag", "weight": 34, "items": { "sw_619": 1, "rp63": 1, "chiappa_rhino": 1, "uberti_1873": 1 } },
         {
           "type": "shot",
           "weight": 26,
@@ -1173,6 +1173,7 @@
             "tac338": 1,
             "tac50": 1,
             "trex_gun": 1,
+            "uberti_1873": 1,
             "vz58_p": 1,
             "vz58ts": 1,
             "weatherby_5": 1,