1 files changed, 52 insertions, 19 deletions
diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 6336f5e..3fe8f7c 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 }
+      { "item": "nested_usp_40", "prob": 55 },
+      { "item": "nested_hk_p30_9", "prob": 50 },
+      { "item": "nested_hk_p30_40", "prob": 45 },
+      { "item": "nested_hk_45", "prob": 40 }
     ]
   },
   {
@@ -15,10 +15,10 @@
     "id": "guns_pistol_rare_display",
     "//": "Empty uncommon pistols found exclusively at gun stores.",
     "items": [
-      { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 0 },
-      { "item": "hk_p30_9", "prob": 90, "charges-min": 0, "charges-max": 0 },
-      { "item": "hk_p30_40", "prob": 90, "charges-min": 0, "charges-max": 0 },
-      { "item": "hk_45", "prob": 90, "charges-min": 0, "charges-max": 0 }
+      { "item": "usp_40", "prob": 25, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_p30_9", "prob": 25, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_p30_40", "prob": 15, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_45", "prob": 6, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -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 }
+      { "item": "nested_hk_ump9", "prob": 40 },
+      { "item": "nested_hk_ump40", "prob": 35 }
     ]
   },
   {
@@ -35,8 +35,8 @@
     "id": "guns_smg_rare_display",
     "//": "Less common SMGs found exclusively in gun stores.",
     "items": [
-      { "item": "hk_ump9", "prob": 30, "charges-min": 0, "charges-max": 0 },
-      { "item": "hk_ump40", "prob": 30, "charges-min": 0, "charges-max": 0 }
+      { "item": "hk_ump9", "prob": 40, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_ump40", "prob": 35, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -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, "charges-min": 0, "charges-max": 20 }
     ]
   },
   {
@@ -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 }
+      { "item": "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 }
+      { "item": "nested_hk_msg90a2", "prob": 15 },
+      { "item": "nested_hk_g11", "prob": 30 }
     ]
   },
   {
@@ -77,13 +77,46 @@
     "id": "guns_shotgun_milspec",
     "//": "Military shotguns currently in service.",
     "items": [
-      { "item": "hk_caws", "prob": 30, "charges-min": 0, "charges-max": 10 }
+      { "item": "nested_hk_caws", "prob": 30 }
     ]
   },
   {
     "type": "item_group",
-    "id": "guns_cop",
-    "//": "Police issue weapons of all types",
+    "id": "sidearms_cop_in_field",
+    "//": "gun plus potential expended magazines",
+    "items": [
+      {
+        "collection": [ { "item": "usp_40", "prob": 100, "charges": [ 0, 13 ] }, { "group": "field_usp_40" } ],
+        "prob": 10
+      },
+      {
+        "collection": [ { "item": "hk_p30_9", "prob": 100, "charges": [ 0, 15 ] }, { "group": "field_hk_p30_9" } ],
+        "prob": 10
+      },
+      {
+        "collection": [ { "item": "hk_p30_40", "prob": 100, "charges": [ 0, 13 ] }, { "group": "field_hk_p30_40" } ],
+        "prob": 10
+      },
+      {
+        "collection": [ { "item": "hk_45", "prob": 100, "charges": [ 0, 10 ] }, { "group": "field_hk_45" } ],
+        "prob": 10
+      }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sidearms_cop_in_field_no_gun",
+    "//": "guns lost but still have mags",
+    "items": [
+      { "item": "field_usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 },
+      { "item": "field_hk_p30_9", "prob": 10, "charges-min": 0, "charges-max": 15 },
+      { "item": "field_hk_p30_40", "prob": 10, "charges-min": 0, "charges-max": 13 },
+      { "item": "field_hk_45", "prob": 10, "charges-min": 0, "charges-max": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sidearms_cop",
     "items": [
       { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 },
       { "item": "hk_p30_9", "prob": 10, "charges-min": 0, "charges-max": 15 },