Merge pull request #75925 from Holli-Git/magazine_adjustments

Civilian Magazine Spawn Adjustments
CleverRaven · Aug 26, 2024 · 640fcb7 · 640fcb7
2 parents 911eeed + a79e0bf
commit 640fcb7
Show file tree

Hide file tree

Showing 24 changed files with 1,036 additions and 733 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -94,7 +94,7 @@
       { "group": "guns_rifle_obscure", "prob": 18 },
       { "group": "guns_shotgun_obscure", "prob": 1 },
       { "group": "ammo_obscure", "prob": 40 },
-      { "group": "mags_obscure", "prob": 40 }
+      { "group": "mags_common", "prob": 40 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -269,7 +269,7 @@
       [ "silver_nose_ring_stud", 2 ],
       [ "gold_toe_ring", 1 ],
       [ "silver_toe_ring", 2 ],
-      { "group": "mags_pawnshop", "prob": 300 }
+      { "group": "mags_common", "prob": 300 }
     ]
   },
   {
@@ -653,12 +653,6 @@
       { "group": "costume_all_clothing", "prob": 10 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_pawnshop",
-    "subtype": "distribution",
-    "entries": [ { "group": "mags_obscure", "prob": 10 } ]
-  },
   {
     "id": "my_precious",
     "type": "item_group",

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1619,7 +1619,7 @@
       { "group": "archery_ammo", "prob": 60 },
       { "group": "crossbow_bolts", "prob": 60 },
       { "group": "ammo_reloaded", "prob": 30 },
-      { "group": "mags_obscure", "prob": 30 },
+      { "group": "mags_common", "prob": 30 },
       { "group": "ammo_cannon", "prob": 10 }
     ]
   },

diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json
@@ -16,26 +16,13 @@
     "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, with guns paired with their corresponding magazines",
+    "//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" }, { "group": "mags_rifle_rare", "count": [ 1, 6 ] } ],
-        "prob": 45
-      },
-      {
-        "collection": [ { "group": "guns_shotgun_obscure_display" }, { "group": "mags_shotgun_rare", "count": [ 1, 2 ] } ],
-        "prob": 1
-      },
-      {
-        "collection": [
-          { "group": "guns_smg_display" },
-          { "group": "mags_smg_common", "count": [ 1, 8 ] },
-          { "group": "mags_smg_rare", "count": [ 1, 8 ] }
-        ],
-        "prob": 2
-      }
+      { "collection": [ { "group": "guns_rifle_obscure_display" } ], "prob": 45 },
+      { "collection": [ { "group": "guns_shotgun_obscure_display" } ], "prob": 1 },
+      { "collection": [ { "group": "guns_smg_display" } ], "prob": 2 }
     ]
   },
   {
@@ -46,7 +33,7 @@
     "subtype": "distribution",
     "entries": [
       { "group": "guns_common_display", "prob": 80 },
-      { "group": "mags_common_gunstore", "prob": 80 },
+      { "group": "mags_common", "prob": 80 },
       { "group": "gunmod_common", "prob": 15 },
       { "group": "conversion_kits", "prob": 15 },
       { "group": "book_gunmags", "prob": 60 },