fix: glock 22 will spawn with correct loaded magazines (#5102)

* fix: glock 22 will spawn with correct loaded magazines * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Jul 29, 2024 · a131dd1 · a131dd1
1 parent 0475716
commit a131dd1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json
@@ -54,8 +54,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "glock_22", "ammo-group": "on_hand_40", "charges": [ 0, 15 ] },
-      { "group": "nested_glock22_mag", "charges-min": 0, "prob": 80 },
-      { "group": "nested_glock22_mag", "charges-min": 0, "prob": 50 },
+      { "group": "nested_glock22_mag", "ammo-group": "on_hand_40", "charges-min": 0, "prob": 80 },
+      { "group": "nested_glock22_mag", "ammo-group": "on_hand_40", "charges-min": 0, "prob": 50 },
       { "group": "on_hand_40", "prob": 25, "charges": [ 10, 20 ], "count": [ 1, 2 ] }
     ]
   },
@@ -66,8 +66,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "glock_31", "ammo-group": "on_hand_357sig", "charges": [ 0, 15 ] },
-      { "group": "nested_glock31_mag", "charges-min": 0, "prob": 80 },
-      { "group": "nested_glock31_mag", "charges-min": 0, "prob": 50 },
+      { "group": "nested_glock31_mag", "ammo-group": "on_hand_357sig", "charges-min": 0, "prob": 80 },
+      { "group": "nested_glock31_mag", "ammo-group": "on_hand_357sig", "charges-min": 0, "prob": 50 },
       { "group": "on_hand_357sig", "prob": 25, "charges": [ 10, 20 ], "count": [ 1, 2 ] }
     ]
   },
@@ -78,8 +78,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "ar_357sig", "ammo-group": "on_hand_357sig", "charges": [ 0, 15 ] },
-      { "group": "nested_glock31_mag", "charges-min": 0, "prob": 80 },
-      { "group": "nested_glock31_mag", "charges-min": 0, "prob": 50 },
+      { "group": "nested_glock31_mag", "ammo-group": "on_hand_357sig", "charges-min": 0, "prob": 80 },
+      { "group": "nested_glock31_mag", "ammo-group": "on_hand_357sig", "charges-min": 0, "prob": 50 },
       { "group": "on_hand_357sig", "prob": 25, "charges": [ 10, 20 ], "count": [ 1, 2 ] }
     ]
   },
@@ -978,8 +978,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "mkg_banshee", "ammo-group": "on_hand_40", "charges": [ 0, 15 ] },
-      { "group": "nested_glock22_mag", "charges-min": 0, "prob": 80 },
-      { "group": "nested_glock22_mag", "charges-min": 0, "prob": 50 },
+      { "group": "nested_glock22_mag", "ammo-group": "on_hand_40", "charges-min": 0, "prob": 80 },
+      { "group": "nested_glock22_mag", "ammo-group": "on_hand_40", "charges-min": 0, "prob": 50 },
       { "group": "on_hand_40", "prob": 25, "charges": [ 10, 20 ], "count": [ 1, 2 ] }
     ]
   },

diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
@@ -29,7 +29,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": [ "40", "357sig" ],
+    "ammo_type": "40",
     "capacity": 12,
     "reliability": 8,
     "reload_time": 140,
@@ -101,7 +101,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": [ "40", "357sig" ],
+    "ammo_type": "40",
     "capacity": 14,
     "reliability": 8,
     "reload_time": 140,