From 32e5faada9bf15f18709d014eb3aa5f8d2cf419f Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 14 Mar 2023 23:41:03 -0700
Subject: Fix nested groups being marked as items.

---
 json/itemgroups/Weapons_Mods_Ammo/guns.json        | 30 +++++++++++-----------
 json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json |  6 ++---
 2 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 3fe8f7c..2df10de 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": "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 }
+      { "group": "nested_usp_40", "prob": 55 },
+      { "group": "nested_hk_p30_9", "prob": 50 },
+      { "group": "nested_hk_p30_40", "prob": 45 },
+      { "group": "nested_hk_45", "prob": 40 }
     ]
   },
   {
@@ -26,8 +26,8 @@
     "id": "guns_smg_rare",
     "//": "Less common SMGs including those only used by police/paramilitary forces.",
     "items": [
-      { "item": "nested_hk_ump9", "prob": 40 },
-      { "item": "nested_hk_ump40", "prob": 35 }
+      { "group": "nested_hk_ump9", "prob": 40 },
+      { "group": "nested_hk_ump40", "prob": 35 }
     ]
   },
   {
@@ -44,7 +44,7 @@
     "id": "guns_pistol_milspec",
     "//": "Military specification pistols only ever found at military sites.",
     "items": [
-      { "item": "nested_hk_ucp", "prob": 35, "charges-min": 0, "charges-max": 20 }
+      { "group": "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": "nested_hk_psg1a1", "prob": 15 }
+      { "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": "nested_hk_msg90a2", "prob": 15 },
-      { "item": "nested_hk_g11", "prob": 30 }
+      { "group": "nested_hk_msg90a2", "prob": 15 },
+      { "group": "nested_hk_g11", "prob": 30 }
     ]
   },
   {
@@ -77,7 +77,7 @@
     "id": "guns_shotgun_milspec",
     "//": "Military shotguns currently in service.",
     "items": [
-      { "item": "nested_hk_caws", "prob": 30 }
+      { "group": "nested_hk_caws", "prob": 30 }
     ]
   },
   {
@@ -108,10 +108,10 @@
     "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 }
+      { "group": "field_usp_40", "prob": 10 },
+      { "group": "field_hk_p30_9", "prob": 10 },
+      { "group": "field_hk_p30_40", "prob": 10 },
+      { "group": "field_hk_45", "prob": 10 }
     ]
   },
   {
diff --git a/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
index d995c3d..65a940f 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
@@ -5,9 +5,9 @@
     "//": "a collection of ammo that would be found with a loaded gun.",
     "subtype": "distribution",
     "entries": [
-      { "item": "473", "prob": 100, "charges": [ 1, 40 ] },
-      { "item": "473", "prob": 75, "charges": [ 44, 80 ] },
-      { "item": "473", "prob": 30, "charges": [ 88, 160 ] }
+      { "item": "473x33mm", "prob": 100, "charges": [ 1, 40 ] },
+      { "item": "473x33mm", "prob": 75, "charges": [ 44, 80 ] },
+      { "item": "473x33mm", "prob": 30, "charges": [ 88, 160 ] }
     ]
   }
 ]
-- 
cgit v1.2.1