From 63f6df83928ec17da41b03470c8e6a713b9dfb5a Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sun, 18 Aug 2024 14:27:09 -0600
Subject: [PATCH 01/26] 9mm + magazine resort

---
 .../magazines/10mm_collection.json            |   0
 .../magazines/9mm_collection.json             | 230 ++++++++++++++++++
 .../{ => magazines}/magazines.json            |   0
 .../magazines/magazines_by_caliber.json       |  40 +++
 4 files changed, 270 insertions(+)
 create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json
 create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json
 rename data/json/itemgroups/Weapons_Mods_Ammo/{ => magazines}/magazines.json (100%)
 create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json
new file mode 100644
index 0000000000000..73e998c1cf292
--- /dev/null
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json
@@ -0,0 +1,230 @@
+[
+  [
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_glock",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "glockmag", "prob": 300 },
+        { "item": "glock17_17", "prob": 500 },
+        { "item": "glock17_22", "prob": 50 },
+        { "item": "glockbigmag", "prob": 20 },
+        { "item": "glock_drum_50rd", "prob": 5 },
+        { "item": "glock_drum_100rd", "prob": 1 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_m9",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "m9mag_10rd", "prob": 300 },
+        { "item": "m9mag", "prob": 500 },
+        { "item": "m9mag_17rd", "prob": 500 },
+        { "item": "m9mag_18rd", "prob": 70 },
+        { "item": "m9mag_20rd", "prob": 60 },
+        { "item": "m9bigmag", "prob": 50 },
+        { "item": "m9mag_32rd", "prob": 5 },
+        { "item": "m9mag_35rd", "prob": 3 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_px4",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "px4mag_10rd", "prob": 200 },
+        { "item": "px4mag_15rd", "prob": 400 },
+        { "item": "px4mag", "prob": 500 },
+        { "item": "px4mag_20rd", "prob": 60 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_usp",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "usp9mag_10rd", "prob": 300 },
+        { "item": "usp9mag", "prob": 500 },
+        { "item": "usp9mag_18rd", "prob": 50 },
+        { "item": "usp9mag_32rd", "prob": 4 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_p226",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "p226mag_10rd_9x19mm", "prob": 500 }, { "item": "p226mag_15rd_9x19mm", "prob": 500 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_p320",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "p320mag_10rd_9x19mm", "prob": 250 },
+        { "item": "p320mag_17rd_9x19mm", "prob": 500 },
+        { "item": "p320mag_21rd_9x19mm", "prob": 100 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_browning_hi",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "bhp9mag_13rd", "prob": 500 }, { "item": "bhp9mag_15rd", "prob": 500 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_ppq",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "ppq9mag_10rd", "prob": 400 },
+        { "item": "ppq9mag_15rd", "prob": 500 },
+        { "item": "ppq9mag_17rd", "prob": 400 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_hipoint_c9",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "hptc9mag_8rd", "prob": 500 },
+        { "item": "hptc9mag_10rd", "prob": 100 },
+        { "item": "hptc9mag_15rd", "prob": 30 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_cz",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "cz75mag_16rd", "prob": 500 },
+        { "item": "cz75mag_20rd", "prob": 100 },
+        { "item": "cz75mag_26rd", "prob": 25 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_sp2022",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "sp2022mag_10rd_9mm", "prob": 500 }, { "item": "sp2022mag_15rd_9mm", "prob": 400 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_p38",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "p38mag", "prob": 500 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_ccp",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "ccpmag", "prob": 500 }, { "item": "ccpmag_9rd", "prob": 400 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_apc9",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "btmp9mag_9x19mm_10rd", "prob": 250 },
+        { "item": "btmp9mag_9x19mm_15", "prob": 400 },
+        { "item": "btmp9mag_9x19mm_20", "prob": 500 },
+        { "item": "btmp9mag_9x19mm_25", "prob": 400 },
+        { "item": "btmp9mag_9x19mm_30", "prob": 70 },
+        { "item": "btmp9mag_9x19mm_50rd", "prob": 10 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_calico",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "calicomag", "prob": 500 }, { "item": "calicomag_100rd", "prob": 200 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_mp5",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "mp5mag_10rd", "prob": 250 },
+        { "item": "mp5mag_15rd", "prob": 350 },
+        { "item": "mp5mag_20rd", "prob": 350 },
+        { "item": "mp5mag", "prob": 500 },
+        { "item": "mp5mag_38rd", "prob": 60 },
+        { "item": "mp5mag_40rd", "prob": 50 },
+        { "item": "mp5bigmag", "prob": 5 },
+        { "item": "mp5mag_100rd", "prob": 1 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_luger",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "p08mag_8rd", "prob": 500 }, { "item": "p08mag_32rd", "prob": 3 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_mauser",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "mausermag_10rd", "prob": 500 }, { "item": "mausermag_20rd", "prob": 50 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_mp40",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "mp40mag_32rd", "prob": 500 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_sten",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [ { "item": "stenmag", "prob": 500 } ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_tec9",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "tec9mag_20rd", "prob": 400 },
+        { "item": "tec9mag_30rd", "prob": 450 },
+        { "item": "tec9mag", "prob": 500 },
+        { "item": "tec9mag_36rd", "prob": 200 },
+        { "item": "tec9mag_50rd", "prob": 20 },
+        { "item": "tec9mag_72rd", "prob": 1 }
+      ]
+    },
+    {
+      "type": "item_group",
+      "subtype": "distribution",
+      "id": "magazines_9mm_uzi",
+      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+      "items": [
+        { "item": "uzimag_20rd", "prob": 400 },
+        { "item": "uzimag_25rd", "prob": 450 },
+        { "item": "uzimag", "prob": 500 },
+        { "item": "uzimag_40rd", "prob": 100 },
+        { "item": "uzimag_50rd", "prob": 50 },
+        { "item": "uzimag_100rd", "prob": 1 }
+      ]
+    }
+  ]
+]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
similarity index 100%
rename from data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
rename to data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
new file mode 100644
index 0000000000000..5f9990c752fd6
--- /dev/null
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -0,0 +1,40 @@
+[
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_9mm",
+    "//": "Collections of magazines for 9mm guns that are sold in gunstores, such as Glocks, M9s.",
+    "items": [
+      { "group": "magazines_9mm_glock", "prob": 100 },
+      { "group": "magazines_9mm_m9", "prob": 20 },
+      { "group": "magazines_9mm_px4", "prob": 20 },
+      { "group": "magazines_9mm_usp", "prob": 20 },
+      { "group": "magazines_9mm_p226", "prob": 40 },
+      { "group": "magazines_9mm_p320", "prob": 60 },
+      { "group": "magazines_9mm_browning_hi", "prob": 18 },
+      { "group": "magazines_9mm_ppq", "prob": 15 },
+      { "group": "magazines_9mm_hipoint_c9", "prob": 30 },
+      { "group": "magazines_9mm_cz", "prob": 40 },
+      { "group": "magazines_9mm_ccp", "prob": 5 },
+      { "group": "magazines_9mm_sp2022", "prob": 10 },
+      { "group": "magazines_9mm_mp5", "prob": 19 },
+      { "group": "magazines_9mm_p38", "prob": 14 },
+      { "group": "magazines_9mm_apc9", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "rare_magazines_9mm",
+    "//": "Collections of magazines for 9mm guns that are rare and should only be found in collections or gunshows, such as Calicos, Lugers.",
+    "items": [
+      { "group": "magazines_9mm_calico", "prob": 1 },
+      { "group": "magazines_9mm_luger", "prob": 60 },
+      { "group": "magazines_9mm_mauser", "prob": 20 },
+      { "group": "magazines_9mm_mp40", "prob": 60 },
+      { "group": "magazines_9mm_sten", "prob": 40 },
+      { "group": "magazines_9mm_tec9", "prob": 60 },
+      { "group": "magazines_9mm_uzi", "prob": 18 }
+    ]
+  }
+]

From 20204464391e20e241551064bd8697fae1810052 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sun, 18 Aug 2024 15:13:40 -0600
Subject: [PATCH 02/26] 10mm

---
 .../magazines/10mm_collection.json            |  13 +
 .../magazines/9mm_collection.json             | 454 +++++++++---------
 .../magazines/magazines_by_caliber.json       |  14 +
 3 files changed, 253 insertions(+), 228 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json
index e69de29bb2d1d..18f0ef4a45041 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json
@@ -0,0 +1,13 @@
+[
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_10mm_glock",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "glock_29mag", "prob": 250 },
+      { "item": "glock_20mag", "prob": 500 },
+      { "item": "tdi_10mm_mag", "prob": 70 }
+    ]
+  }
+]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json
index 73e998c1cf292..7fd7aea8469ec 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json
@@ -1,230 +1,228 @@
 [
-  [
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_glock",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "glockmag", "prob": 300 },
-        { "item": "glock17_17", "prob": 500 },
-        { "item": "glock17_22", "prob": 50 },
-        { "item": "glockbigmag", "prob": 20 },
-        { "item": "glock_drum_50rd", "prob": 5 },
-        { "item": "glock_drum_100rd", "prob": 1 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_m9",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "m9mag_10rd", "prob": 300 },
-        { "item": "m9mag", "prob": 500 },
-        { "item": "m9mag_17rd", "prob": 500 },
-        { "item": "m9mag_18rd", "prob": 70 },
-        { "item": "m9mag_20rd", "prob": 60 },
-        { "item": "m9bigmag", "prob": 50 },
-        { "item": "m9mag_32rd", "prob": 5 },
-        { "item": "m9mag_35rd", "prob": 3 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_px4",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "px4mag_10rd", "prob": 200 },
-        { "item": "px4mag_15rd", "prob": 400 },
-        { "item": "px4mag", "prob": 500 },
-        { "item": "px4mag_20rd", "prob": 60 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_usp",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "usp9mag_10rd", "prob": 300 },
-        { "item": "usp9mag", "prob": 500 },
-        { "item": "usp9mag_18rd", "prob": 50 },
-        { "item": "usp9mag_32rd", "prob": 4 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_p226",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "p226mag_10rd_9x19mm", "prob": 500 }, { "item": "p226mag_15rd_9x19mm", "prob": 500 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_p320",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "p320mag_10rd_9x19mm", "prob": 250 },
-        { "item": "p320mag_17rd_9x19mm", "prob": 500 },
-        { "item": "p320mag_21rd_9x19mm", "prob": 100 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_browning_hi",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "bhp9mag_13rd", "prob": 500 }, { "item": "bhp9mag_15rd", "prob": 500 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_ppq",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "ppq9mag_10rd", "prob": 400 },
-        { "item": "ppq9mag_15rd", "prob": 500 },
-        { "item": "ppq9mag_17rd", "prob": 400 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_hipoint_c9",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "hptc9mag_8rd", "prob": 500 },
-        { "item": "hptc9mag_10rd", "prob": 100 },
-        { "item": "hptc9mag_15rd", "prob": 30 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_cz",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "cz75mag_16rd", "prob": 500 },
-        { "item": "cz75mag_20rd", "prob": 100 },
-        { "item": "cz75mag_26rd", "prob": 25 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_sp2022",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "sp2022mag_10rd_9mm", "prob": 500 }, { "item": "sp2022mag_15rd_9mm", "prob": 400 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_p38",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "p38mag", "prob": 500 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_ccp",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "ccpmag", "prob": 500 }, { "item": "ccpmag_9rd", "prob": 400 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_apc9",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "btmp9mag_9x19mm_10rd", "prob": 250 },
-        { "item": "btmp9mag_9x19mm_15", "prob": 400 },
-        { "item": "btmp9mag_9x19mm_20", "prob": 500 },
-        { "item": "btmp9mag_9x19mm_25", "prob": 400 },
-        { "item": "btmp9mag_9x19mm_30", "prob": 70 },
-        { "item": "btmp9mag_9x19mm_50rd", "prob": 10 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_calico",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "calicomag", "prob": 500 }, { "item": "calicomag_100rd", "prob": 200 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_mp5",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "mp5mag_10rd", "prob": 250 },
-        { "item": "mp5mag_15rd", "prob": 350 },
-        { "item": "mp5mag_20rd", "prob": 350 },
-        { "item": "mp5mag", "prob": 500 },
-        { "item": "mp5mag_38rd", "prob": 60 },
-        { "item": "mp5mag_40rd", "prob": 50 },
-        { "item": "mp5bigmag", "prob": 5 },
-        { "item": "mp5mag_100rd", "prob": 1 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_luger",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "p08mag_8rd", "prob": 500 }, { "item": "p08mag_32rd", "prob": 3 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_mauser",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "mausermag_10rd", "prob": 500 }, { "item": "mausermag_20rd", "prob": 50 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_mp40",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "mp40mag_32rd", "prob": 500 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_sten",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [ { "item": "stenmag", "prob": 500 } ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_tec9",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "tec9mag_20rd", "prob": 400 },
-        { "item": "tec9mag_30rd", "prob": 450 },
-        { "item": "tec9mag", "prob": 500 },
-        { "item": "tec9mag_36rd", "prob": 200 },
-        { "item": "tec9mag_50rd", "prob": 20 },
-        { "item": "tec9mag_72rd", "prob": 1 }
-      ]
-    },
-    {
-      "type": "item_group",
-      "subtype": "distribution",
-      "id": "magazines_9mm_uzi",
-      "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-      "items": [
-        { "item": "uzimag_20rd", "prob": 400 },
-        { "item": "uzimag_25rd", "prob": 450 },
-        { "item": "uzimag", "prob": 500 },
-        { "item": "uzimag_40rd", "prob": 100 },
-        { "item": "uzimag_50rd", "prob": 50 },
-        { "item": "uzimag_100rd", "prob": 1 }
-      ]
-    }
-  ]
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_glock",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "glockmag", "prob": 300 },
+      { "item": "glock17_17", "prob": 500 },
+      { "item": "glock17_22", "prob": 50 },
+      { "item": "glockbigmag", "prob": 20 },
+      { "item": "glock_drum_50rd", "prob": 5 },
+      { "item": "glock_drum_100rd", "prob": 1 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_m9",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "m9mag_10rd", "prob": 300 },
+      { "item": "m9mag", "prob": 500 },
+      { "item": "m9mag_17rd", "prob": 500 },
+      { "item": "m9mag_18rd", "prob": 70 },
+      { "item": "m9mag_20rd", "prob": 60 },
+      { "item": "m9bigmag", "prob": 50 },
+      { "item": "m9mag_32rd", "prob": 5 },
+      { "item": "m9mag_35rd", "prob": 3 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_px4",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "px4mag_10rd", "prob": 200 },
+      { "item": "px4mag_15rd", "prob": 400 },
+      { "item": "px4mag", "prob": 500 },
+      { "item": "px4mag_20rd", "prob": 60 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_usp",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "usp9mag_10rd", "prob": 300 },
+      { "item": "usp9mag", "prob": 500 },
+      { "item": "usp9mag_18rd", "prob": 50 },
+      { "item": "usp9mag_32rd", "prob": 4 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_p226",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "p226mag_10rd_9x19mm", "prob": 500 }, { "item": "p226mag_15rd_9x19mm", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_p320",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "p320mag_10rd_9x19mm", "prob": 250 },
+      { "item": "p320mag_17rd_9x19mm", "prob": 500 },
+      { "item": "p320mag_21rd_9x19mm", "prob": 100 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_browning_hi",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "bhp9mag_13rd", "prob": 500 }, { "item": "bhp9mag_15rd", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_ppq",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "ppq9mag_10rd", "prob": 400 },
+      { "item": "ppq9mag_15rd", "prob": 500 },
+      { "item": "ppq9mag_17rd", "prob": 400 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_hipoint_c9",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "hptc9mag_8rd", "prob": 500 },
+      { "item": "hptc9mag_10rd", "prob": 100 },
+      { "item": "hptc9mag_15rd", "prob": 30 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_cz",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "cz75mag_16rd", "prob": 500 },
+      { "item": "cz75mag_20rd", "prob": 100 },
+      { "item": "cz75mag_26rd", "prob": 25 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_sp2022",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "sp2022mag_10rd_9mm", "prob": 500 }, { "item": "sp2022mag_15rd_9mm", "prob": 400 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_p38",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "p38mag", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_ccp",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "ccpmag", "prob": 500 }, { "item": "ccpmag_9rd", "prob": 400 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_apc9",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "btmp9mag_9x19mm_10rd", "prob": 250 },
+      { "item": "btmp9mag_9x19mm_15", "prob": 400 },
+      { "item": "btmp9mag_9x19mm_20", "prob": 500 },
+      { "item": "btmp9mag_9x19mm_25", "prob": 400 },
+      { "item": "btmp9mag_9x19mm_30", "prob": 70 },
+      { "item": "btmp9mag_9x19mm_50rd", "prob": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_calico",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "calicomag", "prob": 500 }, { "item": "calicomag_100rd", "prob": 200 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_mp5",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "mp5mag_10rd", "prob": 250 },
+      { "item": "mp5mag_15rd", "prob": 350 },
+      { "item": "mp5mag_20rd", "prob": 350 },
+      { "item": "mp5mag", "prob": 500 },
+      { "item": "mp5mag_38rd", "prob": 60 },
+      { "item": "mp5mag_40rd", "prob": 50 },
+      { "item": "mp5bigmag", "prob": 5 },
+      { "item": "mp5mag_100rd", "prob": 1 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_luger",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "p08mag_8rd", "prob": 500 }, { "item": "p08mag_32rd", "prob": 3 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_mauser",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "mausermag_10rd", "prob": 500 }, { "item": "mausermag_20rd", "prob": 50 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_mp40",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "mp40mag_32rd", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_sten",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "stenmag", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_tec9",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "tec9mag_20rd", "prob": 400 },
+      { "item": "tec9mag_30rd", "prob": 450 },
+      { "item": "tec9mag", "prob": 500 },
+      { "item": "tec9mag_36rd", "prob": 200 },
+      { "item": "tec9mag_50rd", "prob": 20 },
+      { "item": "tec9mag_72rd", "prob": 1 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_9mm_uzi",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "uzimag_20rd", "prob": 400 },
+      { "item": "uzimag_25rd", "prob": 450 },
+      { "item": "uzimag", "prob": 500 },
+      { "item": "uzimag_40rd", "prob": 100 },
+      { "item": "uzimag_50rd", "prob": 50 },
+      { "item": "uzimag_100rd", "prob": 1 }
+    ]
+  }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 5f9990c752fd6..786114f31f1bf 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -22,6 +22,20 @@
       { "group": "magazines_9mm_apc9", "prob": 5 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_10mm",
+    "//": "Collections of magazines for 10mm guns that are sold in gunstores, such as Glocks.",
+    "items": [
+      { "group": "magazines_10mm_glock", "prob": 100 },
+      { "item": "40_speedloader6", "prob": 16 },
+      { "item": "m1911_10mag", "prob": 7 },
+      { "item": "p220_10_mag", "prob": 9 },
+      { "item": "witness_mag_10", "prob": 2 },
+      { "item": "xd_10_mag", "prob": 24 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From 03be319aff619a57cad9be5f394014c17d12fe8a Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sun, 18 Aug 2024 15:31:31 -0600
Subject: [PATCH 03/26] .22 LR

---
 .../magazines/22_collection.json              | 23 +++++++++++++++++++
 .../magazines/magazines_by_caliber.json       | 16 +++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/magazines/22_collection.json

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/22_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/22_collection.json
new file mode 100644
index 0000000000000..84261c57228a5
--- /dev/null
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/22_collection.json
@@ -0,0 +1,23 @@
+[
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_22_ar",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "22_ar15mag_10", "prob": 500 }, { "item": "22_ar15mag_28", "prob": 200 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_22_1022",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "ruger1022mag", "prob": 500 }, { "item": "ruger1022bigmag", "prob": 300 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_22_cp33",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "cp33_mag", "prob": 500 }, { "item": "cp33_mag_50", "prob": 100 } ]
+  }
+]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 786114f31f1bf..0df02b2995175 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -36,6 +36,22 @@
       { "item": "xd_10_mag", "prob": 24 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_22lr",
+    "//": "Collections of magazines for .22 LR guns that are sold in gunstores, such as 10/22s, Ruger Standards.",
+    "items": [
+      { "group": "magazines_22_ar", "prob": 8 },
+      { "group": "magazines_22_1022", "prob": 100 },
+      { "group": "magazines_22_cp33", "prob": 5 },
+      { "item": "22_speedloader8", "prob": 1 },
+      { "item": "mosquitomag", "prob": 20 },
+      { "item": "wp22mag", "prob": 23 },
+	  { "item": "ruger_mk4_mag", "prob": 39 },
+      { "item": "1911_22_mag", "prob": 26 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From 2189bbde9e58bd15776663b40fe7b5a5262853e4 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sun, 18 Aug 2024 14:27:09 -0600
Subject: [PATCH 04/26] 9mm + magazine resort


From c174d1c3b6222455f06e7e4457bcb7652ecd4283 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sun, 18 Aug 2024 15:33:30 -0600
Subject: [PATCH 05/26] 30 carbine

---
 .../magazines/magazines_by_caliber.json                | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 0df02b2995175..62c962718a849 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -52,6 +52,16 @@
       { "item": "1911_22_mag", "prob": 26 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_30_carbine",
+    "//": "Collections of magazines for 30 carbine guns that are sold in gunstores, such as M1 Carbines and... nothing else.",
+    "items": [
+      { "item": "m1carbinemag", "prob": 100 },
+      { "item": "m1carbinebigmag", "prob": 10 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From d79b908b62da694b835ee663a80308b077407f37 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sun, 18 Aug 2024 17:08:14 -0600
Subject: [PATCH 06/26] 32 ACP

---
 .../magazines/magazines_by_caliber.json            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 62c962718a849..d181112000578 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -48,7 +48,7 @@
       { "item": "22_speedloader8", "prob": 1 },
       { "item": "mosquitomag", "prob": 20 },
       { "item": "wp22mag", "prob": 23 },
-	  { "item": "ruger_mk4_mag", "prob": 39 },
+      { "item": "ruger_mk4_mag", "prob": 39 },
       { "item": "1911_22_mag", "prob": 26 }
     ]
   },
@@ -57,10 +57,14 @@
     "subtype": "distribution",
     "id": "common_magazines_30_carbine",
     "//": "Collections of magazines for 30 carbine guns that are sold in gunstores, such as M1 Carbines and... nothing else.",
-    "items": [
-      { "item": "m1carbinemag", "prob": 100 },
-      { "item": "m1carbinebigmag", "prob": 10 }
-    ]
+    "items": [ { "item": "m1carbinemag", "prob": 100 }, { "item": "m1carbinebigmag", "prob": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_32",
+    "//": "Collections of magazines for 32 ACP guns that are sold in gunstores, such as a PPK.",
+    "items": [ { "item": "ppkmag", "prob": 100 }, { "item": "kp32mag", "prob": 68 } ]
   },
   {
     "type": "item_group",

From d35f407cad070423563ea9dd8d70995c0a7f9689 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sun, 18 Aug 2024 21:31:31 -0600
Subject: [PATCH 07/26] 38

---
 .../magazines/magazines_by_caliber.json               | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index d181112000578..798f0294a0de2 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -66,6 +66,17 @@
     "//": "Collections of magazines for 32 ACP guns that are sold in gunstores, such as a PPK.",
     "items": [ { "item": "ppkmag", "prob": 100 }, { "item": "kp32mag", "prob": 68 } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_38",
+    "//": "Collections of speedloaders for 38/357 revolvers that are sold in gunstores, such as a 686 or Model 10.",
+    "items": [
+      { "item": "38_speedloader", "prob": 58 },
+      { "item": "38_speedloader5", "prob": 100 },
+      { "item": "38_speedloader6", "prob": 14 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From 2617c9328119e3ff1cdbaf8b415dc4e8894051f5 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Mon, 19 Aug 2024 09:46:58 -0600
Subject: [PATCH 08/26] 40 S&W

---
 .../Weapons_Mods_Ammo/magazines/40sw_collection.json |  9 +++++++++
 .../magazines/magazines_by_caliber.json              | 12 ++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/magazines/40sw_collection.json

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/40sw_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/40sw_collection.json
new file mode 100644
index 0000000000000..17a78018ad1dd
--- /dev/null
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/40sw_collection.json
@@ -0,0 +1,9 @@
+[
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_40_glock",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "glock40mag", "prob": 500 }, { "item": "glock40bigmag", "prob": 350 } ]
+  }
+]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 798f0294a0de2..bb842340939c4 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -77,6 +77,18 @@
       { "item": "38_speedloader6", "prob": 14 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_40sw",
+    "//": "Collections of magazines for 40 S&W guns that are sold in gunstores, such as the Glock 22.",
+    "items": [
+      { "group": "magazines_40_glock", "prob": 100 },
+      { "item": "px4_40mag", "prob": 21 },
+      { "item": "bhp40mag", "prob": 3 },
+      { "item": "hptjcpmag", "prob": 30 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From d57bc428d67caab3171c8744a48da0ed47baa020 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Mon, 19 Aug 2024 09:52:48 -0600
Subject: [PATCH 09/26] 44

---
 .../Weapons_Mods_Ammo/magazines/magazines_by_caliber.json  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index bb842340939c4..818861d6de167 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -89,6 +89,13 @@
       { "item": "hptjcpmag", "prob": 30 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_44",
+    "//": "Collections of magazines/speedloaders for 44 magnum guns that are sold in gunstores, such as the Colt Anaconda.",
+    "items": [ { "item": "44_speedloader6", "prob": 100 }, { "item": "deaglemag", "prob": 17 } ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From afaa801a2813b9e1a0d46d6104a89621412e2e2a Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Mon, 19 Aug 2024 13:34:18 -0600
Subject: [PATCH 10/26] move collections to one file

---
 .../magazines/10mm_collection.json            | 13 -------
 .../magazines/22_collection.json              | 23 -----------
 .../magazines/40sw_collection.json            |  9 -----
 ...json => magazine_collections_by_guns.json} | 39 +++++++++++++++++++
 4 files changed, 39 insertions(+), 45 deletions(-)
 delete mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json
 delete mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/magazines/22_collection.json
 delete mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/magazines/40sw_collection.json
 rename data/json/itemgroups/Weapons_Mods_Ammo/magazines/{9mm_collection.json => magazine_collections_by_guns.json} (83%)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json
deleted file mode 100644
index 18f0ef4a45041..0000000000000
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/10mm_collection.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  {
-    "type": "item_group",
-    "subtype": "distribution",
-    "id": "magazines_10mm_glock",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-    "items": [
-      { "item": "glock_29mag", "prob": 250 },
-      { "item": "glock_20mag", "prob": 500 },
-      { "item": "tdi_10mm_mag", "prob": 70 }
-    ]
-  }
-]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/22_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/22_collection.json
deleted file mode 100644
index 84261c57228a5..0000000000000
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/22_collection.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-  {
-    "type": "item_group",
-    "subtype": "distribution",
-    "id": "magazines_22_ar",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-    "items": [ { "item": "22_ar15mag_10", "prob": 500 }, { "item": "22_ar15mag_28", "prob": 200 } ]
-  },
-  {
-    "type": "item_group",
-    "subtype": "distribution",
-    "id": "magazines_22_1022",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-    "items": [ { "item": "ruger1022mag", "prob": 500 }, { "item": "ruger1022bigmag", "prob": 300 } ]
-  },
-  {
-    "type": "item_group",
-    "subtype": "distribution",
-    "id": "magazines_22_cp33",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-    "items": [ { "item": "cp33_mag", "prob": 500 }, { "item": "cp33_mag_50", "prob": 100 } ]
-  }
-]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/40sw_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/40sw_collection.json
deleted file mode 100644
index 17a78018ad1dd..0000000000000
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/40sw_collection.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "type": "item_group",
-    "subtype": "distribution",
-    "id": "magazines_40_glock",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-    "items": [ { "item": "glock40mag", "prob": 500 }, { "item": "glock40bigmag", "prob": 350 } ]
-  }
-]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
similarity index 83%
rename from data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json
rename to data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index 7fd7aea8469ec..08222affc42dc 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/9mm_collection.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -224,5 +224,44 @@
       { "item": "uzimag_50rd", "prob": 50 },
       { "item": "uzimag_100rd", "prob": 1 }
     ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_40_glock",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "glock40mag", "prob": 500 }, { "item": "glock40bigmag", "prob": 350 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_10mm_glock",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "glock_29mag", "prob": 250 },
+      { "item": "glock_20mag", "prob": 500 },
+      { "item": "tdi_10mm_mag", "prob": 70 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_22_ar",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "22_ar15mag_10", "prob": 500 }, { "item": "22_ar15mag_28", "prob": 200 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_22_1022",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "ruger1022mag", "prob": 500 }, { "item": "ruger1022bigmag", "prob": 300 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_22_cp33",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "cp33_mag", "prob": 500 }, { "item": "cp33_mag_50", "prob": 100 } ]
   }
 ]

From 1863db916caa025a82a6de7653062f03f3774c5c Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Mon, 19 Aug 2024 14:55:02 -0600
Subject: [PATCH 11/26] Description change

---
 .../magazines/magazine_collections_by_guns.json                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index 08222affc42dc..c63a87ef8c274 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -1,9 +1,10 @@
 [
   {
+    "//": "These are collections of all guns with 2 or more magazines.  This was created to make magazine spawn ratios more exact.",
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_glock",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//2": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "glockmag", "prob": 300 },
       { "item": "glock17_17", "prob": 500 },

From 3e3aa5e3c30d389ae42eb3bbaf619af32aeb92dd Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Mon, 19 Aug 2024 15:25:23 -0600
Subject: [PATCH 12/26] 45 ACP

---
 .../magazine_collections_by_guns.json         | 32 +++++++++++++++++++
 .../magazines/magazines_by_caliber.json       | 22 +++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index c63a87ef8c274..b2424bec9969d 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -264,5 +264,37 @@
     "id": "magazines_22_cp33",
     "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "cp33_mag", "prob": 500 }, { "item": "cp33_mag_50", "prob": 100 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_45_glock",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "glock_21mag", "prob": 500 }, { "item": "glock_21mag26", "prob": 100 }, { "item": "tdi_mag", "prob": 50 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_45_thompson",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "thompson_mag", "prob": 500 },
+      { "item": "thompson_bigmag", "prob": 60 },
+      { "item": "thompson_drum", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_45_usc",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "usc10mag", "prob": 400 }, { "item": "usc15mag", "prob": 500 }, { "item": "usc20mag", "prob": 200 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_45_1911",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "m1911mag", "prob": 500 }, { "item": "m1911bigmag", "prob": 50 } ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 818861d6de167..8cd3903bac1f0 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -96,6 +96,21 @@
     "//": "Collections of magazines/speedloaders for 44 magnum guns that are sold in gunstores, such as the Colt Anaconda.",
     "items": [ { "item": "44_speedloader6", "prob": 100 }, { "item": "deaglemag", "prob": 17 } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_45",
+    "//": "Collections of magazines for 45 ACP guns that are sold in gunstores, such as Glocks, 1911s",
+    "items": [
+      { "group": "magazines_45_glock", "prob": 100 },
+      { "group": "magazines_45_thompson", "prob": 21 },
+      { "group": "magazines_45_usc", "prob": 18 },
+      { "group": "magazines_45_1911", "prob": 1107 },
+      { "item": "usp45mag", "prob": 30 },
+      { "item": "ppq45mag", "prob": 5 },
+      { "item": "hptjhpmag", "prob": 103 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",
@@ -110,5 +125,12 @@
       { "group": "magazines_9mm_tec9", "prob": 60 },
       { "group": "magazines_9mm_uzi", "prob": 18 }
     ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "rare_magazines_45",
+    "//": "Collections of magazines for 45 ACP guns that are rare and should only be found in collections or gunshows, such as MACs.",
+    "items": [ { "item": "mac10mag", "prob": 100 }, { "item": "ump45mag", "prob": 5 }, { "item": "greasegun30mag", "prob": 25 } ]
   }
 ]

From d6904b31adf98c4927a7ea3fa73017482d0482cf Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Mon, 19 Aug 2024 16:16:14 -0600
Subject: [PATCH 13/26] 57

---
 .../magazines/magazine_collections_by_guns.json       |  7 +++++++
 .../magazines/magazines_by_caliber.json               | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index b2424bec9969d..c44365288c2cb 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -296,5 +296,12 @@
     "id": "magazines_45_1911",
     "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "m1911mag", "prob": 500 }, { "item": "m1911bigmag", "prob": 50 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_57_ruger",
+    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "ruger_57_10_round_mag", "prob": 300 }, { "item": "ruger_57mag", "prob": 500 } ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 8cd3903bac1f0..279507ff22ae8 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -111,6 +111,17 @@
       { "item": "hptjhpmag", "prob": 103 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_57",
+    "//": "Collections of magazines for 5.7mm guns that can be found in gunstores.",
+    "items": [
+      { "group": "magazines_57_ruger", "prob": 100 },
+      { "item": "fn57mag", "prob": 13 },
+      { "item": "fnp90mag", "prob": 115 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From a7a173a78ac2ab822c1c4724684f0a209353108e Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Mon, 19 Aug 2024 16:53:30 -0600
Subject: [PATCH 14/26] 556

---
 .../magazine_collections_by_guns.json         | 110 +++++++++++++-----
 .../magazines/magazines_by_caliber.json       |  12 ++
 2 files changed, 92 insertions(+), 30 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index c44365288c2cb..ed36cd2262a73 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -4,7 +4,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_glock",
-    "//2": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//2": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "glockmag", "prob": 300 },
       { "item": "glock17_17", "prob": 500 },
@@ -18,7 +18,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_m9",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "m9mag_10rd", "prob": 300 },
       { "item": "m9mag", "prob": 500 },
@@ -34,7 +34,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_px4",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "px4mag_10rd", "prob": 200 },
       { "item": "px4mag_15rd", "prob": 400 },
@@ -46,7 +46,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_usp",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "usp9mag_10rd", "prob": 300 },
       { "item": "usp9mag", "prob": 500 },
@@ -58,14 +58,14 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_p226",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "p226mag_10rd_9x19mm", "prob": 500 }, { "item": "p226mag_15rd_9x19mm", "prob": 500 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_p320",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "p320mag_10rd_9x19mm", "prob": 250 },
       { "item": "p320mag_17rd_9x19mm", "prob": 500 },
@@ -83,7 +83,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_ppq",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "ppq9mag_10rd", "prob": 400 },
       { "item": "ppq9mag_15rd", "prob": 500 },
@@ -94,7 +94,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_hipoint_c9",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "hptc9mag_8rd", "prob": 500 },
       { "item": "hptc9mag_10rd", "prob": 100 },
@@ -105,7 +105,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_cz",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "cz75mag_16rd", "prob": 500 },
       { "item": "cz75mag_20rd", "prob": 100 },
@@ -123,21 +123,21 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_p38",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "p38mag", "prob": 500 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_ccp",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "ccpmag", "prob": 500 }, { "item": "ccpmag_9rd", "prob": 400 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_apc9",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "btmp9mag_9x19mm_10rd", "prob": 250 },
       { "item": "btmp9mag_9x19mm_15", "prob": 400 },
@@ -151,14 +151,14 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_calico",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "calicomag", "prob": 500 }, { "item": "calicomag_100rd", "prob": 200 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_mp5",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "mp5mag_10rd", "prob": 250 },
       { "item": "mp5mag_15rd", "prob": 350 },
@@ -174,35 +174,35 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_luger",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "p08mag_8rd", "prob": 500 }, { "item": "p08mag_32rd", "prob": 3 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_mauser",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "mausermag_10rd", "prob": 500 }, { "item": "mausermag_20rd", "prob": 50 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_mp40",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "mp40mag_32rd", "prob": 500 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_sten",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "stenmag", "prob": 500 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_tec9",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "tec9mag_20rd", "prob": 400 },
       { "item": "tec9mag_30rd", "prob": 450 },
@@ -216,7 +216,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_9mm_uzi",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "uzimag_20rd", "prob": 400 },
       { "item": "uzimag_25rd", "prob": 450 },
@@ -230,14 +230,14 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_40_glock",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "glock40mag", "prob": 500 }, { "item": "glock40bigmag", "prob": 350 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_10mm_glock",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "glock_29mag", "prob": 250 },
       { "item": "glock_20mag", "prob": 500 },
@@ -248,35 +248,35 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_22_ar",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "22_ar15mag_10", "prob": 500 }, { "item": "22_ar15mag_28", "prob": 200 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_22_1022",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "ruger1022mag", "prob": 500 }, { "item": "ruger1022bigmag", "prob": 300 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_22_cp33",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "cp33_mag", "prob": 500 }, { "item": "cp33_mag_50", "prob": 100 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_45_glock",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "glock_21mag", "prob": 500 }, { "item": "glock_21mag26", "prob": 100 }, { "item": "tdi_mag", "prob": 50 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_45_thompson",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "thompson_mag", "prob": 500 },
       { "item": "thompson_bigmag", "prob": 60 },
@@ -287,21 +287,71 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_45_usc",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "usc10mag", "prob": 400 }, { "item": "usc15mag", "prob": 500 }, { "item": "usc20mag", "prob": 200 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_45_1911",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "m1911mag", "prob": 500 }, { "item": "m1911bigmag", "prob": 50 } ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_57_ruger",
-    "//": "Collections of magazine for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "ruger_57_10_round_mag", "prob": 300 }, { "item": "ruger_57mag", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_stanag",
+    "//": "Collections of magazines for STANAG guns. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "stanag5", "prob": 300 },
+      { "item": "stanag5ranger", "prob": 30 },
+      { "item": "stanag10", "prob": 350 },
+      { "item": "stanag10ranger", "prob": 35 },
+      { "item": "stanag20", "prob": 400 },
+      { "item": "stanag20ranger", "prob": 40 },
+      { "item": "stanag30", "prob": 500 },
+      { "item": "stanag30ranger", "prob": 60 },
+      { "item": "stanag40", "prob": 200 },
+      { "item": "stanag40ranger", "prob": 20 },
+      { "item": "stanag50", "prob": 150 },
+      { "item": "stanag60", "prob": 15 },
+      { "item": "stanag60drum", "prob": 200 },
+      { "item": "stanag90", "prob": 10 },
+      { "item": "stanag100", "prob": 8 },
+      { "item": "stanag100drum", "prob": 8 },
+      { "item": "stanag150", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_mini14",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "ruger5", "prob": 300 },
+      { "item": "ruger10", "prob": 400 },
+      { "item": "ruger20", "prob": 400 },
+      { "item": "ruger30", "prob": 400 },
+      { "item": "ruger90", "prob": 60 },
+      { "item": "ruger100", "prob": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_aug",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "augmag_10rd", "prob": 250 },
+      { "item": "augmag_30rd", "prob": 500 },
+      { "item": "augmag_42rd", "prob": 40 }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 279507ff22ae8..86b2fcb986997 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -122,6 +122,18 @@
       { "item": "fnp90mag", "prob": 115 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_223",
+    "//": "Collections of magazines for 223/556 guns that can be found in gunstores.",
+    "items": [
+      { "group": "magazines_stanag", "prob": 1007 },
+      { "group": "magazines_mini14", "prob": 100 },
+      { "group": "magazines_aug", "prob": 28 },
+      { "item": "sl8mag", "prob": 4 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From 0acc04714fb6228cff46a7e8cf66a211199b20ef Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Tue, 20 Aug 2024 08:04:36 -0600
Subject: [PATCH 15/26] Add in a better description for magazines_by_caliber

---
 .../Weapons_Mods_Ammo/magazines/magazines_by_caliber.json      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 86b2fcb986997..a5b006cd342c1 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -1,9 +1,10 @@
 [
   {
+    "//": "Note, common and rare don't mean exactly that.  It's meant moreso as a dividing line between being able to feasibly pick this up at a gunstore, and only being found in collectors items.  For example, yes, an SL8 magazine is rare, but not on the level of a collectors item like a luger drum mag",
     "type": "item_group",
     "subtype": "distribution",
     "id": "common_magazines_9mm",
-    "//": "Collections of magazines for 9mm guns that are sold in gunstores, such as Glocks, M9s.",
+    "//2": "Collections of magazines for 9mm guns that are sold in gunstores, such as Glocks, M9s.",
     "items": [
       { "group": "magazines_9mm_glock", "prob": 100 },
       { "group": "magazines_9mm_m9", "prob": 20 },

From b4cbe66c48cef40628ec53717939508b42b4f67c Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Tue, 20 Aug 2024 16:29:57 -0600
Subject: [PATCH 16/26] 303/308

---
 .../magazine_collections_by_guns.json         | 47 +++++++++++++++++++
 .../magazines/magazines_by_caliber.json       | 23 +++++++++
 2 files changed, 70 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index ed36cd2262a73..6be830b172094 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -353,5 +353,52 @@
       { "item": "augmag_30rd", "prob": 500 },
       { "item": "augmag_42rd", "prob": 40 }
     ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_fal",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "falmag", "prob": 500 }, { "item": "falbigmag", "prob": 40 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_g3",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "g3mag", "prob": 500 }, { "item": "g3bigmag", "prob": 1 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_m14",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "m14smallmag", "prob": 300 }, { "item": "m14mag", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_m77",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "papm77mag_10rd", "prob": 400 }, { "item": "papm77mag", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_scarh",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "scarhmag", "prob": 500 }, { "item": "scarhbigmag", "prob": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_ar10",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "ar10mag_10rd", "prob": 300 },
+      { "item": "ar10mag_20rd", "prob": 500 },
+      { "item": "ar10mag_25rd", "prob": 50 },
+      { "item": "ar10mag_50rd", "prob": 5 }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index a5b006cd342c1..2eaefe043f4d6 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -135,6 +135,29 @@
       { "item": "sl8mag", "prob": 4 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_303",
+    "//": "Collections of magazines/strippers for 303 guns that can be found in gunstores.",
+    "items": [ { "item": "enfield_303mag", "prob": 10 }, { "item": "clip303_5rd", "prob": 100 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_303",
+    "//": "Collections of magazines for 308 guns that can be found in gunstores.",
+    "items": [
+      { "group": "magazines_fal", "prob": 25 },
+      { "group": "magazines_g3", "prob": 19 },
+      { "group": "magazines_m14", "prob": 300 },
+      { "group": "magazines_m77", "prob": 39 },
+      { "group": "magazines_scarh", "prob": 49 },
+      { "group": "magazines_ar10", "prob": 100 },
+      { "item": "steyr_scout_mag", "prob": 16 },
+      { "item": "ai_308mag_10", "prob": 1 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From 98ccf879515a95464cb3c959fa1bb00f63e6306f Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Wed, 21 Aug 2024 12:22:39 -0600
Subject: [PATCH 17/26] 380

---
 .../magazines/magazine_collections_by_guns.json     |  7 +++++++
 .../magazines/magazines_by_caliber.json             | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index 6be830b172094..32c153a31c549 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -400,5 +400,12 @@
       { "item": "ar10mag_25rd", "prob": 50 },
       { "item": "ar10mag_50rd", "prob": 5 }
     ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_hipoint380",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "hptcf380mag_8rd", "prob": 500 }, { "item": "hptcf380mag_10rd", "prob": 300 } ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 2eaefe043f4d6..bf3a4111cf133 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -145,7 +145,7 @@
   {
     "type": "item_group",
     "subtype": "distribution",
-    "id": "common_magazines_303",
+    "id": "common_magazines_308",
     "//": "Collections of magazines for 308 guns that can be found in gunstores.",
     "items": [
       { "group": "magazines_fal", "prob": 25 },
@@ -158,6 +158,17 @@
       { "item": "ai_308mag_10", "prob": 1 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_380",
+    "//": "Collections of magazines for 380 guns that can be found in gunstores.",
+    "items": [
+      { "group": "magazines_hipoint380", "prob": 44 },
+      { "item": "rugerlcpmag", "prob": 100 },
+      { "item": "hpt3895mag_10rd", "prob": 4 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From fe2702b80198356b3dd8bf442fcc7acbc15802c4 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Wed, 21 Aug 2024 12:29:57 -0600
Subject: [PATCH 18/26] 545/410

---
 .../magazines/magazine_collections_by_guns.json    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index 32c153a31c549..e43b753e69be4 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -407,5 +407,19 @@
     "id": "magazines_hipoint380",
     "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "hptcf380mag_8rd", "prob": 500 }, { "item": "hptcf380mag_10rd", "prob": 300 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_saiga410",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "saiga410mag_10rd", "prob": 500 }, { "item": "saiga410mag_30rd", "prob": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_ak74",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "ak74mag", "prob": 500 }, { "item": "rpk74mag", "prob": 20 } ]
   }
 ]

From 2104dff09f8b80a6df2b469ed2ad95e5e61dd537 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Wed, 21 Aug 2024 12:39:37 -0600
Subject: [PATCH 19/26] 762x39

---
 .../magazine_collections_by_guns.json         | 32 +++++++++++++++++++
 .../magazines/magazines_by_caliber.json       | 12 +++++++
 2 files changed, 44 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index e43b753e69be4..b4b9a7ede3fcd 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -421,5 +421,37 @@
     "id": "magazines_ak74",
     "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "ak74mag", "prob": 500 }, { "item": "rpk74mag", "prob": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_akm",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "akmag10", "prob": 300 },
+      { "item": "akmag20", "prob": 400 },
+      { "item": "akmag30", "prob": 500 },
+      { "item": "akmag40", "prob": 100 },
+      { "item": "akdrum75", "prob": 50 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_bren2762",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "bren2_762mag30", "prob": 500 }, { "item": "bren2_762mag10", "prob": 400 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_ar762",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "762_ar15mag_5rd", "prob": 200 },
+      { "item": "762_ar15mag_10rd", "prob": 400 },
+      { "item": "762_ar15mag_20rd", "prob": 500 },
+      { "item": "762_ar15mag_30rd", "prob": 300 }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index bf3a4111cf133..511a6b6ab21f7 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -169,6 +169,18 @@
       { "item": "hpt3895mag_10rd", "prob": 4 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_762",
+    "//": "Collections of magazines for 7.62x39 guns that can be found in gunstores.",
+    "items": [
+      { "group": "magazines_akm", "prob": 100 },
+      { "group": "magazines_bren2762", "prob": 44 },
+      { "group": "magazines_ar762", "prob": 19 },
+      { "item": "762x39_clip", "prob": 35 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From 288922145080f1354894a2a7bb9c6cc47fe0cfae Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Wed, 21 Aug 2024 12:42:23 -0600
Subject: [PATCH 20/26] 762x54mmR

---
 .../magazines/magazine_collections_by_guns.json            | 7 +++++++
 .../Weapons_Mods_Ammo/magazines/magazines_by_caliber.json  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index b4b9a7ede3fcd..91742b361b33b 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -453,5 +453,12 @@
       { "item": "762_ar15mag_20rd", "prob": 500 },
       { "item": "762_ar15mag_30rd", "prob": 300 }
     ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_psl",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "pslmag5", "prob": 200 }, { "item": "pslmag10", "prob": 500 } ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 511a6b6ab21f7..12f037b913a09 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -181,6 +181,13 @@
       { "item": "762x39_clip", "prob": 35 }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_762R",
+    "//": "Collections of magazines for 7.62x54mmR guns that can be found in gunstores.",
+    "items": [ { "group": "magazines_psl", "prob": 12 }, { "item": "762R_clip", "prob": 100 } ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From 687e693543c16c01b4f9e56924c622af00fbfb89 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Wed, 21 Aug 2024 12:47:18 -0600
Subject: [PATCH 21/26] 30-06

---
 .../Weapons_Mods_Ammo/magazines/magazines_by_caliber.json  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index 12f037b913a09..a7cfb31c071ae 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -188,6 +188,13 @@
     "//": "Collections of magazines for 7.62x54mmR guns that can be found in gunstores.",
     "items": [ { "group": "magazines_psl", "prob": 12 }, { "item": "762R_clip", "prob": 100 } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_3006",
+    "//": "Collections of magazines for 308 guns that can be found in gunstores.",
+    "items": [ { "item": "3006_clip", "prob": 33 }, { "item": "blrmag", "prob": 3 }, { "item": "garandclip", "prob": 100 } ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

From 59684d133bb64e2b7ee1bd047b194fe5e4a6dca1 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 23 Aug 2024 13:46:00 -0600
Subject: [PATCH 22/26] I'm no longer organized

---
 data/json/itemgroups/SUS/gunstore.json        |   4 +-
 .../magazine_collections_by_guns.json         |  59 ++++-
 .../magazines/magazines.json                  | 244 ++++--------------
 .../magazines/magazines_by_caliber.json       |  38 ++-
 data/json/mapgen/basement/basement_guns.json  |   2 +-
 .../lab/lab_surface/lab_surface_big_z-1.json  |   2 +-
 .../lab/lab_surface/lab_surface_big_z1.json   |   2 +-
 data/json/mapgen/nested/basement_nested.json  |  64 +----
 data/json/mapgen/storage_units_large.json     |   6 +-
 data/json/mapgen/storage_units_medium.json    |   3 +-
 data/json/mapgen_palettes/gunstore.json       |   2 +-
 .../weapons/weapon_expansion_groups.json      |  20 +-
 .../maps/mapgen/sadie_large_storage.json      |   3 +-
 data/mods/Backrooms/itemgroups.json           |   3 +-
 .../mods/Magiclysm/itemgroups/itemgroups.json |   6 +-
 .../psi_lab_surface_basement.json             |   2 +-
 .../psi_surface_lab/psi_lab_surface_z1.json   |   2 +-
 .../mapgen_palettes/other_palettes.json       |   2 +-
 18 files changed, 159 insertions(+), 305 deletions(-)

diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json
index a2bc1ea4ab9f4..c6b921c169d89 100644
--- a/data/json/itemgroups/SUS/gunstore.json
+++ b/data/json/itemgroups/SUS/gunstore.json
@@ -21,7 +21,7 @@
     "entries": [
       { "group": "guns_pistol_obscure_display", "prob": 15 },
       {
-        "collection": [ { "group": "guns_rifle_obscure_display" }, { "group": "mags_rifle_rare", "count": [ 1, 6 ] } ],
+        "collection": [ { "group": "guns_rifle_obscure_display" }, { "group": "mags_common", "count": [ 1, 6 ] } ],
         "prob": 45
       },
       {
@@ -46,7 +46,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 },
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index 91742b361b33b..af6ecdc203403 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -311,22 +311,22 @@
     "//": "Collections of magazines for STANAG guns. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [
       { "item": "stanag5", "prob": 300 },
-      { "item": "stanag5ranger", "prob": 30 },
+      { "item": "stanag5ranger", "prob": 100 },
       { "item": "stanag10", "prob": 350 },
-      { "item": "stanag10ranger", "prob": 35 },
+      { "item": "stanag10ranger", "prob": 115 },
       { "item": "stanag20", "prob": 400 },
-      { "item": "stanag20ranger", "prob": 40 },
-      { "item": "stanag30", "prob": 500 },
-      { "item": "stanag30ranger", "prob": 60 },
-      { "item": "stanag40", "prob": 200 },
+      { "item": "stanag20ranger", "prob": 130 },
+      { "item": "stanag30", "prob": 700 },
+      { "item": "stanag30ranger", "prob": 230 },
+      { "item": "stanag40", "prob": 80 },
       { "item": "stanag40ranger", "prob": 20 },
-      { "item": "stanag50", "prob": 150 },
-      { "item": "stanag60", "prob": 15 },
-      { "item": "stanag60drum", "prob": 200 },
-      { "item": "stanag90", "prob": 10 },
-      { "item": "stanag100", "prob": 8 },
-      { "item": "stanag100drum", "prob": 8 },
-      { "item": "stanag150", "prob": 5 }
+      { "item": "stanag50", "prob": 40 },
+      { "item": "stanag60", "prob": 10 },
+      { "item": "stanag60drum", "prob": 10 },
+      { "item": "stanag90", "prob": 8 },
+      { "item": "stanag100", "prob": 5 },
+      { "item": "stanag100drum", "prob": 5 },
+      { "item": "stanag150", "prob": 1 }
     ]
   },
   {
@@ -460,5 +460,38 @@
     "id": "magazines_psl",
     "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "pslmag5", "prob": 200 }, { "item": "pslmag10", "prob": 500 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_saiga12",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "saiga10mag", "prob": 500 }, { "item": "saiga30mag", "prob": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_shot_speedloaders",
+    "//": "Collections of speedloaders for shotguns.  Based on gunbroker capacity stats.",
+    "items": [ { "item": "shot_speedloader6", "prob": 3 }, { "item": "shot_speedloader8", "prob": 1 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_590m",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [
+      { "item": "mossberg_590m_mag_5", "prob": 500 },
+      { "item": "mossberg_590m_mag_10", "prob": 100 },
+      { "item": "mossberg_590m_mag_15", "prob": 20 },
+      { "item": "mossberg_590m_mag_20", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "magazines_mka",
+    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
+    "items": [ { "item": "mka_1919_5", "prob": 500 }, { "item": "mka_1919_10", "prob": 100 }, { "item": "mka_1919_20", "prob": 20 } ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
index 8b477a15c6da4..a24ffd729c48a 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
@@ -131,67 +131,43 @@
   },
   {
     "type": "item_group",
-    "id": "mags_pistol_common",
-    "//": "Factory specification pistol magazines commonly owned by citizens.",
+    "subtype": "distribution",
+    "id": "uncommon_magazines",
+    "//": "Yes this is a clunky solution that I don't like.  This is to allow magazines in common_magazines a <1 probabilty to spawn.",
+    "items": [ { "item": "deaglemag_50", "prob": 100 }, { "item": "makarovmag", "prob": 65 }, { "item": "tokarevmag", "prob": 45 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "mags_common",
+    "//": "Collections of magazines for guns that are common place, can be found in houses, gunstores, anywhere where you'd expect to find magazines. Weighted by caliber.",
     "items": [
-      [ "38_speedloader", 8 ],
-      [ "38_speedloader5", 6 ],
-      [ "38_speedloader6", 7 ],
-      [ "40_speedloader6", 10 ],
-      [ "glock17_17", 14 ],
-      [ "glock17_22", 6 ],
-      [ "px4mag", 55 ],
-      [ "px4mag_10rd", 5 ],
-      [ "px4mag_15rd", 25 ],
-      [ "px4mag_20rd", 5 ],
-      [ "px4_40mag", 6 ],
-      [ "glockmag", 33 ],
-      [ "glock40mag", 7 ],
-      [ "glock_20mag", 3 ],
-      [ "glock_21mag", 5 ],
-      [ "glock_29mag", 2 ],
-      [ "m1911mag", 25 ],
-      [ "m1911_10mag", 2 ],
-      [ "2011_17_mag", 2 ],
-      [ "2011_22_mag", 1 ],
-      [ "mosquitomag", 10 ],
-      [ "kpf9mag", 5 ],
-      [ "kpf9mag_8rd", 2 ],
-      [ "kp3atmag", 4 ],
-      [ "rugerlcpmag", 10 ],
-      [ "p220_10_mag", 1 ],
-      [ "p226mag_12rd_357sig", 25 ],
-      [ "p320mag_13rd_357sig", 10 ],
-      [ "bhp9mag_13rd", 2 ],
-      [ "bhp9mag_15rd", 1 ],
-      [ "ppq9mag_10rd", 4 ],
-      [ "ppq9mag_15rd", 2 ],
-      [ "ppq9mag_17rd", 1 ],
-      [ "ppq40mag_10rd", 3 ],
-      [ "ppq40mag_12rd", 2 ],
-      [ "ppq40mag_14rd", 1 ],
-      [ "ppq45mag", 1 ],
-      [ "taurus_spectrum_mag", 1 ],
-      [ "hptc9", 1 ],
-      [ "hptcf380mag_8rd", 2 ],
-      [ "hptcf380mag_10rd", 1 ],
-      [ "hpt3895mag_10rd", 1 ],
-      [ "hptjcpmag", 2 ],
-      [ "hptjhpmag", 2 ],
-      [ "witness_mag_10", 2 ],
-      [ "cz75mag_16rd", 9 ],
-      [ "cz75mag_20rd", 5 ],
-      [ "cz75mag_26rd", 2 ],
-      [ "ccpmag", 4 ],
-      [ "ccpmag_9rd", 1 ],
-      [ "xd_10_mag", 1 ],
-      [ "ruger_57mag", 10 ],
-      [ "ruger_57_10_round_mag", 10 ],
-      [ "wp22mag", 7 ],
-      [ "cp33_mag", 4 ],
-      [ "cp33_mag_50", 1 ],
-      [ "ruger_mk4_mag", 11 ],
-      [ "1911_22_mag", 7 ]
+      { "group": "common_magazines_9mm", "prob": 209 },
+      { "group": "common_magazines_10mm", "prob": 9 },
+      { "group": "common_magazines_22lr", "prob": 204 },
+      { "group": "common_magazines_30_carbine", "prob": 1 },
+      { "group": "common_magazines_32", "prob": 44 },
+      { "group": "common_magazines_38", "prob": 34 },
+      { "group": "common_magazines_40sw", "prob": 40 },
+      { "group": "common_magazines_44", "prob": 15 },
+      { "group": "common_magazines_45", "prob": 49 },
+      { "group": "common_magazines_57", "prob": 4 },
+      { "group": "common_magazines_223", "prob": 125 },
+      { "group": "common_magazines_303", "prob": 19 },
+      { "group": "common_magazines_308", "prob": 25 },
+      { "group": "common_magazines_380", "prob": 48 },
+      { "group": "common_magazines_762", "prob": 34 },
+      { "group": "common_magazines_762R", "prob": 4 },
+      { "group": "common_magazines_3006", "prob": 8 },
+      { "group": "common_magazines_450", "prob": 1 },
+      { "group": "common_magazines_12", "prob": 8 },
+      { "group": "uncommon_magazines", "prob": 3 },
+      { "group": "magazines_ak74", "prob": 1 },
+      { "item": "500_speedloader5", "prob": 1 },
+      { "item": "ruger_pr_mag", "prob": 1 },
+      { "item": "454_speedloader5", "prob": 25 },
+      { "item": "50beowulf_ar15mag", "prob": 2 },
+      { "item": "m1911mag_10rd_38super", "prob": 2 }
     ]
   },
   {
@@ -200,63 +176,21 @@
     "//": "Makeshift or otherwise poor quality pistol magazines.",
     "items": [  ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_pistol_rare",
-    "//": "Aftermarket or otherwise uncommon pistol magazines excluding milspec.",
-    "items": [
-      [ "22_speedloader8", 15 ],
-      [ "44_speedloader6", 15 ],
-      [ "454_speedloader5", 5 ],
-      [ "500_speedloader5", 5 ],
-      [ "glock_drum_50rd", 5 ],
-      [ "glock_drum_100rd", 5 ],
-      [ "glock_21mag26", 5 ],
-      [ "90two40mag", 5 ],
-      [ "deaglemag", 10 ],
-      [ "deaglemag_50", 10 ],
-      [ "deaglemag_357", 10 ],
-      [ "fn57mag", 80 ],
-      [ "cz75mag_26rd", 2 ],
-      [ "tdi_10mm_mag", 1 ],
-      [ "glock40bigmag", 30 ],
-      [ "m1911bigmag", 40 ],
-      [ "m1911mag_10rd_38super", 10 ],
-      [ "m9bigmag", 20 ],
-      [ "m9mag_10rd", 20 ],
-      [ "m9mag_17rd", 30 ],
-      [ "m9mag_18rd", 5 ],
-      [ "m9mag_20rd", 20 ],
-      [ "m9mag_32rd", 2 ],
-      [ "m9mag_35rd", 2 ],
-      [ "sig40mag", 40 ],
-      [ "sigp230mag", 40 ],
-      [ "kp32mag", 5 ],
-      [ "fn1910mag", 2 ],
-      { "item": "fnp90mag", "prob": 2, "charges": [ 0, 50 ] },
-      [ "p38mag", 1 ],
-      [ "ppkmag", 15 ],
-      [ "usp9mag_10rd", 5 ],
-      [ "usp9mag_18rd", 5 ],
-      [ "usp9mag_20rd", 3 ],
-      [ "usp9mag_32rd", 1 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "mags_pistol_hunting",
-    "//": "Empty magazines for high-caliber pistols found within hunting supply stores and related locations.",
+    "//": "Empty magazines for high-caliber pistols found within hunting supply stores and related locations.  Speed loaders have a lower chance as they're not required for the gun to operate, and I don't imagine quicker reloads being horribly important in hunting game.",
     "items": [
-      { "item": "glock_20mag", "prob": 30, "charges": 0 },
-      { "item": "deaglemag", "prob": 15, "charges": 0 },
-      { "item": "deaglemag_50", "prob": 15, "charges": 0 },
-      { "item": "deaglemag_357", "prob": 15, "charges": 0 },
-      { "item": "500_speedloader5", "prob": 15, "charges": 0 },
-      { "item": "38_speedloader6", "prob": 40, "charges": 0 },
-      { "item": "38_speedloader", "prob": 40, "charges": 0 },
-      { "item": "40_speedloader6", "prob": 30, "charges": 0 },
-      { "item": "44_speedloader6", "prob": 30, "charges": 0 },
-      { "item": "454_speedloader5", "prob": 20, "charges": 0 }
+      { "group": "magazines_10mm_glock", "prob": 170 },
+      { "item": "deaglemag", "prob": 71 },
+      { "item": "deaglemag_50", "prob": 35 },
+      { "item": "deaglemag_357", "prob": 100 },
+      { "item": "500_speedloader5", "prob": 9 },
+      { "item": "38_speedloader6", "prob": 60 },
+      { "item": "38_speedloader", "prob": 20 },
+      { "item": "40_speedloader6", "prob": 5 },
+      { "item": "44_speedloader6", "prob": 35 },
+      { "item": "454_speedloader5", "prob": 5 }
     ]
   },
   {
@@ -405,47 +339,6 @@
     "//": "Makeshift or otherwise poor quality rifle magazines.",
     "items": [ [ "survivor223mag", 50 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_rifle_rare",
-    "//": "Aftermarket or otherwise uncommon rifle magazines excluding milspec.",
-    "items": [
-      [ "akmag10", 40 ],
-      [ "akmag20", 40 ],
-      [ "akmag40", 40 ],
-      [ "akdrum75", 30 ],
-      [ "clip303_5rd", 15 ],
-      [ "clip_77mm_arisaka", 10 ],
-      [ "enfield_303mag", 4 ],
-      [ "fnp90mag", 15 ],
-      [ "falmag", 100 ],
-      [ "falbigmag", 50 ],
-      [ "steyr_scout_mag", 5 ],
-      [ "g3mag", 80 ],
-      [ "g3bigmag", 40 ],
-      [ "m1918bigmag", 40 ],
-      [ "ruger1022bigmag", 70 ],
-      [ "stanag60drum", 10 ],
-      [ "stanag90", 10 ],
-      [ "stanag100drum", 15 ],
-      [ "stanag150", 10 ],
-      [ "ar10mag_50rd", 10 ],
-      [ "augmag_10rd", 5 ],
-      [ "augmag_30rd", 15 ],
-      [ "augmag_42rd", 5 ],
-      [ "augmag_100rd", 2 ],
-      [ "sl8mag", 10 ],
-      [ "usc10mag", 5 ],
-      [ "usc15mag", 7 ],
-      [ "usc20mag", 20 ],
-      [ "mrad_338lapua_mag", 5 ],
-      [ "ai_338mag", 15 ],
-      [ "ai_338mag_10", 10 ],
-      [ "ai_308mag_10", 15 ],
-      [ "m1carbinebigmag", 30 ],
-      [ "ak74mag", 8 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "mags_rifle_hunting",
@@ -518,28 +411,6 @@
     "//": "Makeshift or otherwise poor quality magazines that have no better category.",
     "items": [ [ "pressurized_tank_chem", 5 ], [ "pressurized_tank_modern", 10 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_common",
-    "//": "Common magazines for guns typically owned by citizens.",
-    "items": [
-      { "group": "mags_pistol_common", "prob": 70 },
-      { "group": "mags_rifle_common", "prob": 50 },
-      { "group": "mags_smg_rare", "prob": 5 },
-      { "group": "mags_shotgun_common", "prob": 5 },
-      { "group": "mags_other_common", "prob": 5 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "mags_common_gunstore",
-    "//": "Common magazines for guns typically owned by citizens.",
-    "items": [
-      { "group": "mags_pistol_common", "prob": 70 },
-      { "group": "mags_rifle_common_gunstore", "prob": 50 },
-      { "group": "mags_shotgun_common", "prob": 10 }
-    ]
-  },
   {
     "type": "item_group",
     "id": "mags_makeshift",
@@ -552,12 +423,6 @@
       { "group": "mags_other_makeshift", "prob": 5 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_rare",
-    "//": "Aftermarket or otherwise uncommon magazines.",
-    "items": [ { "group": "mags_pistol_rare", "prob": 70 }, { "group": "mags_rifle_rare", "prob": 20 } ]
-  },
   {
     "type": "item_group",
     "id": "mags_obscure",
@@ -578,24 +443,11 @@
       [ "greasegun30mag", 5 ]
     ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_crime",
-    "//": "Magazines for guns typically used by criminals.",
-    "items": [
-      { "group": "mags_common", "prob": 10 },
-      { "group": "mags_makeshift", "prob": 5 },
-      { "group": "mags_rare", "prob": 20 },
-      { "group": "mags_obscure", "prob": 20 },
-      { "group": "mags_smg_common", "prob": 10 },
-      { "group": "mags_smg_rare", "prob": 5 }
-    ]
-  },
   {
     "type": "item_group",
     "id": "mags_hunting",
     "subtype": "distribution",
     "//": "Empty store magazines for hunting guns.",
-    "entries": [ { "group": "mags_pistol_hunting", "prob": 100 }, { "group": "mags_rifle_hunting", "prob": 100 } ]
+    "entries": [ { "group": "mags_pistol_hunting", "prob": 10 }, { "group": "mags_rifle_hunting", "prob": 100 } ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index a7cfb31c071ae..fc06ef94b349a 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -31,10 +31,10 @@
     "items": [
       { "group": "magazines_10mm_glock", "prob": 100 },
       { "item": "40_speedloader6", "prob": 16 },
-      { "item": "m1911_10mag", "prob": 7 },
-      { "item": "p220_10_mag", "prob": 9 },
-      { "item": "witness_mag_10", "prob": 2 },
-      { "item": "xd_10_mag", "prob": 24 }
+      { "item": "m1911_10mag", "prob": 3 },
+      { "item": "p220_10_mag", "prob": 21 },
+      { "item": "witness_mag_10", "prob": 13 },
+      { "item": "xd_10_mag", "prob": 19 }
     ]
   },
   {
@@ -73,9 +73,10 @@
     "id": "common_magazines_38",
     "//": "Collections of speedloaders for 38/357 revolvers that are sold in gunstores, such as a 686 or Model 10.",
     "items": [
-      { "item": "38_speedloader", "prob": 58 },
-      { "item": "38_speedloader5", "prob": 100 },
-      { "item": "38_speedloader6", "prob": 14 }
+      { "item": "38_speedloader", "prob": 10 },
+      { "item": "38_speedloader5", "prob": 31 },
+      { "item": "38_speedloader6", "prob": 100 },
+      { "item": "deaglemag_357", "prob": 7 }
     ]
   },
   {
@@ -154,8 +155,7 @@
       { "group": "magazines_m77", "prob": 39 },
       { "group": "magazines_scarh", "prob": 49 },
       { "group": "magazines_ar10", "prob": 100 },
-      { "item": "steyr_scout_mag", "prob": 16 },
-      { "item": "ai_308mag_10", "prob": 1 }
+      { "item": "steyr_scout_mag", "prob": 16 }
     ]
   },
   {
@@ -195,6 +195,26 @@
     "//": "Collections of magazines for 308 guns that can be found in gunstores.",
     "items": [ { "item": "3006_clip", "prob": 33 }, { "item": "blrmag", "prob": 3 }, { "item": "garandclip", "prob": 100 } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_450",
+    "//": "Collections of magazines for 450 Bushmaster guns that can be found in gunstores.",
+    "items": [ { "item": "450_ar15mag", "prob": 100 }, { "item": "ruger_arr_mag", "prob": 54 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "common_magazines_12",
+    "//": "Collections of magazines for 12 gauge guns that can be found in gunstores.",
+    "items": [
+      { "group": "magazines_saiga12", "prob": 6 },
+      { "group": "magazines_shot_speedloaders", "prob": 20 },
+      { "group": "magazines_590m", "prob": 8 },
+      { "group": "magazines_mka", "prob": 100 },
+      { "item": "srm_1216_mag_16", "prob": 2 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",
diff --git a/data/json/mapgen/basement/basement_guns.json b/data/json/mapgen/basement/basement_guns.json
index 9cb5f6168d3eb..1f66c5ad87202 100644
--- a/data/json/mapgen/basement/basement_guns.json
+++ b/data/json/mapgen/basement/basement_guns.json
@@ -50,7 +50,7 @@
       "place_loot": [
         { "group": "guns_rare", "x": 6, "y": 2, "chance": 20, "magazine": 100 },
         { "group": "guns_rare", "x": 7, "y": 2, "chance": 20, "magazine": 100 },
-        { "group": "mags_rare", "x": 8, "y": 2, "chance": 20 },
+        { "group": "mags_common", "x": 8, "y": 2, "chance": 20 },
         { "group": "guns_common", "x": 9, "y": 2, "chance": 100, "magazine": 100 },
         { "group": "mags_common", "x": 10, "y": 2, "chance": 100, "repeat": [ 1, 3 ] },
         { "group": "guns_common", "x": 11, "y": 2, "chance": 100, "magazine": 100 },
diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json b/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json
index 02e784d4d282d..d6633802c264e 100644
--- a/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json
+++ b/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json
@@ -64,7 +64,7 @@
         ],
         "l": [
           { "item": "guns_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 20, "repeat": 5 },
+          { "item": "mags_common", "chance": 20, "repeat": 5 },
           { "item": "ammo_pistol_rare", "chance": 20, "repeat": [ 5, 10 ] }
         ]
       },
diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_big_z1.json b/data/json/mapgen/lab/lab_surface/lab_surface_big_z1.json
index 512f1e04bd0db..1e6eebc6b20a3 100644
--- a/data/json/mapgen/lab/lab_surface/lab_surface_big_z1.json
+++ b/data/json/mapgen/lab/lab_surface/lab_surface_big_z1.json
@@ -173,7 +173,7 @@
         "l": { "item": "cleaning", "chance": 70, "repeat": [ 1, 8 ] },
         "L": [
           { "item": "guns_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 40, "repeat": 5 },
+          { "item": "mags_common", "chance": 40, "repeat": 5 },
           { "item": "ammo_pistol_rare", "chance": 40, "repeat": [ 5, 10 ] }
         ],
         "t": [ { "item": "snacks", "chance": 5 }, { "item": "dining", "chance": 10 } ],
diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json
index 97036477e3b3c..55519e0b67632 100644
--- a/data/json/mapgen/nested/basement_nested.json
+++ b/data/json/mapgen/nested/basement_nested.json
@@ -1478,13 +1478,7 @@
           { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] },
           { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }
         ],
-        ",": [
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] },
-          { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }
-        ],
+        ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ],
         "=": [
           { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "ammo_shotgun_reloaded", "chance": 50, "repeat": [ 1, 2 ] },
@@ -1554,13 +1548,7 @@
           { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] },
           { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }
         ],
-        ",": [
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] },
-          { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }
-        ],
+        ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ],
         "=": [
           { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "ammo_shotgun_reloaded", "chance": 50, "repeat": [ 1, 2 ] },
@@ -1630,13 +1618,7 @@
           { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] },
           { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }
         ],
-        ",": [
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] },
-          { "item": "mags_smg_common", "chance": 5, "repeat": [ 1, 2 ] },
-          { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }
-        ],
+        ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ],
         "=": [
           { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "ammo_shotgun_reloaded", "chance": 50, "repeat": [ 1, 2 ] },
@@ -1705,13 +1687,7 @@
           { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] },
           { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }
         ],
-        ",": [
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] },
-          { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }
-        ],
+        ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ],
         "=": [
           { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "ammo_shotgun_reloaded", "chance": 50, "repeat": [ 1, 2 ] },
@@ -3797,13 +3773,7 @@
           { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] },
           { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }
         ],
-        ",": [
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] },
-          { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }
-        ],
+        ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ],
         "=": [
           { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "ammo_shotgun_reloaded", "chance": 50, "repeat": [ 1, 2 ] },
@@ -3888,13 +3858,7 @@
           { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] },
           { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }
         ],
-        ",": [
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] },
-          { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }
-        ],
+        ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ],
         "=": [
           { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "ammo_shotgun_reloaded", "chance": 50, "repeat": [ 1, 2 ] },
@@ -3979,13 +3943,7 @@
           { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] },
           { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }
         ],
-        ",": [
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] },
-          { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }
-        ],
+        ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ],
         "=": [
           { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "ammo_shotgun_reloaded", "chance": 50, "repeat": [ 1, 2 ] },
@@ -4070,13 +4028,7 @@
           { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] },
           { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }
         ],
-        ",": [
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] },
-          { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }
-        ],
+        ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ],
         "=": [
           { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "ammo_shotgun_reloaded", "chance": 50, "repeat": [ 1, 2 ] },
diff --git a/data/json/mapgen/storage_units_large.json b/data/json/mapgen/storage_units_large.json
index 827ad97d201aa..4c34e3097a205 100644
--- a/data/json/mapgen/storage_units_large.json
+++ b/data/json/mapgen/storage_units_large.json
@@ -80,8 +80,7 @@
         { "item": "mil_accessories", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
         { "item": "weapons", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
         { "item": "ammo_pistol_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
-        { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
-        { "item": "mags_crime", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
+        { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 3 ] },
         { "item": "homeguns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
         { "item": "mansion_guns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
         { "item": "gunmod_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
@@ -353,8 +352,7 @@
         { "item": "mil_accessories", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] },
         { "item": "weapons", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 35, "repeat": [ 1, 6 ] },
         { "item": "ammo_pistol_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
-        { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
-        { "item": "mags_crime", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
+        { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 40, "repeat": [ 1, 6 ] },
         { "item": "homeguns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
         { "item": "mansion_guns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] },
         { "item": "gunmod_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] },
diff --git a/data/json/mapgen/storage_units_medium.json b/data/json/mapgen/storage_units_medium.json
index bf269d964a365..7e4aed6b7fcdb 100644
--- a/data/json/mapgen/storage_units_medium.json
+++ b/data/json/mapgen/storage_units_medium.json
@@ -80,8 +80,7 @@
         { "item": "mil_accessories", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
         { "item": "weapons", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
         { "item": "ammo_pistol_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
-        { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
-        { "item": "mags_crime", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
+        { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 3 ] },
         { "item": "homeguns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
         { "item": "mansion_guns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
         { "item": "gunmod_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 3 ] },
diff --git a/data/json/mapgen_palettes/gunstore.json b/data/json/mapgen_palettes/gunstore.json
index 247ee6f1d4d47..ce338dffb19ab 100644
--- a/data/json/mapgen_palettes/gunstore.json
+++ b/data/json/mapgen_palettes/gunstore.json
@@ -139,7 +139,7 @@
         "item": {
           "//": "civilian magazines kept on racks behind the counter in the FoH",
           "subtype": "collection",
-          "entries": [ { "group": "mags_common_gunstore", "prob": 70 }, { "group": "mags_pistol_rare", "prob": 30 } ]
+          "entries": [ { "group": "mags_common", "prob": 70 }, { "group": "mags_common", "prob": 30 } ]
         },
         "repeat": 15,
         "chance": 65
diff --git a/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json b/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json
index 184a58f01c502..b9fa76aeae7f4 100644
--- a/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json
+++ b/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json
@@ -68,15 +68,17 @@
   },
   {
     "type": "item_group",
-    "id": "mags_pistol_rare",
-    "copy-from": "mags_pistol_rare",
-    "extend": { "items": [ [ "afs_5x50_50_mag", 5 ], [ "afs_5x50_100_mag", 5 ], [ "afs_84k_20mag", 15 ] ] }
-  },
-  {
-    "type": "item_group",
-    "id": "mags_rifle_rare",
-    "copy-from": "mags_rifle_rare",
-    "extend": { "items": [ [ "afs_UICASTA30", 40 ], [ "afs_UICASTA100drum", 20 ] ] }
+    "id": "mags_common",
+    "copy-from": "mags_common",
+    "extend": {
+      "items": [
+        [ "afs_5x50_50_mag", 10 ],
+        [ "afs_5x50_100_mag", 6 ],
+        [ "afs_84k_20mag", 20 ],
+        [ "afs_UICASTA30", 30 ],
+        [ "afs_UICASTA100drum", 15 ]
+      ]
+    }
   },
   {
     "type": "item_group",
diff --git a/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json b/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json
index dda3c0a9cf9ef..fa9b2c550c057 100644
--- a/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json
+++ b/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json
@@ -79,8 +79,7 @@
         { "item": "mil_accessories", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] },
         { "item": "weapons", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 35, "repeat": [ 1, 6 ] },
         { "item": "ammo_pistol_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
-        { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
-        { "item": "mags_crime", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
+        { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 40, "repeat": [ 1, 6 ] },
         { "item": "homeguns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
         { "item": "mansion_guns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] },
         { "item": "gunmod_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] },
diff --git a/data/mods/Backrooms/itemgroups.json b/data/mods/Backrooms/itemgroups.json
index 73c3eb7e64c6a..4836197fcffbe 100644
--- a/data/mods/Backrooms/itemgroups.json
+++ b/data/mods/Backrooms/itemgroups.json
@@ -182,11 +182,10 @@
       { "group": "guns_shotgun_common", "prob": 60 },
       { "group": "guns_shotgun_rare", "prob": 25 },
       { "group": "mags_pistol_common", "prob": 75 },
-      { "group": "mags_pistol_rare", "prob": 50 },
+      { "group": "mags_common", "prob": 100 },
       { "group": "mags_smg_common", "prob": 50 },
       { "group": "mags_smg_rare", "prob": 50 },
       { "group": "mags_rifle_common", "prob": 60 },
-      { "group": "mags_rifle_rare", "prob": 50 },
       { "group": "mags_milspec", "prob": 100 },
       { "group": "ammo_launcher_grenade", "prob": 20 },
       { "group": "archery", "prob": 25 }
diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json
index 7958b210d095a..d7992908415b5 100644
--- a/data/mods/Magiclysm/itemgroups/itemgroups.json
+++ b/data/mods/Magiclysm/itemgroups/itemgroups.json
@@ -135,9 +135,9 @@
   },
   {
     "type": "item_group",
-    "id": "mags_rifle_rare",
-    "copy-from": "mags_rifle_rare",
-    "extend": { "items": [ [ "borealmosin_clip", 5 ] ] }
+    "id": "mags_common",
+    "copy-from": "mags_common",
+    "extend": { "items": [ [ "borealmosin_clip", 4 ] ] }
   },
   {
     "type": "item_group",
diff --git a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json
index b46f9d1197705..0246a7369cbfb 100644
--- a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json
+++ b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json
@@ -64,7 +64,7 @@
         ],
         "l": [
           { "item": "guns_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 20, "repeat": 5 },
+          { "item": "mags_common", "chance": 20, "repeat": 5 },
           { "item": "ammo_pistol_rare", "chance": 20, "repeat": [ 5, 10 ] }
         ]
       },
diff --git a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json
index b14d4a8fb4937..90203795be4c9 100644
--- a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json
+++ b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json
@@ -173,7 +173,7 @@
         "l": { "item": "cleaning", "chance": 70, "repeat": [ 1, 8 ] },
         "L": [
           { "item": "guns_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] },
-          { "item": "mags_pistol_rare", "chance": 40, "repeat": 5 },
+          { "item": "mags_common", "chance": 40, "repeat": 5 },
           { "item": "ammo_pistol_rare", "chance": 40, "repeat": [ 5, 10 ] }
         ],
         "t": [ { "item": "snacks", "chance": 5 }, { "item": "dining", "chance": 10 } ],
diff --git a/data/mods/No_Hope/mapgen_palettes/other_palettes.json b/data/mods/No_Hope/mapgen_palettes/other_palettes.json
index 5e0e68466db4a..bb1f5d9a50830 100644
--- a/data/mods/No_Hope/mapgen_palettes/other_palettes.json
+++ b/data/mods/No_Hope/mapgen_palettes/other_palettes.json
@@ -996,7 +996,7 @@
         "item": {
           "//": "civilian magazines kept on racks behind the counter in the FoH",
           "subtype": "collection",
-          "entries": [ { "group": "mags_common_gunstore", "prob": 20 }, { "group": "mags_pistol_rare", "prob": 30 } ]
+          "entries": [ { "group": "mags_common", "prob": 20 }, { "group": "mags_common", "prob": 30 } ]
         },
         "chance": 65
       },

From 800c0be123881077bb12534253fe7f8b3e7f9ca2 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 23 Aug 2024 15:59:28 -0600
Subject: [PATCH 23/26] More stuff

---
 .../Locations_MapExtras/locations.json        |   2 +-
 .../locations_commercial.json                 |   8 +-
 .../Locations_MapExtras/mansion.json          |   2 +-
 data/json/itemgroups/SUS/gunstore.json        |  21 +-
 .../magazines/magazines.json                  | 203 ------------------
 data/json/mapgen/farm_supply.json             |   4 +-
 .../mapgen/nested/rural_outdoors_nested.json  |   4 +-
 .../weapons/weapon_expansion_groups.json      |  17 +-
 data/mods/Backrooms/itemgroups.json           |  14 +-
 9 files changed, 20 insertions(+), 255 deletions(-)

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
index c3c840d82eb22..e2e526715919e 100644
--- 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
index 7b563dc59848d..99bfb246997c4 100644
--- 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
index 9fc7053dc2a7b..14226e4e33a1e 100644
--- 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
index c6b921c169d89..ea091ac7832ac 100644
--- 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_common", "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 }
     ]
   },
   {
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
index a24ffd729c48a..0e65fb851a709 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
@@ -193,152 +193,6 @@
       { "item": "454_speedloader5", "prob": 5 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_smg_common",
-    "//": "Factory specification SMG magazines commonly owned by citizens.",
-    "items": [
-      [ "mac10mag", 10 ],
-      [ "mac11mag", 5 ],
-      [ "mp5mag", 10 ],
-      [ "mp5mag_10rd", 2 ],
-      [ "mp5mag_15rd", 2 ],
-      [ "mp5mag_20rd", 2 ],
-      [ "stenmag", 5 ],
-      [ "tec9mag", 10 ],
-      [ "tec9mag_10rd", 6 ],
-      [ "tec9mag_20rd", 3 ],
-      [ "tec9mag_30rd", 5 ],
-      [ "tec9mag_36rd", 1 ],
-      [ "tec9mag_50rd", 3 ],
-      [ "tec9mag_72rd", 1 ],
-      [ "tdi_mag", 5 ],
-      [ "thompson_mag", 5 ],
-      [ "ump9mag", 3 ],
-      [ "ump40mag", 4 ],
-      [ "ump45mag", 4 ],
-      [ "uzimag", 10 ],
-      [ "uzimag_20rd", 1 ],
-      [ "uzimag_25rd", 1 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "mags_smg_makeshift",
-    "//": "Makeshift or otherwise poor quality SMG magazines.",
-    "items": [
-      { "item": "survivor9mm_mag", "prob": 50, "charges": [ 0, 20 ] },
-      { "item": "smg_40_mag", "prob": 15, "charges": [ 0, 20 ] },
-      { "item": "smg_45_mag", "prob": 20, "charges": [ 0, 20 ] }
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "mags_smg_rare",
-    "//": "Aftermarket or otherwise uncommon SMG magazines excluding milspec.",
-    "items": [
-      [ "calicomag", 19 ],
-      [ "calicomag_100rd", 15 ],
-      [ "fnp90mag", 150 ],
-      [ "tdi_10mm_mag", 65 ],
-      [ "mp5bigmag", 2 ],
-      [ "mp5mag_38rd", 5 ],
-      [ "mp5mag_40rd", 10 ],
-      [ "mp5mag_100rd", 2 ],
-      [ "mp5_10_mag", 1 ],
-      [ "uzimag_40rd", 1 ],
-      [ "uzimag_50rd", 1 ],
-      [ "uzimag_100rd", 5 ],
-      [ "thompson_bigmag", 5 ],
-      [ "thompson_drum", 98 ],
-      [ "btmp9mag_9x19mm_10rd", 1 ],
-      [ "btmp9mag_9x19mm_15", 1 ],
-      [ "btmp9mag_9x19mm_20", 1 ],
-      [ "btmp9mag_9x19mm_25", 1 ],
-      [ "btmp9mag_9x19mm_30", 1 ],
-      [ "btmp9mag_9x19mm_50rd", 1 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "mags_rifle_common",
-    "//": "Factory specification rifle magazines commonly owned by citizens.",
-    "items": [
-      { "item": "blrmag", "prob": 5, "charges": [ 0, 4 ] },
-      { "item": "ruger_pr_mag", "prob": 5, "charges": [ 0, 5 ] },
-      { "item": "ruger_arr_mag", "prob": 12, "charges": [ 0, 3 ] },
-      { "item": "m14mag", "prob": 40, "charges": [ 0, 20 ] },
-      { "item": "m14smallmag", "prob": 40, "charges": [ 0, 5 ] },
-      [ "marlin_tubeloader", 5 ],
-      { "item": "ruger1022mag", "prob": 100, "charges": [ 0, 10 ] },
-      { "item": "ruger5", "prob": 50, "charges": [ 0, 5 ] },
-      { "item": "ruger10", "prob": 30, "charges": [ 0, 10 ] },
-      { "item": "stanag10", "prob": 30, "charges": [ 0, 10 ] },
-      { "item": "ruger20", "prob": 15, "charges": [ 0, 20 ] },
-      { "item": "ruger30", "prob": 20, "charges": [ 0, 30 ] },
-      { "item": "ruger90", "prob": 3, "charges": [ 0, 90 ] },
-      { "item": "ruger100", "prob": 5, "charges": [ 0, 100 ] },
-      { "item": "stanag5", "prob": 5, "charges": [ 0, 5 ] },
-      { "item": "stanag10", "prob": 5, "charges": [ 0, 10 ] },
-      { "item": "stanag20", "prob": 5, "charges": [ 0, 20 ] },
-      { "item": "stanag30", "prob": 10, "charges": [ 0, 30 ] },
-      { "item": "stanag40", "prob": 3, "charges": [ 0, 40 ] },
-      { "item": "ar10mag_10rd", "prob": 30, "charges": [ 0, 10 ] },
-      { "item": "ar10mag_20rd", "prob": 30, "charges": [ 0, 20 ] },
-      { "item": "ar10mag_25rd", "prob": 20, "charges": [ 0, 25 ] },
-      { "item": "akmag30", "prob": 25, "charges": [ 0, 30 ] },
-      { "item": "zpap85mag", "prob": 25, "charges": [ 0, 30 ] },
-      { "item": "papm77mag_10rd", "prob": 25, "charges": [ 0, 10 ] },
-      { "item": "bren2_762mag30", "prob": 10, "charges": [ 0, 30 ] },
-      { "item": "bren2_762mag10", "prob": 10, "charges": [ 0, 10 ] }
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "mags_rifle_common_gunstore",
-    "//": "Factory specification rifle magazines commonly owned by citizens.",
-    "items": [
-      { "item": "blrmag", "prob": 5 },
-      { "item": "ruger_pr_mag", "prob": 5 },
-      { "item": "ruger_arr_mag", "prob": 12 },
-      { "item": "m14mag", "prob": 40 },
-      { "item": "m14smallmag", "prob": 40 },
-      [ "marlin_tubeloader", 5 ],
-      { "item": "ruger1022mag", "prob": 80 },
-      { "item": "ruger5", "prob": 50 },
-      { "item": "ruger10", "prob": 30 },
-      { "item": "stanag10", "prob": 80 },
-      { "item": "ruger20", "prob": 15 },
-      { "item": "ruger30", "prob": 15 },
-      { "item": "ruger90", "prob": 5 },
-      { "item": "ruger100", "prob": 5 },
-      { "item": "stanag5", "prob": 60 },
-      { "item": "stanag5ranger", "prob": 5 },
-      { "item": "stanag10", "prob": 5 },
-      { "item": "stanag10ranger", "prob": 2 },
-      { "item": "stanag20", "prob": 5 },
-      { "item": "stanag20ranger", "prob": 2 },
-      { "item": "stanag30", "prob": 5 },
-      { "item": "stanag30ranger", "prob": 3 },
-      { "item": "stanag40", "prob": 3 },
-      { "item": "ar10mag_10rd", "prob": 30 },
-      { "item": "ar10mag_20rd", "prob": 30 },
-      { "item": "ar10mag_25rd", "prob": 20 },
-      { "item": "akmag30", "prob": 5 },
-      { "item": "m1carbinemag", "prob": 15 },
-      { "item": "zpap85mag", "prob": 5 },
-      { "item": "papm77mag_10rd", "prob": 5 },
-      { "item": "papm77mag", "prob": 5 },
-      { "item": "bren2_762mag30", "prob": 5 },
-      { "item": "bren2_762mag10", "prob": 5 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "mags_rifle_makeshift",
-    "//": "Makeshift or otherwise poor quality rifle magazines.",
-    "items": [ [ "survivor223mag", 50 ] ]
-  },
   {
     "type": "item_group",
     "id": "mags_rifle_hunting",
@@ -356,37 +210,12 @@
       { "item": "450_ar15mag", "prob": 10, "charges": 0 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_shotgun_common",
-    "//": "Factory specification shotgun magazines commonly owned by citizens.",
-    "items": [ [ "shot_speedloader6", 15 ], [ "shot_speedloader8", 15 ] ]
-  },
   {
     "type": "item_group",
     "id": "mags_shotgun_makeshift",
     "//": "Makeshift or otherwise poor quality shotgun magazines.",
     "items": [ [ "shotbelt_20", 1 ] ]
   },
-  {
-    "type": "item_group",
-    "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 },
-      { "item": "saiga410mag_30rd", "prob": 10 },
-      { "item": "mka_1919_5", "prob": 4 },
-      { "item": "mka_1919_10", "prob": 4 },
-      { "item": "mka_1919_20", "prob": 3 },
-      { "item": "mossberg_590m_mag_5", "prob": 3, "charges": 0 },
-      { "item": "mossberg_590m_mag_10", "prob": 2, "charges": 0 },
-      { "item": "mossberg_590m_mag_15", "prob": 1, "charges": 0 },
-      { "item": "mossberg_590m_mag_20", "prob": 1, "charges": 0 }
-    ]
-  },
   {
     "type": "item_group",
     "id": "mags_other_common",
@@ -411,38 +240,6 @@
     "//": "Makeshift or otherwise poor quality magazines that have no better category.",
     "items": [ [ "pressurized_tank_chem", 5 ], [ "pressurized_tank_modern", 10 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_makeshift",
-    "//": "Makeshift or otherwise poor quality magazines.",
-    "items": [
-      { "group": "mags_pistol_makeshift", "prob": 30 },
-      { "group": "mags_rifle_makeshift", "prob": 20 },
-      { "group": "mags_smg_makeshift", "prob": 10 },
-      { "group": "mags_shotgun_makeshift", "prob": 5 },
-      { "group": "mags_other_makeshift", "prob": 5 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "mags_obscure",
-    "//": "Magazines for imported firearms.",
-    "items": [
-      [ "762x39_clip", 10 ],
-      [ "762R_clip", 10 ],
-      [ "clip9mm_10rd", 5 ],
-      [ "ak74mag", 10 ],
-      [ "makarovmag", 10 ],
-      [ "mausermag_10rd", 3 ],
-      [ "mausermag_20rd", 2 ],
-      [ "mp40mag_32rd", 5 ],
-      [ "p08mag_32rd", 1 ],
-      [ "p08mag_8rd", 10 ],
-      [ "rpk74mag", 10 ],
-      [ "tokarevmag", 10 ],
-      [ "greasegun30mag", 5 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "mags_hunting",
diff --git a/data/json/mapgen/farm_supply.json b/data/json/mapgen/farm_supply.json
index 4ba0557e1cc3a..479f490ac680c 100644
--- a/data/json/mapgen/farm_supply.json
+++ b/data/json/mapgen/farm_supply.json
@@ -75,7 +75,7 @@
             "entries": [
               { "group": "ammo_rifle_common_collection", "prob": 25 },
               { "group": "ammo_shotgun_common_collection", "prob": 40 },
-              { "group": "mags_rifle_common_gunstore", "prob": 35 }
+              { "group": "mags_common", "prob": 35 }
             ]
           },
           "chance": 100,
@@ -530,7 +530,7 @@
             "entries": [
               { "group": "ammo_rifle_common_collection", "prob": 25 },
               { "group": "ammo_shotgun_common_collection", "prob": 40 },
-              { "group": "mags_rifle_common_gunstore", "prob": 35 }
+              { "group": "mags_common", "prob": 35 }
             ]
           },
           "chance": 7,
diff --git a/data/json/mapgen/nested/rural_outdoors_nested.json b/data/json/mapgen/nested/rural_outdoors_nested.json
index 302a4c2a8643d..b000d6553c35d 100644
--- a/data/json/mapgen/nested/rural_outdoors_nested.json
+++ b/data/json/mapgen/nested/rural_outdoors_nested.json
@@ -239,7 +239,7 @@
         { "chance": 70, "item": "stash_wood", "x": 3, "y": [ 0, 1 ], "repeat": [ 2, 5 ] },
         { "chance": 30, "item": "guns_rifle_common", "x": 3, "y": 3 },
         { "chance": 50, "item": "ammo_rifle_common", "x": 3, "y": 3, "repeat": [ 2, 4 ] },
-        { "chance": 40, "item": "mags_rifle_common", "x": 3, "y": 3, "repeat": [ 1, 2 ] }
+        { "chance": 40, "item": "mags_common", "x": 3, "y": 3, "repeat": [ 1, 2 ] }
       ],
       "place_npcs": [ { "class": "bandit", "x": 1, "y": 2 } ],
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
@@ -451,7 +451,7 @@
         { "chance": 70, "item": "bed", "x": [ 0, 1 ], "y": [ 1, 2 ], "repeat": [ 3, 6 ] },
         { "chance": 30, "item": "guns_rifle_common", "x": [ 0, 1 ], "y": [ 1, 2 ], "repeat": [ 2, 4 ] },
         { "chance": 50, "item": "ammo_rifle_common", "x": [ 0, 1 ], "y": [ 1, 2 ], "repeat": [ 2, 4 ] },
-        { "chance": 40, "item": "mags_rifle_common", "x": [ 0, 1 ], "y": [ 1, 2 ], "repeat": [ 2, 4 ] },
+        { "chance": 40, "item": "mags_common", "x": [ 0, 1 ], "y": [ 1, 2 ], "repeat": [ 2, 4 ] },
         { "chance": 60, "item": "cannedfood", "x": [ 0, 1 ], "y": 0, "repeat": [ 2, 6 ] },
         { "chance": 60, "item": "pasta", "x": [ 0, 1 ], "y": 0, "repeat": [ 2, 4 ] },
         { "chance": 60, "item": "snacks", "x": [ 0, 1 ], "y": 0, "repeat": [ 1, 3 ] },
diff --git a/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json b/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json
index b9fa76aeae7f4..940ca6648d2c7 100644
--- a/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json
+++ b/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json
@@ -72,11 +72,12 @@
     "copy-from": "mags_common",
     "extend": {
       "items": [
-        [ "afs_5x50_50_mag", 10 ],
-        [ "afs_5x50_100_mag", 6 ],
-        [ "afs_84k_20mag", 20 ],
-        [ "afs_UICASTA30", 30 ],
-        [ "afs_UICASTA100drum", 15 ]
+        [ "afs_5x50_50_mag", 9 ],
+        [ "afs_5x50_100_mag", 5 ],
+        [ "afs_84k_20mag", 18 ],
+        [ "afs_UICASTA30", 28 ],
+        [ "afs_UICASTA100drum", 14 ],
+        [ "afs_25mm_mag", 12 ]
       ]
     }
   },
@@ -85,12 +86,6 @@
     "id": "afs_UICASTA30",
     "items": [ [ "afs_UICASTA30", 40 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "mags_shotgun_rare",
-    "copy-from": "mags_shotgun_rare",
-    "extend": { "items": [ [ "afs_25mm_mag", 50 ] ] }
-  },
   {
     "type": "item_group",
     "id": "ammo_pistol_milspec",
diff --git a/data/mods/Backrooms/itemgroups.json b/data/mods/Backrooms/itemgroups.json
index 4836197fcffbe..8f5b3c33dbfa6 100644
--- a/data/mods/Backrooms/itemgroups.json
+++ b/data/mods/Backrooms/itemgroups.json
@@ -106,9 +106,7 @@
       { "group": "ammo_rifle_reloaded", "prob": 100 },
       { "group": "ammo_shotgun_common", "prob": 75 },
       { "group": "ammo_shotgun_reloaded", "prob": 100 },
-      { "group": "mags_pistol_common", "prob": 50 },
-      { "group": "mags_smg_common", "prob": 35 },
-      { "group": "mags_rifle_common", "prob": 35 },
+      { "group": "mags_common", "prob": 130 },
       { "group": "guns_pistol_common", "prob": 10 },
       { "group": "guns_pistol_improvised", "prob": 20 },
       { "group": "guns_smg_common", "prob": 5 },
@@ -181,11 +179,7 @@
       { "group": "guns_rifle_rare", "prob": 15 },
       { "group": "guns_shotgun_common", "prob": 60 },
       { "group": "guns_shotgun_rare", "prob": 25 },
-      { "group": "mags_pistol_common", "prob": 75 },
-      { "group": "mags_common", "prob": 100 },
-      { "group": "mags_smg_common", "prob": 50 },
-      { "group": "mags_smg_rare", "prob": 50 },
-      { "group": "mags_rifle_common", "prob": 60 },
+      { "group": "mags_common", "prob": 435 },
       { "group": "mags_milspec", "prob": 100 },
       { "group": "ammo_launcher_grenade", "prob": 20 },
       { "group": "archery", "prob": 25 }
@@ -217,9 +211,7 @@
       { "group": "grenades", "prob": 5 },
       { "group": "swat_gear", "prob": 5 },
       { "group": "ammo_parts", "prob": 60 },
-      { "group": "mags_pistol_common", "prob": 50 },
-      { "group": "mags_smg_common", "prob": 25 },
-      { "group": "mags_rifle_common", "prob": 25 },
+      { "group": "mags_common", "prob": 100 },
       { "group": "archery", "prob": 5 },
       { "group": "antique_ammo", "prob": 15 },
       { "group": "archery_ammo", "prob": 10 }

From d0ef57c6929af568264a76b34725af345bba2278 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sat, 24 Aug 2024 10:45:35 -0600
Subject: [PATCH 24/26] Update hunting, collector mags

---
 .../magazines/magazines.json                  | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
index 0e65fb851a709..4d06d16d9b897 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
@@ -172,9 +172,17 @@
   },
   {
     "type": "item_group",
-    "id": "mags_pistol_makeshift",
-    "//": "Makeshift or otherwise poor quality pistol magazines.",
-    "items": [  ]
+    "subtype": "distribution",
+    "id": "mags_collector",
+    "//": "Collections of magazines for guns that are quite rare, and should only be found in private collections.",
+    "items": [
+      { "group": "rare_magazines_9mm", "prob": 209 },
+      { "group": "rare_magazines_45", "prob": 49 },
+      { "item": "ump40mag", "prob": 3 },
+      { "item": "hk46mag", "prob": 8 },
+      { "item": "hk46bigmag", "prob": 1 },
+      { "item": "mac11mag", "prob": 35 }
+    ]
   },
   {
     "type": "item_group",
@@ -185,7 +193,7 @@
       { "item": "deaglemag", "prob": 71 },
       { "item": "deaglemag_50", "prob": 35 },
       { "item": "deaglemag_357", "prob": 100 },
-      { "item": "500_speedloader5", "prob": 9 },
+      { "item": "500_speedloader5", "prob": 4 },
       { "item": "38_speedloader6", "prob": 60 },
       { "item": "38_speedloader", "prob": 20 },
       { "item": "40_speedloader6", "prob": 5 },
@@ -198,16 +206,14 @@
     "id": "mags_rifle_hunting",
     "//": "Empty hunting rifle magazines found within hunting supply stores and related locations.",
     "items": [
-      { "item": "ruger1022mag", "prob": 40, "charges": 0 },
-      { "item": "ruger1022bigmag", "prob": 30, "charges": 0 },
-      { "item": "blrmag", "prob": 20, "charges": 0 },
-      { "item": "ruger_pr_mag", "prob": 20, "charges": 0 },
-      { "item": "ruger_arr_mag", "prob": 25, "charges": 0 },
-      { "item": "steyr_scout_mag", "prob": 5, "charges": 0 },
-      { "item": "ar10mag_10rd", "prob": 30, "charges": 0 },
-      { "item": "ar10mag_20rd", "prob": 30, "charges": 0 },
-      { "item": "50beowulf_ar15mag", "prob": 10, "charges": 0 },
-      { "item": "450_ar15mag", "prob": 10, "charges": 0 }
+      { "group": "common_magazines_223", "prob": 25 },
+      { "group": "common_magazines_308", "prob": 60 },
+      { "group": "common_magazines_762", "prob": 12 },
+      { "group": "common_magazines_762R", "prob": 8 },
+      { "group": "common_magazines_3006", "prob": 15 },
+      { "group": "common_magazines_450", "prob": 10 },
+      { "group": "magazines_22_1022", "prob": 100 },
+      { "group": "magazines_22_ar", "prob": 6 }
     ]
   },
   {

From 2a1d06ee7323dfd7cf9e8392f35a6c71a7d5ff34 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sat, 24 Aug 2024 10:51:42 -0600
Subject: [PATCH 25/26] Explanation of numbers

---
 .../Weapons_Mods_Ammo/magazines/magazines_by_caliber.json      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
index fc06ef94b349a..a67b60eeab738 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
@@ -1,10 +1,11 @@
 [
   {
     "//": "Note, common and rare don't mean exactly that.  It's meant moreso as a dividing line between being able to feasibly pick this up at a gunstore, and only being found in collectors items.  For example, yes, an SL8 magazine is rare, but not on the level of a collectors item like a luger drum mag",
+    "//2": "Magazines are weighted by gun ratios on gunbroker, the gun with prob of 100 is the basis of these ratios, and further additions should be compared to that",
     "type": "item_group",
     "subtype": "distribution",
     "id": "common_magazines_9mm",
-    "//2": "Collections of magazines for 9mm guns that are sold in gunstores, such as Glocks, M9s.",
+    "//3": "Collections of magazines for 9mm guns that are sold in gunstores, such as Glocks, M9s.",
     "items": [
       { "group": "magazines_9mm_glock", "prob": 100 },
       { "group": "magazines_9mm_m9", "prob": 20 },

From a79e0bf34892936c1de576ac421c5ce8ebe5629d Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Sun, 25 Aug 2024 09:20:23 -0600
Subject: [PATCH 26/26] Remove saiga 410 mags

The saiga 410 is gonna get deleted in a future PR
---
 .../magazines/magazine_collections_by_guns.json            | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
index af6ecdc203403..ef9faf451e013 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -408,13 +408,6 @@
     "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
     "items": [ { "item": "hptcf380mag_8rd", "prob": 500 }, { "item": "hptcf380mag_10rd", "prob": 300 } ]
   },
-  {
-    "type": "item_group",
-    "subtype": "distribution",
-    "id": "magazines_saiga410",
-    "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-    "items": [ { "item": "saiga410mag_10rd", "prob": 500 }, { "item": "saiga410mag_30rd", "prob": 20 } ]
-  },
   {
     "type": "item_group",
     "subtype": "distribution",