Shotguns once again (#74642)

* add dp12, srm 1216 * obsolete ksg and ts12 gunmods in favor of straight 14/15 rd mags * remove gunmods from gg migration * Thank you, Boomstick! Co-authored-by: DoctorBoomstick <[email protected]> * ’ -> ' --------- Co-authored-by: DoctorBoomstick <[email protected]>
CleverRaven · Jun 22, 2024 · 5750b86 · 5750b86
1 parent c144e61
commit 5750b86
Show file tree

Hide file tree

Showing 13 changed files with 160 additions and 110 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -560,6 +560,8 @@
     "subtype": "distribution",
     "entries": [
       { "group": "nested_ksg", "prob": 50 },
+      { "group": "nested_dp_12", "prob": 3 },
+      { "group": "nested_srm_1216", "prob": 2 },
       { "group": "nested_tavor_12", "prob": 5 },
       { "group": "nested_m1014", "prob": 10 },
       { "group": "nested_slp", "prob": 10 },
@@ -574,6 +576,8 @@
     "subtype": "distribution",
     "entries": [
       { "item": "ksg", "prob": 50, "charges": [ 0, 7 ] },
+      { "item": "srm_1216", "prob": 1, "charges": [ 0, 16 ] },
+      { "item": "dp_12", "prob": 2, "charges": [ 0, 14 ] },
       { "item": "tavor_12", "prob": 5, "charges": [ 0, 5 ] },
       { "item": "mossberg_930", "variant": "m1014", "prob": 10, "charges": [ 0, 8 ] },
       { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10, "charges": [ 0, 9 ] },
@@ -588,6 +592,8 @@
     "entries": [
       { "item": "ksg", "prob": 25 },
       { "item": "tavor_12", "prob": 5 },
+      { "item": "srm_1216", "prob": 3 },
+      { "item": "dp_12", "prob": 4 },
       { "item": "mossberg_930", "variant": "m1014", "prob": 10 },
       { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10 },
       { "item": "mossberg_590m", "prob": 2 }

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -480,6 +480,7 @@
     "id": "mags_shotgun_rare",
     "//": "Aftermarket or otherwise uncommon shotgun magazines excluding milspec.",
     "items": [
+      { "item": "srm_1216_mag_16", "prob": 2 },
       { "item": "saiga10mag", "prob": 50 },
       { "item": "saiga30mag", "prob": 10 },
       { "item": "saiga410mag_10rd", "prob": 30 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -2090,6 +2090,27 @@
     "ammo": 100,
     "entries": [ { "item": "shotgun_s", "charges": [ 0, 1 ] }, { "group": "on_hand_shot" } ]
   },
+  {
+    "id": "nested_dp_12",
+    "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": "dp_12", "charges": [ 0, 14 ] }, { "group": "on_hand_shot" } ]
+  },
+  {
+    "id": "nested_srm_1216",
+    "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": "srm_1216", "charges": [ 0, 16 ] },
+      { "item": "srm_1216_mag_16" },
+      { "item": "srm_1216_mag_16", "prob": 50 },
+      { "group": "on_hand_shot" }
+    ]
+  },
   {
     "id": "nested_ksg",
     "type": "item_group",

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -67,13 +67,13 @@
     "looks_like": "remington_870",
     "type": "GUN",
     "name": { "str": "compact bullpup shotgun" },
-    "description": "This pump-action shotgun uses a system of twin magazines to carry 14 total rounds of 12-gauge shotgun shells.  Each tube must be loaded separately, but this offers the option of loading different ammunition for different situations.  As the weapon's trigger is situated forwards of the chamber in what is termed as a 'bullpup' design, the firearm's notably more compact than its peers despite having a higher capacity when compared against more classically designed shotguns.",
+    "description": "This pump-action shotgun uses a system of twin magazines to carry 14 total rounds of 12-gauge shotgun shells.  As the weapon's trigger is situated forwards of the chamber in what is termed as a 'bullpup' design, the firearm's notably more compact than its peers despite having a higher capacity when compared against more classically designed shotguns.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "ksg",
         "name": { "str": "Kel-Tec KSG shotgun" },
-        "description": "A bullpup pump-action shotgun, the Kel-Tec KSG uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations."
+        "description": "A bullpup pump-action shotgun, the Kel-Tec KSG uses a pair of magazine tubes to increase its capacity."
       }
     ],
     "ascii_picture": "ksg",
@@ -89,7 +89,6 @@
     "sight_dispersion": 500,
     "durability": 7,
     "clip_size": 7,
