Sends the Spas-12 into retirement, Mossbergs divorce, and Benellis in…

…vade (CleverRaven#72398) * fixes merge errors. * Adds the normal M2, and starts adding the tactical M2. * wrapps everything up. * recalls that I still had to make the barrel on the Mossberg 500 Field actualy longer. does this, about 2 seconds before hitting go on the PR. * fixes the first batch of obvious bugs. * Bug fixes after testing.
Ramza13 · Mar 17, 2024 · b9c4092 · b9c4092
1 parent d47777d
commit b9c4092
Show file tree

Hide file tree

Showing 6 changed files with 183 additions and 26 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1474,7 +1474,7 @@
       { "item": "3006", "prob": 5, "charges": [ 1, 20 ] },
       { "item": "ksg", "prob": 8, "charges": [ 0, 7 ] },
       { "item": "remington_870_express", "prob": 8, "charges": [ 0, 7 ] },
-      { "item": "mossberg_500", "variant": "mossberg_500_security", "prob": 8, "charges": [ 0, 6 ] },
+      { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 8, "charges": [ 0, 6 ] },
       { "item": "shot_beanbag", "prob": 25, "charges": [ 1, 10 ] },
       { "item": "rm120c", "prob": 2, "charges": [ 0, 5 ] },
       { "item": "rm20", "prob": 1, "charges": [ 0, 20 ] },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json
@@ -1948,7 +1948,7 @@
     "//": "Pick a random police shotgun.",
     "subtype": "distribution",
     "entries": [
-      { "item": "mossberg_500", "variant": "mossberg_500_security", "prob": 30 },
+      { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 30 },
       { "item": "remington_870_express", "prob": 35 },
       { "item": "mossberg_590", "variant": "mossberg_590", "prob": 23 },
       { "item": "mossberg_930", "variant": "mossberg_930", "prob": 8 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -848,6 +848,10 @@
       { "group": "nested_mossberg_500_security", "prob": 17 },
       { "group": "nested_remington_870_express", "prob": 18 },
       { "group": "nested_browning_a5", "prob": 14 },
+      { "group": "nested_benelli_m2", "prob": 17 },
+      { "group": "nested_black_eagle", "prob": 37 },
+      { "group": "nested_benelli_m2_tac", "prob": 12 },
+      { "group": "nested_slp", "prob": 6 },
       { "group": "nested_ithaca37", "prob": 6 },
       { "group": "nested_remington_1100", "prob": 17 },
       { "group": "nested_mossberg_930", "prob": 15 },
@@ -864,9 +868,27 @@
     "items": [
       { "item": "mossberg_500", "prob": 33, "charges-min": 0, "charges-max": 6 },
       { "item": "remington_870", "prob": 35, "charges-min": 0, "charges-max": 5 },
-      { "item": "mossberg_500", "variant": "mossberg_500_security", "prob": 17, "charges-min": 0, "charges-max": 6 },
+      { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 17, "charges-min": 0, "charges-max": 6 },
       { "item": "remington_870_express", "prob": 18, "charges-min": 0, "charges-max": 6 },
       { "item": "remington_870", "variant": "browning_a5", "prob": 14, "charges-min": 0, "charges-max": 5 },
+      { "item": "benelli_sa", "variant": "m2", "prob": 17, "charges-min": 0, "charges-max": 4 },
+      { "item": "benelli_sa", "variant": "sbe", "prob": 37, "charges-min": 0, "charges-max": 4 },
+      {
+        "item": "benelli_tsa",
+        "variant": "m2_tac",
+        "contents-item": [ "rail_mount" ],
+        "prob": 12,
+        "charges-min": 0,
+        "charges-max": 6
+      },
+      {
+        "item": "mossberg_590",
+        "variant": "slp",
+        "contents-item": [ "rail_mount" ],
+        "prob": 6,
+        "charges-min": 0,
+        "charges-max": 9
+      },
       { "item": "remington_870", "variant": "ithaca37", "prob": 6, "charges-min": 0, "charges-max": 5 },
       { "item": "remington_870", "variant": "remington_1100", "prob": 17, "charges-min": 0, "charges-max": 5 },
       { "item": "mossberg_930", "prob": 15, "charges-min": 0, "charges-max": 6 },
@@ -883,9 +905,13 @@
     "items": [
       { "item": "mossberg_500", "prob": 33 },
       { "item": "remington_870", "prob": 35 },
-      { "item": "mossberg_500", "variant": "mossberg_500_security", "prob": 17 },
+      { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 17 },
       { "item": "remington_870_express", "prob": 18 },
       { "item": "remington_870", "variant": "browning_a5", "prob": 14 },
+      { "item": "benelli_sa", "variant": "m2", "prob": 17 },
+      { "item": "benelli_sa", "variant": "sbe", "prob": 37 },
+      { "item": "benelli_tsa", "variant": "m2_tac", "contents-item": [ "rail_mount" ], "prob": 12 },
+      { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 6 },
       { "item": "remington_870", "variant": "ithaca37", "prob": 6 },
       { "item": "remington_870", "variant": "remington_1100", "prob": 17 },
       { "item": "mossberg_930", "prob": 15 },
@@ -905,7 +931,7 @@
       { "group": "nested_ksg-25", "prob": 8 },
       { "group": "nested_tavor_12", "prob": 5 },
       { "group": "nested_m1014", "prob": 10 },
-      { "group": "nested_SPAS_12", "prob": 2 }
+      { "group": "nested_slp", "prob": 10 }
     ]
   },
   {
@@ -919,7 +945,14 @@
       { "item": "ksg-25", "prob": 8, "charges-min": 0, "charges-max": 12 },
       { "item": "tavor_12", "prob": 5, "charges-min": 0, "charges-max": 5 },
       { "item": "mossberg_930", "variant": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
-      { "item": "mossberg_590", "variant": "SPAS_12", "prob": 2, "charges-min": 0, "charges-max": 9 }
+      {
+        "item": "mossberg_590",
+        "variant": "slp",
+        "contents-item": [ "rail_mount" ],
+        "prob": 10,
+        "charges-min": 0,
+        "charges-max": 9
+      }
     ]
   },
   {
@@ -931,7 +964,7 @@
       { "item": "ksg", "prob": 25 },
       { "item": "tavor_12", "prob": 5 },
       { "item": "mossberg_930", "variant": "m1014", "prob": 10 },
-      { "item": "mossberg_590", "variant": "SPAS_12", "prob": 2 }
+      { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10 }
     ]
   },
   {
@@ -1225,7 +1258,7 @@
         "prob": 1
       },
       {
-        "item": "mossberg_500",
+        "item": "benelli_tsa",
         "variant": "mossberg_500_security",
         "charges": [ 0, 6 ],
         "contents-item": "shoulder_strap",
@@ -1324,7 +1357,7 @@
         "prob": 1
       },
       {
-        "item": "mossberg_500",
+        "item": "benelli_tsa",
         "variant": "mossberg_500_security",
         "charges": [ 6, 6 ],
         "contents-item": "shoulder_strap",
@@ -1510,7 +1543,7 @@
       {
         "collection": [
           {
-            "item": "mossberg_500",
+            "item": "benelli_tsa",
             "variant": "mossberg_500_security",
             "charges": [ 0, 6 ],
             "contents-item": "shoulder_strap",
@@ -2112,6 +2145,16 @@
       { "item": "plr16", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "mossberg_500", "prob": 10, "charges-min": 0, "charges-max": 6 },
       { "item": "remington_870", "prob": 11, "charges-min": 0, "charges-max": 5 },
+      { "item": "benelli_sa", "variant": "m2", "prob": 7, "charges-min": 0, "charges-max": 4 },
+      { "item": "benelli_sa", "variant": "sbe", "prob": 11, "charges-min": 0, "charges-max": 4 },
+      {
+        "item": "benelli_tsa",
+        "variant": "m2_tac",
+        "contents-item": [ "rail_mount" ],
+        "prob": 4,
+        "charges-min": 0,
+        "charges-max": 6
+      },
       { "item": "remington_870", "variant": "ithaca37", "prob": 4, "charges-min": 0, "charges-max": 5 },
       { "group": "cz600", "prob": 5, "charges-min": 0, "charges-max": 10 },
       { "item": "ruger_1022", "prob": 7, "charges-min": 0, "charges-max": 10 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -2134,7 +2134,7 @@
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "mossberg_500", "variant": "mossberg_500_security", "charges-min": 0, "charges-max": 6 },
+      { "item": "benelli_tsa", "variant": "mossberg_500_security", "charges-min": 0, "charges-max": 6 },
       { "group": "on_hand_shot" }
     ]
   },
@@ -2233,12 +2233,44 @@
     "entries": [ { "item": "mossberg_930", "variant": "m1014", "charges-min": 0, "charges-max": 8 }, { "group": "on_hand_shot" } ]
   },
   {
-    "id": "nested_SPAS_12",
+    "id": "nested_slp",
     "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": "mossberg_590", "variant": "SPAS_12", "charges-min": 0, "charges-max": 9 }, { "group": "on_hand_shot" } ]
+    "//2": "The FN SLP Mk I is drilled and tapped for rail mounts: https://fnamerica.wpenginepowered.com/wp-content/uploads/2016/10/1608_FN_SLP_sellsheet_R5.pdf",
+    "entries": [
+      { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "charges-min": 0, "charges-max": 9 },
+      { "group": "on_hand_shot" }
+    ]
+  },
+  {
+    "id": "nested_benelli_m2",
+    "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": "benelli_sa", "variant": "m2", "charges-min": 0, "charges-max": 4 }, { "group": "on_hand_shot" } ]
+  },
+  {
+    "id": "nested_black_eagle",
+    "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": "benelli_sa", "variant": "sbe", "charges-min": 0, "charges-max": 4 }, { "group": "on_hand_shot" } ]
+  },
+  {
+    "id": "nested_benelli_m2_tac",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "//2": "Benelli M2 tactical shotguns are drilled and tapped for rail mounts: https://www.benelliusa.com/shotguns/m2-tactical-shotguns",
+    "entries": [
+      { "item": "benelli_tsa", "variant": "m2_tac", "contents-item": [ "rail_mount" ], "charges-min": 0, "charges-max": 6 },
+      { "group": "on_hand_shot" }
+    ]
   },
   {
     "id": "nested_rm20",

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -202,19 +202,13 @@
         "id": "mossberg_500",
         "name": { "str": "Mossberg 500 Field shotgun" },
         "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use.  It is noted for its high durability and low recoil.  This one is fitted with a 28 inch barrel with sight rib."
-      },
-      {
-        "id": "mossberg_500_security",
-        "name": { "str": "Mossberg 500 Security shotgun" },
-        "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use.  It is noted for its high durability and low recoil.  This one is fitted with an 18.5 inch barrel.",
-        "ascii_picture": "mossberg500_sec"
       }
     ],
     "ascii_picture": "mossberg500",
     "weight": "3402 g",
     "volume": "2450 ml",
     "longest_side": "1166 mm",
