I know now why you cry: Shotgun additions (#34638)

CleverRaven · Dec 1, 2019 · 67f223b · 67f223b
1 parent 6ddfe08
commit 67f223b
Show file tree

Hide file tree

Showing 21 changed files with 765 additions and 215 deletions.
diff --git a/data/json/itemgroups/gunmod.json b/data/json/itemgroups/gunmod.json
@@ -34,6 +34,7 @@
       [ "pistol_bayonet", 10 ],
       [ "pistol_scope", 10 ],
       [ "pistol_stock", 10 ],
+      [ "arredondo_chute", 20 ],
       [ "rail_laser_sight", 40 ],
       [ "red_dot_sight", 70 ],
       [ "recoil_stock", 60 ],
@@ -58,6 +59,88 @@
       [ "sword_bayonet", 10 ]
     ]
   },
+  {
+    "type": "item_group",
+    "id": "sights_all",
+    "//": "All aftermarket sights.",
+    "items": [
+      [ "improve_sights", 84 ],
+      [ "offset_sights", 6 ],
+      [ "red_dot_sight", 42 ],
+      [ "holo_sight", 18 ],
+      [ "laser_sight", 15 ],
+      [ "rail_laser_sight", 6 ],
+      [ "acog_scope", 21 ],
+      [ "rifle_scope", 25 ],
+      [ "pistol_scope", 4 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sights_pistol",
+    "//": "Aftermarket sights that are for pistols.",
+    "items": [ [ "improve_sights", 84 ], [ "red_dot_sight", 42 ], [ "laser_sight", 15 ], [ "pistol_scope", 4 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "sights_SMG",
+    "//": "Aftermarket sights that are for SMG's.",
+    "items": [
+      [ "improve_sights", 84 ],
+      [ "red_dot_sight", 42 ],
+      [ "holo_sight", 18 ],
+      [ "laser_sight", 15 ],
+      [ "rail_laser_sight", 6 ],
+      [ "pistol_scope", 4 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sights_rifle",
+    "//": "Aftermarket sights that are for rifles.",
+    "items": [
+      [ "improve_sights", 84 ],
+      [ "red_dot_sight", 42 ],
+      [ "holo_sight", 18 ],
+      [ "laser_sight", 15 ],
+      [ "rail_laser_sight", 6 ],
+      [ "offset_sights", 6 ],
+      [ "acog_scope", 21 ],
+      [ "rifle_scope", 25 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sights_shotgun",
+    "//": "Aftermarket sights that are for shotguns.",
+    "items": [
+      [ "improve_sights", 84 ],
+      [ "red_dot_sight", 42 ],
+      [ "holo_sight", 18 ],
+      [ "laser_sight", 15 ],
+      [ "offset_sights", 6 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sights_shotgun_readied",
+    "subtype": "distribution",
+    "//": "For non-static shotguns (not in stores, closets ).",
+    "entries": [ { "group": "sights_shotgun", "prob": 50 }, { "group": "EMPTY_GROUP", "prob": 50 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "sights_shotgun_static",
+    "subtype": "distribution",
+    "//": "For shotguns that haven't been 'made ready', e.g sitting in a store or garage.",
+    "entries": [ { "group": "sights_shotgun", "prob": 20 }, { "group": "EMPTY_GROUP", "prob": 80 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "sights_launcher",
+    "//": "Aftermarket sights that are for launchers.",
+    "items": [ [ "improve_sights", 84 ], [ "red_dot_sight", 42 ], [ "holo_sight", 18 ] ]
+  },
   {
     "type": "item_group",
     "id": "gunmod_energy",

diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
@@ -292,40 +292,73 @@
     "id": "guns_shotgun_common",
     "//": "Shotguns commonly owned by citizens and found in many locations.",
     "items": [
-      { "item": "mossberg_500", "prob": 50, "charges-min": 0, "charges-max": 8 },
-      { "item": "remington_870", "prob": 100, "charges-min": 0, "charges-max": 6 },
+      { "item": "mossberg_500", "prob": 33, "charges-min": 0, "charges-max": 6 },
+      { "item": "remington_870", "prob": 35, "charges-min": 0, "charges-max": 6 },
+      { "item": "mossberg_500_security", "prob": 17, "charges-min": 0, "charges-max": 6 },
+      { "item": "remington_870_express", "prob": 18, "charges-min": 0, "charges-max": 6 },
+      { "item": "browning_a5", "prob": 14, "charges-min": 0, "charges-max": 5 },
+      { "item": "remington_1100", "prob": 17, "charges-min": 0, "charges-max": 10 },
+      { "item": "mossberg_930", "prob": 15, "charges-min": 0, "charges-max": 6 },
       { "item": "shotgun_d", "prob": 30, "charges-min": 0, "charges-max": 2 },
       { "item": "shotgun_s", "prob": 30 }
     ]
   },
   {
     "type": "item_group",
     "id": "guns_shotgun_rare",
-    "//": "Less common shotguns including those only used by police/paramilitary forces.",
-    "items": [
+    "//": "Uncommon or rare shotguns in civilian possession.",
+    "subtype": "distribution",
+    "entries": [
       { "item": "ksg", "prob": 50, "charges-min": 0, "charges-max": 7 },
-      { "item": "m1014", "prob": 80, "charges-min": 0, "charges-max": 8 },
-      { "item": "rm120c", "prob": 30, "charges-min": 0, "charges-max": 5 },
-      { "item": "rm228", "prob": 30, "charges-min": 0, "charges-max": 10 },
-      { "item": "l_def_12", "prob": 20, "charges-min": 0, "charges-max": 8 },
-      { "item": "saiga_12", "prob": 50, "charges-min": 0, "charges-max": 10 },
-      { "item": "saiga_410", "prob": 40, "charges-min": 0, "charges-max": 10 }
+      { "item": "tavor_12", "prob": 5, "charges-min": 0, "charges-max": 16 },
+      { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
+      { "item": "SPAS_12", "prob": 2, "charges-min": 0, "charges-max": 9 },
+      { "item": "rm120c", "prob": 5, "charges-min": 0, "charges-max": 5 },
+      { "item": "rm228", "prob": 5, "charges-min": 0, "charges-max": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_shotgun_rare_readied",
+    "subtype": "distribution",
+    "entries": [
+      { "group": "guns_shotgun_rare", "prob": 22, "contents-group": "sights_shotgun_readied" },
+      { "item": "winchester_1887", "prob": 10, "charges-min": 0, "charges-max": 6 },
+      { "item": "winchester_1897", "prob": 7, "charges-min": 0, "charges-max": 6 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_shotgun_rare_static",
+    "subtype": "distribution",
+    "entries": [
+      { "group": "guns_shotgun_rare", "prob": 22, "contents-group": "sights_shotgun_static" },
+      { "item": "winchester_1887", "prob": 10, "charges-min": 0, "charges-max": 6 },
+      { "item": "winchester_1897", "prob": 7, "charges-min": 0, "charges-max": 6 }
     ]
   },
   {
     "type": "item_group",
     "id": "guns_shotgun_milspec",
-    "//": "Military specification shotguns only ever found at military sites.",
+    "//": "Military shotguns currently in service.",
     "items": [
       { "item": "rm20", "prob": 20, "charges-min": 0, "charges-max": 20 },
+      { "item": "remington_870_express", "prob": 50, "charges-min": 0, "charges-max": 6 },
+      { "item": "remington_870_breacher", "prob": 20, "charges-min": 0, "charges-max": 4 },
+      { "item": "mossberg_590", "prob": 50, "charges-min": 0, "charges-max": 9 },
       { "item": "m1014", "prob": 100, "charges-min": 0, "charges-max": 8 }
     ]
   },
   {
     "type": "item_group",
     "id": "guns_shotgun_obscure",
     "//": "Imported or otherwise very obscure shotguns.",
-    "items": [  ]
+    "items": [
+      { "item": "saiga_12", "prob": 50, "charges-min": 0, "charges-max": 10 },
+      { "item": "streetsweeper", "prob": 4, "charges-min": 0, "charges-max": 12 },
+      { "item": "USAS_12", "prob": 1, "charges-min": 0, "charges-max": 10 },
+      { "item": "saiga_410", "prob": 40, "charges-min": 0, "charges-max": 10 }
+    ]
   },
   {
     "type": "item_group",
@@ -336,8 +369,7 @@
       { "item": "bigun", "prob": 10, "charges-min": 0, "charges-max": 6 },
       { "item": "pipe_double_shotgun", "prob": 70, "charges-min": 0, "charges-max": 2 },
       { "item": "pipe_shotgun", "prob": 100 },
-      { "item": "revolver_shotgun", "prob": 30, "charges-min": 0, "charges-max": 6 },
-      { "item": "surv_levershotgun", "prob": 40, "charges-min": 0, "charges-max": 8 }
+      { "item": "revolver_shotgun", "prob": 30, "charges-min": 0, "charges-max": 6 }
     ]
   },
   {
@@ -417,6 +449,28 @@
       { "group": "guns_shotgun_rare", "prob": 70 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_rare_static",
+    "//": "Less common guns of all types including those only used by police/paramilitary forces.",
+    "items": [
+      { "group": "guns_pistol_rare", "prob": 100 },
+      { "group": "guns_smg_rare", "prob": 30 },
+      { "group": "guns_rifle_rare", "prob": 70 },
+      { "group": "guns_shotgun_rare_static", "prob": 70 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_rare_readied",
+    "//": "Less common guns of all types including those only used by police/paramilitary forces.",
+    "items": [
+      { "group": "guns_pistol_rare", "prob": 100 },
+      { "group": "guns_smg_rare", "prob": 30 },
+      { "group": "guns_rifle_rare", "prob": 70 },
+      { "group": "guns_shotgun_rare_readied", "prob": 70 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "guns_milspec",
@@ -491,6 +545,7 @@
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
       { "item": "m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 },
       { "item": "as50", "prob": 5, "charges-min": 0, "charges-max": 10 },
+      { "item": "USAS_12", "prob": 1, "charges-min": 0, "charges-max": 10 },
       { "item": "hk417_13", "prob": 30, "charges-min": 0, "charges-max": 20 }
     ]
   },

diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -2559,9 +2559,9 @@
       [ "tazer", 25 ],
       [ "remington_700", 5 ],
       [ "3006", 5 ],
-      [ "l_def_12", 8 ],
-      [ "remington_870", 8 ],
-      [ "mossberg_500", 8 ],
+      [ "ksg", 8 ],
+      [ "remington_870_express", 8 ],
+      [ "mossberg_500_security", 8 ],
       [ "shot_beanbag", 25 ],
       [ "rm120c", 2 ],
       [ "rm20", 1 ],

diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json
@@ -273,6 +273,8 @@
     "items": [
       [ "saiga10mag", 50 ],
       [ "saiga30mag", 10 ],
+      [ "USAS10mag", 20 ],
+      [ "USAS20mag", 5 ],
       [ "saiga410mag_10rd", 30 ],
       [ "saiga410mag_30rd", 10 ],
       [ "shot_speedloader6", 15 ],

diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json
@@ -182,14 +182,14 @@
       [ "barrel", 1 ],
       [ "bore", 1 ],
       [ "brass catcher", 1 ],
-      [ "grip", 1 ],
+      [ "grip mount", 1 ],
       [ "mechanism", 4 ],
       [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
       [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "underbarrel", 1 ]
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
     ]
   },
   {
@@ -201,6 +201,28 @@
     "flags": [ "RELOAD_ONE", "PUMP_ACTION" ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
   },
+  {
+    "abstract": "shotgun_pump_3gun",
+    "copy-from": "shotgun_pump",
+    "type": "GUN",
+    "//": "Anything that has the right pin arrangement for a speedloader chute",
+    "name": "base race shotgun, pump",
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "loading port", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
+      [ "sling", 1 ],
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
+    ]
+  },
   {
     "abstract": "smg_base",
     "copy-from": "gun_base",