-    "built_in_mods": [ "ksg_aux_shotgun" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "brass catcher", 1 ],
@@ -101,7 +100,7 @@
       [ "sling", 1 ],
       [ "underbarrel", 2 ]
     ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 7 } } ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 14 } } ],
     "melee_damage": { "bash": 9 }
   },
   {
@@ -644,7 +643,7 @@
     "copy-from": "shotgun_base",
     "type": "GUN",
     "name": { "str": "auto-loading bullpup shotgun" },
-    "description": "Looking more like some form of sci-fi prop gun than an actual firearm, this weapon uses a system of three different magazines to field 15 12-gauge shotgun shells within a comparatively compact design.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.  As the weapon's trigger assembly is situated forwards of the chamber and magazines in what is termed as a 'bullpup' design, the firearm's notably more compact than its peers despite having a higher capacity when compared against more classically designed shotguns.",
+    "description": "Looking more like some form of sci-fi prop gun than an actual firearm, this weapon uses a system of three different magazines to field 15 12-gauge shotgun shells within a comparatively compact design.  As the weapon's trigger assembly is situated forwards of the chamber and magazines in what is termed as a 'bullpup' design, the firearm's notably more compact than its peers despite having a higher capacity when compared against more classically designed shotguns.",
     "variant_type": "gun",
     "variants": [
       {
@@ -667,7 +666,6 @@
     "min_cycle_recoil": 1250,
     "clip_size": 5,
     "sight_dispersion": 500,
-    "built_in_mods": [ "ts12_aux_shotgun", "ts12_aux_shotgun2" ],
     "valid_mod_locations": [
       [ "brass catcher", 1 ],
       [ "grip mount", 1 ],
@@ -679,9 +677,49 @@
       [ "sling", 1 ]
     ],
     "flags": [ "RELOAD_ONE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 5 } } ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 15 } } ],
     "melee_damage": { "bash": 12 }
   },
+  {
+    "id": "dp_12",
+    "copy-from": "shotgun_pump",
+    "type": "GUN",
+    "name": { "str": "double-barrelled pump shotgun" },
+    "description": "A hefty shotgun with a double-barrel configuration, though each barrel feeds from its own magazine, making the weapon actually two firearms in a single frame.  While each barrel has its own associated trigger, considering there is a single pump to actuate both mechanisms, one can't really use it precisely.  This, however, isn't to say that the weapon isn't fit for the service of shooting zombies at point blank ranges.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "dp_12",
+        "name": { "str": "DP-12" },
+        "description": "A bullpup, 12-gauge, pump-action, double-barrelled mouthful of a shotgun.  Each barrel feeds from its own magazine, making the weapon actually two firearms in a single frame, and, while each barrel has its own associated trigger, the presence of a single pump to actuate both mechanisms means that it cannot be used precisely.  This, however, isn't to say that the weapon isn't fit for the service of shooting zombies at point blank ranges."
+      }
+    ],
+    "weight": "4989 g",
+    "volume": "8862 ml",
+    "//": "180 x 750 x 101 mm, trimmed about 35% down for empty spaces",
+    "longest_side": "749 mm",
+    "barrel_length": "479 mm",
+    "price": "1599 USD",
+    "price_postapoc": "35 USD",
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" },
+    "material": [ "steel", "plastic" ],
+    "dispersion": 550,
+    "sight_dispersion": 700,
+    "durability": 7,
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "underbarrel", 2 ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 14 } } ],
+    "melee_damage": { "bash": 9 }
+  },
   {
     "id": "winchester_1887",
     "copy-from": "shotgun_base",
@@ -895,6 +933,47 @@
     "//": "no provision for separate triggers",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 2 } } ]
   },
+  {
+    "id": "srm_1216",
+    "copy-from": "shotgun_pump",
+    "looks_like": "remington_870",
+    "type": "GUN",
+    "name": { "str": "rotary-magazine shotgun" },
+    "description": "A lengthy shotgun that accepts revolving 16-round magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "srm_1216",
+        "name": { "str": "SRM Arms Model 1216" },
+        "description": "A delayed blowback semi-automatic shotgun feeding from detachable 16-round rotary magazines."
+      }
+    ],
+    "weight": "3062 g",
+    "volume": "8015 ml",
+    "//": "857 x 195 x 97 mm, trimmed about 30% down for empty spaces, minus 3670 ml of magazine volume.",
+    "longest_side": "857 mm",
+    "barrel_length": "470 mm",
+    "price": "1799 USD",
+    "price_postapoc": "50 USD",
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" },
+    "material": [ "steel", "plastic" ],
+    "dispersion": 425,
+    "sight_dispersion": 500,
+    "durability": 7,
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "srm_1216_mag_16" ] } ],
+    "melee_damage": { "bash": 9 }
+  },
   {
     "id": "m26_mass_standalone",
     "copy-from": "shotgun_base",

diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
@@ -228,97 +228,6 @@
     "flags": [ "IRREMOVABLE", "ALLOWS_REMOTE_USE" ],
     "melee_damage": {  }
   },