-    "barrel_length": "470 mm",
+    "barrel_length": "711 mm",
     "price": 53800,
     "price_postapoc": 2250,
     "to_hit": -1,
@@ -230,6 +224,7 @@
   {
     "id": "mossberg_590",
     "copy-from": "mossberg_500",
+    "looks_like": "mossberg_500",
     "type": "GUN",
     "name": { "str": "9-round combat shotgun" },
     "description": "A military oriented spin on the classic pump-action shotgun recipe, this firearm features an extended magazine tube capable of fielding nine rounds of 12 gauge shotshells.  Sporting a heavier barrel and a bayonet lug, it makes for a highly intimidating weapon, as well as a satisfying answer to most of the nasties you're liable to find in the post-apocalypse.",
@@ -241,22 +236,22 @@
         "description": "The Mossberg 590A1 is a military and police oriented version of the Mossberg 500.  It features a heavier barrel, a bayonet lug, and a different magazine tube for easier cleaning and maintenance."
       },
       {
-        "id": "SPAS_12",
-        "name": { "str": "Franchi SPAS-12 shotgun" },
-        "description": "Mean and intimidating looking, the SPAS-12 has the dubious honor of being declared a destructive device and being banned from import by name, adding to its already considerable appeal.  It is a combination pump-action and semi-automatic firearm, with an arm stabilizing hook for one handed shooting."
+        "id": "slp",
+        "name": { "str": "FN SLP MK I shotgun" },
+        "description": "An eminently practical semi-automatic shotgun, Fabrique Nationale's Mk I iteration of their Self-Loading Police brings together an 8-round magazine tube, accessory-ready picatinny rail, and comfortably rubber-padded grip surfaces.  Per the company's claims, it can dispense 8 servings of 12-gauge-diameter medicine in under a second, and, while you're not sure if that's true or even a good thing, the gun's certain to serve as a good educational tool for disciplining the dead."
       }
     ],
     "ascii_picture": "mossberg590",
     "weight": "3289 g",
     "volume": "2548 ml",
     "longest_side": "1043 mm",
