Merge pull request CleverRaven#76714 from Holli-Git/gun_spawn_overhaul

Gun spawn overhaul

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -90,9 +90,8 @@
       { "group": "guns_pistol_common", "prob": 162 },
       { "group": "guns_rifle_common", "prob": 36 },
       { "group": "guns_shotgun_common", "prob": 2 },
-      { "group": "guns_pistol_obscure", "prob": 81 },
-      { "group": "guns_rifle_obscure", "prob": 18 },
-      { "group": "guns_shotgun_obscure", "prob": 1 },
+      { "group": "guns_display_pieces", "prob": 20 },
+      { "group": "guns_collectible", "prob": 2 },
       { "group": "ammo_obscure", "prob": 40 },
       { "group": "mags_common", "prob": 40 }
     ]

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -207,9 +207,9 @@
     "type": "item_group",
     "id": "pawn_guns",
     "items": [
-      { "group": "guns_common", "prob": 100 },
-      { "group": "guns_rare", "prob": 10 },
-      { "group": "guns_obscure", "prob": 1 }
+      { "group": "guns_common_display", "prob": 100 },
+      { "group": "guns_display_pieces", "prob": 1 },
+      { "group": "guns_collectible", "prob": 1 }
     ]
   },
   {

data/json/itemgroups/SUS/gunstore.json

@@ -8,21 +8,7 @@
     "entries": [
       { "group": "ammo_common_collection", "prob": 100 },
       { "group": "ammo_rare_collection", "prob": 1 },
-      { "group": "ammo_obscure_collection", "prob": 1 },
-      { "group": "guns_rare_display", "prob": 1 }
-    ]
-  },
-  {
-    "id": "SUS_gunstore_safe_obscure",
-    "type": "item_group",
-    "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
-    "//2": "This group is for the contents of rare back of house safes.",
-    "subtype": "collection",
-    "entries": [
-      { "group": "guns_pistol_obscure_display", "prob": 15 },
-      { "collection": [ { "group": "guns_rifle_obscure_display" } ], "prob": 45 },
-      { "collection": [ { "group": "guns_shotgun_obscure_display" } ], "prob": 1 },
-      { "collection": [ { "group": "guns_smg_display" } ], "prob": 2 }
+      { "group": "ammo_obscure_collection", "prob": 1 }
     ]
   },
   {
@@ -80,12 +66,9 @@
     "//2": "This group is for the contents of gunstore displaycases",
     "subtype": "distribution",
     "entries": [
-      { "group": "guns_pistol_common_display", "prob": 60 },
-      { "group": "guns_rifle_common_display", "prob": 20 },
-      { "group": "guns_shotgun_common_display", "prob": 2 },
-      { "group": "guns_pistol_rare_display", "prob": 30 },
-      { "group": "guns_rifle_rare_display", "prob": 10 },
-      { "group": "guns_shotgun_rare_display", "prob": 1 }
+      { "group": "guns_pistol_common_display", "prob": 90 },
+      { "group": "guns_rifle_common_display", "prob": 30 },
+      { "group": "guns_shotgun_common_display", "prob": 3 }
     ]
   },
   {

data/json/itemgroups/SUS/lodge.json

@@ -50,11 +50,7 @@
     "type": "item_group",
     "//": "items found in a most dangerous game space",
     "subtype": "distribution",
-    "entries": [
-      { "group": "guns_shotgun_common", "prob": 30 },
-      { "group": "SUS_hunting_rifle", "prob": 20 },
-      { "group": "guns_smg_rare", "prob": 15 }
-    ]
+    "entries": [ { "group": "guns_shotgun_common", "prob": 30 }, { "group": "SUS_hunting_rifle", "prob": 20 } ]
   },
   {
     "id": "cannibal_food",

data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json

@@ -75,7 +75,7 @@
     "id": "ar15_50short",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "modular_ar15", "contents-item": "retool_ar15_50beowulf_short" } ]
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_50beowulf_short" } ]
   },
   {
     "id": "ar15_450",
@@ -93,7 +93,7 @@
     "id": "ar15_450short",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "modular_ar15", "contents-item": "retool_ar15_450_short" } ]
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_450_short" } ]
   },
   {
     "id": "ar15_762",

data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json

@@ -1,83 +1,155 @@
 [
   {
-    "id": "nested_ar15_retool_223rem",
+    "id": "nested_ar15_retool_223_20",
     "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  20 inch rifle barrel.",
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      {
-        "distribution": [
-          { "group": "ar15_223long", "charges": [ 0, 30 ], "prob": 8 },
-          { "group": "ar15_223medium", "charges": [ 0, 30 ], "prob": 8 },
-          { "group": "ar15_223short", "charges": [ 0, 30 ], "prob": 6 }
-        ],
-        "prob": 100
-      },
+      { "group": "ar15_223long", "charges": [ 0, 30 ] },
       { "item": "stanag30" },
       { "item": "stanag30", "prob": 50 },
       { "group": "on_hand_223" }
     ]
   },
   {
-    "id": "nested_ar15_retool_300blk",
+    "id": "nested_ar15_retool_223_16",
     "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  16 inch rifle barrel.",
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      {
-        "distribution": [
-          { "group": "ar15_300", "charges": [ 0, 30 ], "prob": 10 },
-          { "group": "ar15_300medium", "charges": [ 0, 30 ], "prob": 8 },
-          { "group": "ar15_300short", "charges": [ 0, 30 ], "prob": 6 }
-        ],
-        "prob": 100
-      },
+      { "group": "modular_ar15", "charges": [ 0, 30 ] },
+      { "item": "stanag30" },
+      { "item": "stanag30", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
+  {
+    "id": "nested_ar15_retool_223_14",
+    "type": "item_group",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  14 inch rifle barrel, shouldn't really spawn outside of criminal/survivor locations.",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "group": "ar15_223medium", "charges": [ 0, 30 ] },
+      { "item": "stanag30" },
+      { "item": "stanag30", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
+  {
+    "id": "nested_ar15_retool_223_10",
+    "type": "item_group",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  10 inch rifle barrel, shouldn't really spawn outside of criminal/survivor locations.",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "group": "ar15_223short", "charges": [ 0, 30 ] },
+      { "item": "stanag30" },
+      { "item": "stanag30", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
+  {
+    "id": "nested_ar15_retool_300_16",
+    "type": "item_group",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  16 inch rifle barrel.",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "group": "ar15_300", "charges": [ 0, 30 ] },
       { "item": "stanag30" },
       { "item": "stanag30", "prob": 50 },
       { "group": "on_hand_300BLK" }
     ]
   },
   {
-    "id": "nested_ar15_retool_50beowulf",
+    "id": "nested_ar15_retool_300_10",
     "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  10 inch rifle barrel, shouldn't really spawn outside of criminal/survivor locations.",
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      {
-        "distribution": [
-          { "group": "ar15_50", "charges": [ 0, 10 ], "prob": 10 },
-          { "group": "ar15_50medium", "charges": [ 0, 10 ], "prob": 8 },
-          { "group": "ar15_50short", "charges": [ 0, 10 ], "prob": 6 }
-        ],
-        "prob": 100
-      },
+      { "group": "ar15_300medium", "charges": [ 0, 30 ] },
+      { "item": "stanag30" },
+      { "item": "stanag30", "prob": 50 },
+      { "group": "on_hand_300BLK" }
+    ]
+  },
+  {
+    "id": "nested_ar15_retool_50beowulf_18",
+    "type": "item_group",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  18 inch rifle barrel.",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "group": "ar15_50", "charges": [ 0, 30 ] },
       { "item": "50beowulf_ar15mag" },
       { "item": "50beowulf_ar15mag", "prob": 50 },
       { "group": "on_hand_50beowulf" }
     ]
   },
   {
-    "id": "nested_ar15_retool_450bushmaster",
+    "id": "nested_ar15_retool_50beowulf_16",
     "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  16 inch rifle barrel.",
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      {
-        "distribution": [
-          { "group": "ar15_450", "charges": [ 0, 4 ], "prob": 10 },
-          { "group": "ar15_450medium", "charges": [ 0, 4 ], "prob": 8 },
-          { "group": "ar15_450short", "charges": [ 0, 4 ], "prob": 6 }
-        ],
-        "prob": 100
-      },
+      { "group": "ar15_50medium", "charges": [ 0, 30 ] },
+      { "item": "50beowulf_ar15mag" },
+      { "item": "50beowulf_ar15mag", "prob": 50 },
+      { "group": "on_hand_50beowulf" }
+    ]
+  },
+  {
+    "id": "nested_ar15_retool_50beowulf_7",
+    "type": "item_group",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  7 inch rifle barrel, though keep in mind it's a pistol.",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "group": "ar15_50short", "charges": [ 0, 30 ] },
+      { "item": "50beowulf_ar15mag" },
+      { "item": "50beowulf_ar15mag", "prob": 50 },
+      { "group": "on_hand_50beowulf" }
+    ]
+  },
+  {
+    "id": "nested_ar15_retool_450bushmaster_18",
+    "type": "item_group",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  18 inch rifle barrel.",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "group": "ar15_450", "charges": [ 0, 30 ] },
+      { "item": "450_ar15mag" },
+      { "item": "450_ar15mag", "prob": 50 },
+      { "group": "on_hand_450" }
+    ]
+  },
+  {
+    "id": "nested_ar15_retool_450bushmaster_10",
+    "type": "item_group",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  10 inch rifle barrel, shouldn't really spawn outside of criminal/survivor locations.",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "group": "ar15_450medium", "charges": [ 0, 30 ] },
+      { "item": "450_ar15mag" },
+      { "item": "450_ar15mag", "prob": 50 },
+      { "group": "on_hand_450" }
+    ]
+  },
+  {
+    "id": "nested_ar15_retool_450bushmaster_7",
+    "type": "item_group",
+    "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack.  7 inch rifle barrel, though keep in mind it's a pistol.",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "group": "ar15_450short", "charges": [ 0, 30 ] },
       { "item": "450_ar15mag" },
       { "item": "450_ar15mag", "prob": 50 },
       { "group": "on_hand_450" }
