fixes

cataclysmbnteam · Jun 20, 2024 · 96c202c · 96c202c
1 parent bde62e4
commit 96c202c
Show file tree

Hide file tree

Showing 4 changed files with 21 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
@@ -62,8 +62,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "glock_31", "ammo-group": "on_hand_357sig", "charges": [ 0, 15 ] },
-      { "group": "nested_glock22_mag", "charges-min": 0 },
-      { "group": "nested_glock22_mag", "charges-min": 0, "prob": 50 }
+      { "group": "nested_glock31_mag", "charges-min": 0 },
+      { "group": "nested_glock31_mag", "charges-min": 0, "prob": 50 }
     ]
   },
   {
@@ -73,8 +73,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "ar_357sig", "ammo-group": "on_hand_357sig", "charges": [ 0, 15 ] },
-      { "group": "nested_glock22_mag", "charges-min": 0 },
-      { "group": "nested_glock22_mag", "charges-min": 0, "prob": 50 }
+      { "group": "nested_glock31_mag", "charges-min": 0 },
+      { "group": "nested_glock31_mag", "charges-min": 0, "prob": 50 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -73,8 +73,8 @@
     "ammo": 100,
     "entries": [
       { "item": "glock_31", "ammo-group": "on_hand_357sig", "charges": [ 0, 15 ] },
-      { "group": "nested_glock22_mag" },
-      { "group": "nested_glock22_mag", "prob": 50 },
+      { "group": "nested_glock31_mag" },
+      { "group": "nested_glock31_mag", "prob": 50 },
       { "group": "on_hand_357sig" }
     ]
   },
@@ -86,8 +86,8 @@
     "ammo": 100,
     "entries": [
       { "item": "ar_357sig", "ammo-group": "on_hand_357sig", "charges": [ 0, 15 ] },
-      { "group": "nested_glock22_mag" },
-      { "group": "nested_glock22_mag", "prob": 50 },
+      { "group": "nested_glock31_mag" },
+      { "group": "nested_glock31_mag", "prob": 50 },
       { "group": "on_hand_357sig" }
     ]
   },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json
@@ -59,6 +59,17 @@
       { "item": "glock40drum50rd", "ammo-group": "on_hand_40", "prob": 5 }
     ]
   },
+  {
+    "id": "nested_glock31_mag",
+    "type": "item_group",
+    "subtype": "distribution",
+    "ammo": 100,
+    "entries": [
+      { "item": "glock40mag", "ammo-group": "on_hand_357sig", "prob": 100 },
+      { "item": "glock40bigmag", "ammo-group": "on_hand_357sig", "prob": 5 },
+      { "item": "glock40drum50rd", "ammo-group": "on_hand_357sig", "prob": 5 }
+    ]
+  },
   {
     "id": "nested_m1911_mag",
     "type": "item_group",

diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json
@@ -53,8 +53,8 @@
     "looks_like": "ar15",
     "copy-from": "rifle_semi",
     "type": "GUN",
-    "name": { "str": "Moriarti MA-357Sig-16" },
-    "description": "A semi-automatic rifle using .357 SIG rounds.  It is also compatible with Glock 31 magazines.",
+    "name": { "str": "Moriarti AR .357sig" },
+    "description": "A semi-automatic rifle using .357 SIG rounds, also known as Moriarti MA-357Sig-16.  It is also compatible with Glock 31 magazines.",
     "weight": "3000 g",
     "volume": "2 L",
     "barrel_length": "250 ml",