1 files changed, 18 insertions, 18 deletions
diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 6336f5e..78bfae1 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -4,10 +4,10 @@
     "id": "guns_pistol_rare",
     "//": "Less common pistols including those only used by police/paramilitary forces.",
     "items": [
-      { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 13 },
-      { "item": "hk_p30_9", "prob": 90, "charges-min": 0, "charges-max": 15 },
-      { "item": "hk_p30_40", "prob": 90, "charges-min": 0, "charges-max": 13 },
-      { "item": "hk_45", "prob": 90, "charges-min": 0, "charges-max": 10 }
+      { "group": "nested_usp_40", "prob": 90 },
+      { "group": "nested_hk_p30_9", "prob": 90 },
+      { "group": "nested_hk_p30_40", "prob": 90 },
+      { "group": "nested_hk_45", "prob": 90 }
     ]
   },
   {
@@ -26,8 +26,8 @@
     "id": "guns_smg_rare",
     "//": "Less common SMGs including those only used by police/paramilitary forces.",
     "items": [
-      { "item": "hk_ump9", "prob": 30, "charges-min": 0, "charges-max": 30 },
-      { "item": "hk_ump40", "prob": 30, "charges-min": 0, "charges-max": 30 }
+      { "group": "nested_hk_ump9", "prob": 30 },
+      { "group": "nested_hk_ump40", "prob": 3- }
     ]
   },
   {
@@ -44,7 +44,7 @@
     "id": "guns_pistol_milspec",
     "//": "Military specification pistols only ever found at military sites.",
     "items": [
-      { "item": "hk_ucp", "prob": 35, "charges-min": 0, "charges-max": 20 }
+      { "item": "nested_hk_ucp", "prob": 35 }
     ]
   },
   {
@@ -52,7 +52,7 @@
     "id": "guns_rifle_rare",
     "//": "Less common rifles including those only used by police/paramilitary forces.",
     "items": [
-      { "item": "hk_psg1a1", "prob": 15, "charges-min": 0, "charges-max": 20 }
+      { "group": "nested_hk_psg1a1", "prob": 15 }
     ]
   },
   {
@@ -68,8 +68,8 @@
     "id": "guns_rifle_milspec",
     "//": "Military specification rifles only ever found at military sites.",
     "items": [
-      { "item": "hk_msg90a2", "prob": 15, "charges-min": 0, "charges-max": 20 },
-      { "item": "hk_g11", "prob": 30, "charges-min": 0, "charges-max": 50 }
+      { "group": "nested_hk_msg90a2", "prob": 15 },
+      { "group": "nested_hk_g11", "prob": 30 }
     ]
   },
   {
@@ -77,18 +77,18 @@
     "id": "guns_shotgun_milspec",
     "//": "Military shotguns currently in service.",
     "items": [
-      { "item": "hk_caws", "prob": 30, "charges-min": 0, "charges-max": 10 }
+      { "group": "nested_hk_caws", "prob": 30 }
     ]
   },
   {
     "type": "item_group",
-    "id": "guns_cop",
+    "id": "sidearms_cop",
     "//": "Police issue weapons of all types",
     "items": [
-      { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 },
-      { "item": "hk_p30_9", "prob": 10, "charges-min": 0, "charges-max": 15 },
-      { "item": "hk_p30_40", "prob": 10, "charges-min": 0, "charges-max": 13 },
-      { "item": "hk_45", "prob": 10, "charges-min": 0, "charges-max": 10 }
+      { "group": "nested_usp_40", "prob": 10 },
+      { "group": "nested_hk_p30_9", "prob": 10 },
+      { "group": "nested_hk_p30_40", "prob": 10 },
+      { "group": "nested_hk_45", "prob": 10 }
     ]
   },
   {
@@ -96,8 +96,8 @@
     "id": "guns_swat",
     "//": "Guns issued to paramilitary forces in addition to standard police issue.",
     "items": [
-      { "item": "hk_ump9", "prob": 15, "charges-min": 0, "charges-max": 30 },
-      { "item": "hk_ump40", "prob": 15, "charges-min": 0, "charges-max": 30 }
+      { "group": "nested_hk_ump9", "prob": 15 },
+      { "group": "nested_hk_ump40", "prob": 15 }
     ]
   }
 ]