-  {
-    "id": "ksg_aux_shotgun",
-    "copy-from": "underbarrel_base",
-    "type": "GUNMOD",
-    "name": { "str": "KSG second magazine" },
-    "description": "The integrated second tube magazine of the Kel-Tec KSG, which holds 7 shots.  It's irremovable.",
-    "weight": "1550 g",
-    "volume": "1750 ml",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "install_time": "0 s",
-    "material": [ "steel" ],
-    "symbol": ":",
-    "color": "light_red",
-    "location": "underbarrel",
-    "mod_targets": [ "shotgun" ],
-    "gun_data": {
-      "barrel_length": "775 mm",
-      "ammo": "shot",
-      "skill": "shotgun",
-      "ranged_damage": { "damage_type": "stab", "amount": 1 },
-      "dispersion": 425,
-      "durability": 7,
-      "clip_size": 7,
-      "reload": 120
-    },
-    "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 7 } } ]
-  },
-  {
-    "id": "ts12_aux_shotgun",
-    "copy-from": "underbarrel_base",
-    "type": "GUNMOD",
-    "name": { "str": "TS12 second magazine" },
-    "description": "The integrated second tube magazine of the Tavor TS12, which holds 5 shots.  It's irremovable.",
-    "weight": "100 g",
-    "volume": "1750 ml",
-    "integral_volume": "0 ml",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "install_time": "0 s",
-    "material": [ "steel" ],
-    "symbol": ":",
-    "color": "light_red",
-    "location": "underbarrel",
-    "mod_targets": [ "shotgun" ],
-    "gun_data": {
-      "barrel_length": "470 mm",
-      "ammo": "shot",
-      "skill": "shotgun",
-      "ranged_damage": { "damage_type": "stab", "amount": 1 },
-      "dispersion": 320,
-      "durability": 6,
-      "min_cycle_recoil": 1250,
-      "clip_size": 5,
-      "reload": 120
-    },
-    "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 5 } } ]
-  },
-  {
-    "id": "ts12_aux_shotgun2",
-    "copy-from": "underbarrel_base",
-    "type": "GUNMOD",
-    "name": { "str": "TS12 third magazine" },
-    "description": "The integrated third tube magazine of the Tavor TS12, which holds 5 shots.  It's irremovable.",
-    "weight": "100 g",
-    "volume": "1750 ml",
-    "integral_volume": "0 ml",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "install_time": "0 s",
-    "material": [ "steel" ],
-    "symbol": ":",
-    "color": "light_red",
-    "location": "underbarrel",
-    "mod_targets": [ "shotgun" ],
-    "gun_data": {
-      "barrel_length": "470 mm",
-      "ammo": "shot",
-      "skill": "shotgun",
-      "ranged_damage": { "damage_type": "stab", "amount": 1 },
-      "dispersion": 320,
-      "durability": 6,
-      "min_cycle_recoil": 1250,
-      "clip_size": 5,
-      "reload": 120
-    },
-    "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 5 } } ]
-  },
   {
     "id": "laser_sight",
     "type": "GUNMOD",

diff --git a/data/json/items/magazine/shot.json b/data/json/items/magazine/shot.json
@@ -123,6 +123,31 @@
     "flags": [ "SPEEDLOADER_CLIP", "BELT_CLIP" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 8 } } ]
   },
+  {
+    "id": "srm_1216_mag_16",
+    "type": "MAGAZINE",
+    "name": { "str": "16-round rotary shotgun magazine" },
+    "description": "A 16-round magazine for a rotary magazine-fed shotgun.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "srm_1216_mag_16",
+        "name": { "str": "SRM Arms Model 1216 16-round magazine" },
+        "description": "A 16-round rotary magazine for that strangest of beasts, the SRM Arms Model 1216 shotgun."
+      }
+    ],
+    "weight": "453 g",
+    "volume": "3670 ml",
+    "longest_side": "355 mm",
+    "price": "200 USD",
+    "price_postapoc": "6 USD",
+    "material": [ "lc_steel" ],
+    "symbol": "#",
+    "color": "dark_gray",
+    "ammo_type": [ "shot" ],
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 16 } } ]
+  },
   {
     "id": "m26_mass_mag_3",
     "//": "Audited with ImageJ.  Weight from comparison.",

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -105,6 +105,21 @@
     "type": "MIGRATION",
     "replace": "gambeson"
   },
+  {
+    "id": "ksg_aux_shotgun",
+    "type": "MIGRATION",
+    "replace": "m26_mass"
+  },
+  {
+    "id": "ts12_aux_shotgun",
+    "type": "MIGRATION",
+    "replace": "m26_mass"
+  },
+  {
+    "id": "ts12_aux_shotgun2",
+    "type": "MIGRATION",
+    "replace": "m26_mass"
+  },
   {
     "id": "gambeson_loose_vest",
     "type": "MIGRATION",

diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json
@@ -392,12 +392,7 @@
           { "item": "bandolier_shotgun", "contents-group": "bandolier_swat_cqc1" },
           { "item": "bandolier_shotgun", "contents-group": "bandolier_swat_cqc2" },
           { "item": "usp_9mm", "ammo-item": "9mmfmj", "charges": 15, "container-item": "holster" },
-          {
-            "item": "ksg",
-            "ammo-item": "shot_00",
-            "charges": 7,
-            "contents-item": [ "shoulder_strap", "ksg_aux_shotgun" ]
-          },
+          { "item": "ksg", "ammo-item": "shot_00", "charges": 7, "contents-item": [ "shoulder_strap" ] },
           { "item": "baton", "container-item": "xlpolice_belt" }
         ]
       },

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -411,6 +411,8 @@
       "saiga_12",
       "afs_raketa_shotgun",
       "tavor_12",
+      "dp_12",
+      "srm_1216",
       "aa_12",
       "benelli_tsa",
       "bigun",