-    "looks_like": "mossberg_500",
+    "barrel_length": "508 mm",
+    "//": "The true dimensions of the FN SLP are 1092 mm overall length, 558mm barrel length, and 3583 gramme weight.",
     "default_mods": [ "sights_mount", "underbarrel_mount" ],
     "price": 70000,
     "price_postapoc": 2400,
-    "barrel_volume": "0 ml",
-    "barrel_length": "508 mm",
     "clip_size": 9,
+    "barrel_volume": "0 ml",
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "bore", 1 ],
@@ -821,6 +816,91 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 6 } } ],
     "melee_damage": { "bash": 11 }
   },
+  {
+    "id": "benelli_sa",
+    "copy-from": "shotgun_base",
+    "looks_like": "remington_870",
+    "type": "GUN",
+    "name": { "str": "4-round waterfowl shotgun" },
+    "description": "This is a lanky, though relatively light, semi-automatic shotgun fitted with a plastic, dimple buttstock and forend, a representative of many such guns employed in fighting the true, greatest foe: geese.  An under-slung magazine tube retains three shells in complement with a chambered cartridge, lending the gun a somewhat modest capacity despite its durability and reliable action.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "m2",
+        "name": { "str": "Benelli M2 shotgun" },
+        "description": "Workhorse, companion, and Italian hole-puncher: the M2 forms the backbone of the Benelli's venerable line of Super 90 shotguns, utilising the company's signature inertia-driven system to snap out 12-gauge shells with alacrity.  Though possessing a 3-round magazine tube, the shotgun's dimpled, synthetic furniture, cryogenically treated barrel, and robust action capable of withstanding magnum loads make it a hardy option, even for the post-cataclysm survivor."
+      },
+      {
+        "id": "sbe",
+        "name": { "str": "Benelli SBE 3 shotgun" },
+        "description": "A relatively light, semi-automatic fowling peace finished in black furniture with trim lines and a slender forend, the Super Black Eagle (SBE) shotgun operates off of Benelli's inertia-driven recoil system.  Synonymous with versatility and reliability, it's a decades-beloved design incorporating one of the earliest actions rated to chamber 3-inch magnum shotgun shells, with this 2023 updated version coming fitted with a recoil pad."
+      }
+    ],
+    "weight": "3039 g",
+    "volume": "2600  ml",
+    "longest_side": "1213 mm",
+    "barrel_length": "660 mm",
+    "//": "Based on a 26-inch-barrel field configuration.",
+    "price": 149900,
+    "price_postapoc": 1800,
+    "clip_size": 4,
+    "//2": "The capacity of an unmodified M2 is three shells in the tube plus one in the chamber. We're assuming that the player takes the time to rack a cartridge into the chamber and top off the tube when loading in shell number 4.",
+    "durability": 10,
+    "barrel_volume": "86 ml",
+    "//3": "The number's simulating the cubic volume of a 7.5-inch stretch of 20-mm bore barrel being removed.",
+    "dispersion": 300,
+    "to_hit": -1,
+    "material": [ "steel", "aluminum", "plastic" ],
+    "default_mods": [ "recoil_stock" ],
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 2 ],
+      [ "loading port", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "stock accessory", 2 ],
+      [ "underbarrel mount", 1 ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 4 } } ]
+  },
+  {
+    "id": "benelli_tsa",
+    "copy-from": "benelli_sa",
+    "looks_like": "remington_870",
+    "type": "GUN",
+    "name": { "str": "6-round tactical shotgun" },
+    "description": "A black-finished shotgun fit for the gentlemanly pursuit of blowing very large holes through the residence of the cataclysm, be it zombie, goose, or tiny abomination, this semi-automatic longarm fields five shotgun shells within its tubular magazine.  Aesthetically pleasing with its dimpled buttstock and forend, the weapon features an underslung pistol-style grip and a gel cushion on the back of the stock for recoil mitigation.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "m2_tac",
+        "name": { "str": "Benelli M2 Tactical shotgun" },
+        "description": "Where the full-sized Benelli M2 shotgun is a hefty stallion, this mission-oriented tactical iteration is a trim race horse, with an 18.5-inch barrel, dimpled grip surfaces, and an underslung pistol grip.  Ghost-ring aperture-sights, a recoil-padded buttstock, and a cryogenically-treated barrel all join hands to ensure that you can carry out your post-cataclysm farming duties: seeding lead shot into fields of zombies."
+      },
+      {
+        "id": "mossberg_500_security",
+        "name": { "str": "Mossberg 500 Security shotgun" },
+        "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use.  It is noted for its high durability and low recoil.  This one is fitted with an 18.5 inch barrel.",
+        "ascii_picture": "mossberg500_sec"
+      }
+    ],
+    "volume": "2519  ml",
+    "longest_side": "1010 mm",
+    "barrel_length": "470 mm",
+    "//": "The true dimensions of a Mossberg 500 Security are 1003 mm in length, 457 mm in barrel length, and 3062 grammes.",
+    "price": 159900,
+    "price_postapoc": 2760,
+    "clip_size": 6,
+    "//2": "The capacity of an unmodified M2 Tactical is five shells in the tube plus one in the chamber. We're assuming that the player takes the time to rack a cartridge into the chamber and top off the tube when loading in shell number six.",
+    "barrel_volume": "0 ml",
+    "default_mods": [ "pistol_grip", "recoil_stock" ],
+    "//3": "Benelli's assumed to be coming with the ComforTech buttstock fitted.",
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 6 } } ]
+  },
   {
     "id": "slamfire_shotgun",
     "copy-from": "shotgun_base",

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -421,6 +421,7 @@
       "afs_raketa_shotgun",
       "tavor_12",
       "aa_12",
+      "benelli_tsa",
       "bigun",
       "USAS_12"
     ],
@@ -430,6 +431,7 @@
   {
     "id": [
       "shotgun_410",
+      "benelli_sa",
       "ksg",
       "ksg-25",
       "mossberg_500",