@@ -135,6 +207,23 @@
       { "group": "on_hand_223" }
     ]
   },
+  {
+    "id": "nested_mdrx_retool_223rem_civilian",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "//2": "A distribution that avoids NFA items (barrels under 16 inches)",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      {
+        "distribution": [ { "group": "mdrx_223", "charges": [ 0, 30 ], "prob": 4 }, { "group": "mdrx", "charges": [ 0, 30 ], "prob": 5 } ],
+        "prob": 100
+      },
+      { "item": "stanag30" },
+      { "item": "stanag30", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
   {
     "id": "nested_mdrx_retool_300blk",
     "type": "item_group",
@@ -197,25 +286,6 @@
       { "group": "on_hand_300" }
     ]
   },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "nested_converted_ar15",
-    "//": "An item group for a random, personally-converted weapon to spawn.",
-    "entries": [
-      {
-        "distribution": [
-          { "group": "nested_ar15_retool_223rem", "prob": 30 },
-          { "group": "nested_ar15_retool_300blk", "prob": 20 },
-          { "group": "nested_ar15_retool_50beowulf", "prob": 15 },
-          { "group": "nested_ar15_retool_450bushmaster", "prob": 15 },
-          { "group": "nested_ar15_retool_762", "prob": 25 },
-          { "group": "nested_ar15_retool_22", "prob": 15 }
-        ],
-        "prob": 100
-      }
-    ]
-  },
   {
     "type": "item_group",
     "subtype": "collection",