Adds the Rossi Gallery (#74724)

* Add the gun * add to item groups * Add mod support * Undo marlin 9a migration * Fix wording * Add plural of gallery * Add to item demographics * misc fix
CleverRaven · Jun 23, 2024 · 7c65121 · 7c65121
1 parent 014078a
commit 7c65121
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 4 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
@@ -462,7 +462,11 @@
   {
     "type": "item_group",
     "id": "guns_rifle_common_worn_22",
-    "items": [ { "item": "marlin_9a", "prob": 8, "charges": [ 0, 19 ] }, { "item": "ruger_1022", "prob": 28, "charges": [ 0, 10 ] } ]
+    "items": [
+      { "item": "marlin_9a", "prob": 8, "charges": [ 0, 19 ] },
+      { "item": "ruger_1022", "prob": 28, "charges": [ 0, 10 ] },
+      { "item": "rossi_gallery", "prob": 12, "charges": [ 0, 19 ] }
+    ]
   },
   {
     "type": "item_group",
@@ -537,7 +541,7 @@
   {
     "type": "item_group",
     "id": "guns_rifle_common_display_22",
-    "items": [ { "item": "ruger_1022", "prob": 160 } ]
+    "items": [ { "item": "ruger_1022", "prob": 160 }, { "item": "rossi_gallery", "prob": 18 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -1377,6 +1377,14 @@
     "ammo": 100,
     "entries": [ { "item": "marlin_9a", "charges": [ 0, 19 ] }, { "group": "on_hand_22" } ]
   },
+  {
+    "id": "nested_rossi_gallery",
+    "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": "rossi_gallery", "charges": [ 0, 15 ] }, { "group": "on_hand_22" } ]
+  },
   {
     "id": "nested_mosin44",
     "type": "item_group",

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -444,5 +444,54 @@
     ],
     "price_postapoc": "10 USD",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ]
+  },
+  {
+    "id": "rossi_gallery",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "pump action varmint rifle" },
+    "description": "A lightweight, wood framed pump action rifle, holding 15 rounds of .22 with an 18 inch barrel.  While pump actions tend to be largely shotguns, they can be made in calibers such as .22 LR.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "rossi_gallery",
+        "name": { "str": "Rossi Gallery", "str_pl": "Rossi Galleries" },
+        "description": "A modern take on the Winchester 1890, the Rossi Gallery is a .22 LR rifle, notably using a pump action.  Much like a pump action shotgun, the magazine tube is below it's 18 inch barrel and can hold 15 rounds.  While pump actions are quite often associated with shotguns, the mechanism can be applied to rifles as well, though in practice it's limited to .22 LR."
+      }
+    ],
+    "weight": "2344 g",
+    "volume": "2054 ml",
+    "longest_side": "913 mm",
+    "barrel_length": "457 mm",
+    "price": "394 USD",
+    "price_postapoc": "10 USD",
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "any", "balance": "uneven" },
+    "material": [ "steel", "wood", "aluminum" ],
+    "symbol": "(",
+    "color": "brown",
+    "range": 7,
+    "ammo": [ "22" ],
+    "skill": "rifle",
+    "ranged_damage": { "damage_type": "bullet", "amount": 3 },
+    "dispersion": 140,
+    "durability": 8,
+    "blackpowder_tolerance": 56,
+    "clip_size": 15,
+    "valid_mod_locations": [
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 2 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock mount", 1 ],
+      [ "stock accessory", 2 ],
+      [ "underbarrel mount", 1 ]
+    ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
+    "flags": [ "RELOAD_ONE", "NO_TURRET" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ],
+    "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
@@ -179,7 +179,7 @@
     "replace": "pistol_smg"
   },
   {
-    "id": [ "ruger_1022", "ruger_1022_auto", "ruger_charger_auto" ],
+    "id": [ "ruger_1022", "ruger_1022_auto", "ruger_charger_auto", "rossi_gallery" ],
     "type": "MIGRATION",
     "replace": "pistol_tiny_rifle"
   },

diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json
@@ -699,7 +699,8 @@
             "cp33": 10,
             "ruger_charger": 10,
             "ruger_charger_auto": 10,
-            "ruger_1022_auto": 10
+            "ruger_1022_auto": 10,
+            "rossi_gallery": 10
           }
         },
         {
@@ -1176,6 +1177,7 @@
             "rm51_assault_rifle": 1,
             "rm614_lmg": 1,
             "rm88_battle_rifle": 1,
+            "rossi_gallery": 1,
             "ruger_1022": 1,
             "ruger_1022_auto": 1,
             "ruger_arr": 1,

diff --git a/data/mods/classic_zombies/items/guns.json b/data/mods/classic_zombies/items/guns.json
@@ -88,5 +88,19 @@
     "name": { "str": "C6" },
     "copy-from": "m60",
     "description": "The Colt Canada C6 is a general-purpose machine gun developed to replace the .30-caliber C5 GPMG.  Heavy and difficult to handle fired from the shoulder, as most people aren't action-movie heroes."
+  },
+  {
+    "type": "GUN",
+    "id": "rossi_gallery",
+    "name": { "str": "pump action varmint rifle" },
+    "copy-from": "rossi_gallery",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "rossi_gallery",
+        "name": { "str": "Winchester 1890" },
+        "description": "The Winchester 1890 is a pump action rifle, chambered in .22 LR.  Holds 15 rounds of ammo, so go get plinking!"
+      }
+    ]
   }
 ]