From a192663de4f1955c019703809ce34c53b51da042 Mon Sep 17 00:00:00 2001 From: Viss Valdyr <33199510+Lamandus@users.noreply.github.com> Date: Sun, 16 Jun 2024 01:44:50 +0200 Subject: [PATCH] feat(content): small chance to spawn special magazines with nested guns (#4805) * feature(content): small chance to spawn special magazines with nested guns * Update everydaycarry_guns.json * style(autofix.ci): automated formatting * Update everydaycarry_guns.json --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- .../Weapons_Mods_Ammo/everydaycarry_guns.json | 354 +++++++++++------- .../Weapons_Mods_Ammo/nested_guns.json | 288 +++++++------- .../Weapons_Mods_Ammo/nested_magazines.json | 339 +++++++++++++++++ data/json/items/gun/223.json | 21 +- 4 files changed, 728 insertions(+), 274 deletions(-) create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json index ad20b83f5a96..303c641ce81b 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json @@ -7,8 +7,8 @@ "ammo": 100, "entries": [ { "item": "glock_17", "charges-min": 0, "charges-max": 15 }, - { "item": "glock17_17" }, - { "item": "glock17_17", "prob": 50 } + { "group": "nested_glock17_mag" }, + { "group": "nested_glock17_mag", "prob": 50 } ] }, { @@ -19,8 +19,8 @@ "ammo": 100, "entries": [ { "item": "glock_19", "charges-min": 0, "charges-max": 15 }, - { "item": "glockmag" }, - { "item": "glockmag", "prob": 50 } + { "group": "nested_glock19_mag" }, + { "group": "nested_glock19_mag", "prob": 50 } ] }, { @@ -31,8 +31,8 @@ "ammo": 100, "entries": [ { "item": "glock_21", "charges-min": 0, "charges-max": 15 }, - { "item": "glock_21mag" }, - { "item": "glock_21mag", "prob": 50 } + { "group": "nested_glock21_mag" }, + { "group": "nested_glock21_mag", "prob": 50 } ] }, { @@ -43,8 +43,8 @@ "ammo": 100, "entries": [ { "item": "glock_22", "charges-min": 0, "ammo-item": "40sw", "charges-max": 15 }, - { "item": "glock40mag" }, - { "item": "glock40mag", "prob": 50 } + { "group": "nested_glock22_mag" }, + { "group": "nested_glock22_mag", "prob": 50 } ] }, { @@ -55,8 +55,8 @@ "ammo": 100, "entries": [ { "item": "glock_31", "charges-min": 0, "charges-max": 15 }, - { "item": "glock40mag" }, - { "item": "glock40mag", "prob": 50 } + { "group": "nested_glock22_mag" }, + { "group": "nested_glock22_mag", "prob": 50 } ] }, { @@ -65,7 +65,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "m1911", "charges-min": 0, "charges-max": 7 }, { "item": "m1911mag" }, { "item": "m1911mag", "prob": 50 } ] + "entries": [ + { "item": "m1911", "charges-min": 0, "charges-max": 7 }, + { "group": "nested_m1911_mag" }, + { "group": "nested_m1911_mag", "prob": 50 } + ] }, { "id": "everyday_m1911_MEU", @@ -75,8 +79,8 @@ "ammo": 100, "entries": [ { "item": "m1911_MEU", "charges-min": 0, "charges-max": 7 }, - { "item": "m1911mag" }, - { "item": "m1911mag", "prob": 50 } + { "group": "nested_m1911_mag" }, + { "group": "nested_m1911_mag", "prob": 50 } ] }, { @@ -85,7 +89,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "m9", "charges-min": 0, "charges-max": 15 }, { "item": "m9mag" }, { "item": "m9mag", "prob": 50 } ] + "entries": [ + { "item": "m9", "charges-min": 0, "charges-max": 15 }, + { "group": "nested_m9_mag" }, + { "group": "nested_m9_mag", "prob": 50 } + ] }, { "id": "everyday_px4", @@ -207,8 +215,8 @@ "ammo": 100, "entries": [ { "item": "hi_power_9mm", "charges-min": 0, "charges-max": 15 }, - { "item": "bhp9mag_13rd" }, - { "item": "bhp9mag_13rd", "prob": 50 } + { "group": "nested_hi_power_9mm_mag" }, + { "group": "nested_hi_power_9mm_mag", "prob": 50 } ] }, { @@ -243,8 +251,8 @@ "ammo": 100, "entries": [ { "item": "walther_ppq_9mm", "charges-min": 0, "charges-max": 17 }, - { "item": "ppq9mag_10rd" }, - { "item": "ppq9mag_10rd", "prob": 50 } + { "group": "nested_walther_ppq_9mm_mag" }, + { "group": "nested_walther_ppq_9mm_mag", "prob": 50 } ] }, { @@ -255,8 +263,8 @@ "ammo": 100, "entries": [ { "item": "walther_ppq_40", "charges-min": 0, "charges-max": 14 }, - { "item": "ppq40mag_10rd" }, - { "item": "ppq40mag_10rd", "prob": 50 } + { "group": "nested_walther_ppq_40_mag" }, + { "group": "nested_walther_ppq_40_mag", "prob": 50 } ] }, { @@ -279,8 +287,8 @@ "ammo": 100, "entries": [ { "item": "hptc9", "charges-min": 0, "charges-max": 15 }, - { "item": "hptc9mag_8rd" }, - { "item": "hptc9mag_8rd", "prob": 50 } + { "group": "nested_hptc9_mag" }, + { "group": "nested_hptc9_mag", "prob": 50 } ] }, { @@ -291,8 +299,8 @@ "ammo": 100, "entries": [ { "item": "hptcf380", "charges-min": 0, "charges-max": 10 }, - { "item": "hptcf380mag_8rd" }, - { "item": "hptcf380mag_8rd", "prob": 50 } + { "group": "nested_hptcf380_mag" }, + { "group": "nested_hptcf380_mag", "prob": 50 } ] }, { @@ -327,8 +335,8 @@ "ammo": 100, "entries": [ { "item": "cz75", "charges-min": 0, "charges-max": 26 }, - { "item": "cz75mag_12rd" }, - { "item": "cz75mag_12rd", "prob": 50 } + { "group": "nested_cz75_mag" }, + { "group": "nested_cz75_mag", "prob": 50 } ] }, { @@ -361,7 +369,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "90two", "charges-min": 0, "charges-max": 15 }, { "item": "m9mag" }, { "item": "m9mag", "prob": 50 } ] + "entries": [ + { "item": "90two", "charges-min": 0, "charges-max": 15 }, + { "group": "nested_m9_mag" }, + { "group": "nested_m9_mag", "prob": 50 } + ] }, { "id": "everyday_90two40", @@ -395,8 +407,8 @@ "ammo": 100, "entries": [ { "item": "m1911a1_38super", "charges-min": 0, "charges-max": 9 }, - { "item": "m1911mag_10rd_38super" }, - { "item": "m1911mag_10rd_38super", "prob": 50 } + { "group": "nested_m1911_mag" }, + { "group": "nested_m1911_mag", "prob": 50 } ] }, { @@ -457,7 +469,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "draco", "charges-min": 0, "charges-max": 30 }, { "item": "akmag10" }, { "item": "akmag10", "prob": 50 } ] + "entries": [ + { "item": "draco", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_ak47_mag" }, + { "group": "nested_ak47_mag", "prob": 50 } + ] }, { "id": "everyday_m17", @@ -479,8 +495,8 @@ "ammo": 100, "entries": [ { "item": "glock_18c", "charges-min": 0, "charges-max": 17 }, - { "item": "glock17_17" }, - { "item": "glock17_17", "prob": 50 } + { "group": "nested_glock17_mag" }, + { "group": "nested_glock17_mag", "prob": 50 } ] }, { @@ -513,7 +529,7 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "rm103a_pistol" }, { "item": "8x40_10_mag" }, { "item": "8x40_10_mag", "prob": 50 } ] + "entries": [ { "item": "rm103a_pistol" }, { "group": "nested_rm103a_mag" }, { "group": "nested_rm103a_mag", "prob": 50 } ] }, { "id": "everyday_af2011a1_38super", @@ -531,8 +547,8 @@ "ammo": 100, "entries": [ { "item": "m1911-460", "charges-min": 0, "charges-max": 7 }, - { "item": "m1911mag" }, - { "item": "m1911mag", "prob": 50 } + { "group": "nested_m1911_mag" }, + { "group": "nested_m1911_mag", "prob": 50 } ] }, { @@ -555,8 +571,8 @@ "ammo": 100, "entries": [ { "item": "hk_mp5_semi_pistol", "charges-min": 0, "charges-max": 30 }, - { "item": "mp5mag" }, - { "item": "mp5mag", "prob": 50 } + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 } ] }, { @@ -591,8 +607,8 @@ "ammo": 100, "entries": [ { "item": "tommygun", "charges-min": 0, "charges-max": 20 }, - { "item": "thompson_mag" }, - { "item": "thompson_mag", "prob": 50 } + { "group": "nested_tommygun_mag" }, + { "group": "nested_tommygun_mag", "prob": 50 } ] }, { @@ -617,7 +633,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "hk_mp5", "charges-min": 0, "charges-max": 30 }, { "item": "mp5mag" }, { "item": "mp5mag", "prob": 50 } ] + "entries": [ + { "item": "hk_mp5", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 } + ] }, { "id": "everyday_hk_mp5sd", @@ -625,7 +645,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "hk_mp5", "charges-min": 0, "charges-max": 30 }, { "item": "mp5mag" }, { "item": "mp5mag", "prob": 50 } ] + "entries": [ + { "item": "hk_mp5", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 } + ] }, { "id": "everyday_hk_ump45", @@ -669,7 +693,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "TDI", "charges-min": 0, "charges-max": 30 }, { "item": "tdi_mag" }, { "item": "tdi_mag", "prob": 50 } ] + "entries": [ + { "item": "TDI", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_TDI_mag" }, + { "group": "nested_TDI_mag", "prob": 50 } + ] }, { "id": "everyday_american_180", @@ -691,8 +719,8 @@ "ammo": 100, "entries": [ { "item": "briefcase_smg", "charges-min": 0, "charges-max": 30 }, - { "item": "mp5mag" }, - { "item": "mp5mag", "prob": 50 } + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 } ] }, { @@ -709,7 +737,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "hk_mp7", "charges-min": 0, "charges-max": 20 }, { "item": "hk46mag" }, { "item": "hk46mag", "prob": 50 } ] + "entries": [ + { "item": "hk_mp7", "charges-min": 0, "charges-max": 20 }, + { "group": "nested_hk_mp7_mag" }, + { "group": "nested_hk_mp7_mag", "prob": 50 } + ] }, { "id": "everyday_rm2000_smg", @@ -719,8 +751,8 @@ "ammo": 100, "entries": [ { "item": "rm2000_smg", "charges-min": 0, "charges-max": 10 }, - { "item": "8x40_10_mag" }, - { "item": "8x40_10_mag", "prob": 50 } + { "group": "nested_rm103a_mag" }, + { "group": "nested_rm103a_mag", "prob": 50 } ] }, { @@ -729,7 +761,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "hk_mp5k", "charges-min": 0, "charges-max": 30 }, { "item": "mp5mag" }, { "item": "mp5mag", "prob": 50 } ] + "entries": [ + { "item": "hk_mp5k", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 } + ] }, { "id": "everyday_browning_blr", @@ -751,8 +787,8 @@ "ammo": 100, "entries": [ { "item": "ar_pistol", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag10" }, - { "item": "stanag10", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -785,7 +821,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "ar15", "charges-min": 0, "charges-max": 30 }, { "item": "stanag10" }, { "item": "stanag10", "prob": 50 } ] + "entries": [ + { "item": "ar15", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } + ] }, { "id": "everyday_cx4", @@ -793,7 +833,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "cx4", "charges-min": 0, "charges-max": 15 }, { "item": "m9mag" }, { "item": "m9mag", "prob": 50 } ] + "entries": [ + { "item": "cx4", "charges-min": 0, "charges-max": 15 }, + { "group": "nested_m9_mag" }, + { "group": "nested_m9_mag", "prob": 50 } + ] }, { "id": "everyday_ksub2000", @@ -803,8 +847,8 @@ "ammo": 100, "entries": [ { "item": "ksub2000", "charges-min": 0, "charges-max": 15 }, - { "item": "glockmag" }, - { "item": "glockmag", "prob": 50 } + { "group": "nested_glock19_mag" }, + { "group": "nested_glock19_mag", "prob": 50 } ] }, { @@ -815,8 +859,8 @@ "ammo": 100, "entries": [ { "item": "m1a", "charges-min": 0, "charges-max": 5 }, - { "item": "m14smallmag" }, - { "item": "m14smallmag", "prob": 50 } + { "group": "nested_m14_mag" }, + { "group": "nested_m14_mag", "prob": 50 } ] }, { @@ -827,8 +871,8 @@ "ammo": 100, "entries": [ { "item": "ruger_1022", "charges-min": 0, "charges-max": 10 }, - { "item": "ruger1022mag" }, - { "item": "ruger1022mag", "prob": 50 } + { "group": "nested_ruger_1022_mag" }, + { "group": "nested_ruger_1022_mag", "prob": 50 } ] }, { @@ -839,8 +883,8 @@ "ammo": 100, "entries": [ { "item": "ruger_mini", "charges-min": 0, "charges-max": 5 }, - { "item": "ruger10" }, - { "item": "ruger10", "prob": 50 } + { "group": "nested_ruger_mini_mag" }, + { "group": "nested_ruger_mini_mag", "prob": 50 } ] }, { @@ -849,7 +893,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "1895sbl", "charges-min": 0, "charges-max": 30 }, { "item": "akmag10" }, { "item": "akmag10", "prob": 50 } ] + "entries": [ + { "item": "1895sbl", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_ak47_mag" }, + { "group": "nested_ak47_mag", "prob": 50 } + ] }, { "id": "everyday_fn_fal", @@ -857,7 +905,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "fn_fal", "charges-min": 0, "charges-max": 20 }, { "item": "falmag" }, { "item": "falmag", "prob": 50 } ] + "entries": [ + { "item": "fn_fal", "charges-min": 0, "charges-max": 20 }, + { "group": "nested_fn_fal_mag" }, + { "group": "nested_fn_fal_mag", "prob": 50 } + ] }, { "id": "everyday_hk_g3", @@ -865,7 +917,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "hk_g3", "charges-min": 0, "charges-max": 20 }, { "item": "g3mag" }, { "item": "g3mag", "prob": 50 } ] + "entries": [ + { "item": "hk_g3", "charges-min": 0, "charges-max": 20 }, + { "group": "nested_hk_g3_mag" }, + { "group": "nested_hk_g3_mag", "prob": 50 } + ] }, { "id": "everyday_hk_g36", @@ -875,8 +931,8 @@ "ammo": 100, "entries": [ { "item": "hk_g36", "charges-min": 0, "charges-max": 30 }, - { "item": "g36mag_30rd" }, - { "item": "g36mag_30rd", "prob": 50 } + { "group": "nested_hk_g36_mag" }, + { "group": "nested_hk_g36_mag", "prob": 50 } ] }, { @@ -885,7 +941,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "m14ebr", "charges-min": 0, "charges-max": 20 }, { "item": "m14mag" }, { "item": "m14mag", "prob": 50 } ] + "entries": [ + { "item": "m14ebr", "charges-min": 0, "charges-max": 20 }, + { "group": "nested_m14_mag" }, + { "group": "nested_m14_mag", "prob": 50 } + ] }, { "id": "everyday_m4a1", @@ -893,7 +953,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "m4a1", "charges-min": 0, "charges-max": 30 }, { "item": "stanag30" }, { "item": "stanag30", "prob": 50 } ] + "entries": [ + { "item": "m4a1", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } + ] }, { "id": "everyday_m4a1_grenadier", @@ -903,8 +967,8 @@ "ammo": 100, "entries": [ { "item": "m4a1", "charges-min": 0, "charges-max": 30, "contents-group": "military_accessories_grenadier" }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -913,7 +977,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "m1918", "charges-min": 0, "charges-max": 20 }, { "item": "m1918mag" }, { "item": "m1918mag", "prob": 50 } ] + "entries": [ + { "item": "m1918", "charges-min": 0, "charges-max": 20 }, + { "group": "nested_m1918_mag" }, + { "group": "nested_m1918_mag", "prob": 50 } + ] }, { "id": "everyday_hk417_13", @@ -923,8 +991,8 @@ "ammo": 100, "entries": [ { "item": "hk417_13", "charges-min": 0, "charges-max": 20 }, - { "item": "hk417mag_20rd" }, - { "item": "hk417mag_20rd", "prob": 50 } + { "group": "nested_hk417_13_mag" }, + { "group": "nested_hk417_13_mag", "prob": 50 } ] }, { @@ -935,8 +1003,8 @@ "ammo": 100, "entries": [ { "item": "iwi_tavor_x95_300blk", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -947,8 +1015,8 @@ "ammo": 100, "entries": [ { "item": "h&k416a5", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -959,8 +1027,8 @@ "ammo": 100, "entries": [ { "item": "h&k416a5", "charges-min": 0, "charges-max": 30, "contents-group": "military_accessories_grenadier" }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -971,8 +1039,8 @@ "ammo": 100, "entries": [ { "item": "m27iar", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -995,8 +1063,8 @@ "ammo": 100, "entries": [ { "item": "m27iar", "charges-min": 0, "charges-max": 30, "contents-group": "military_accessories_grenadier" }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -1007,8 +1075,8 @@ "ammo": 100, "entries": [ { "item": "scar_l", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -1047,8 +1115,8 @@ "ammo": 100, "entries": [ { "item": "rm11b_sniper_rifle", "charges-min": 0, "charges-max": 10 }, - { "item": "8x40_10_mag" }, - { "item": "8x40_10_mag", "prob": 50 } + { "group": "nested_rm103a_mag" }, + { "group": "nested_rm103a_mag", "prob": 50 } ] }, { @@ -1059,8 +1127,8 @@ "ammo": 100, "entries": [ { "item": "rm298", "charges-min": 0, "charges-max": 100 }, - { "item": "8x40_250_mag" }, - { "item": "8x40_250_mag", "prob": 50 } + { "group": "nested_rm298_mag" }, + { "group": "nested_rm298_mag", "prob": 50 } ] }, { @@ -1071,8 +1139,8 @@ "ammo": 100, "entries": [ { "item": "rm51_assault_rifle", "charges-min": 0, "charges-max": 50 }, - { "item": "8x40_50_mag" }, - { "item": "8x40_50_mag", "prob": 50 } + { "group": "nested_rm51_mag" }, + { "group": "nested_rm51_mag", "prob": 50 } ] }, { @@ -1083,8 +1151,8 @@ "ammo": 100, "entries": [ { "item": "rm614_lmg", "charges-min": 0, "charges-max": 100 }, - { "item": "8x40_250_mag" }, - { "item": "8x40_250_mag", "prob": 50 } + { "group": "nested_rm298_mag" }, + { "group": "nested_rm298_mag", "prob": 50 } ] }, { @@ -1095,8 +1163,8 @@ "ammo": 100, "entries": [ { "item": "rm88_battle_rifle", "charges-min": 0, "charges-max": 50 }, - { "item": "8x40_50_mag" }, - { "item": "8x40_50_mag", "prob": 50 } + { "group": "nested_rm51_mag" }, + { "group": "nested_rm51_mag", "prob": 50 } ] }, { @@ -1107,8 +1175,8 @@ "ammo": 100, "entries": [ { "item": "sig552", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -1119,8 +1187,8 @@ "ammo": 100, "entries": [ { "item": "scar_h", "charges-min": 0, "charges-max": 20 }, - { "item": "scarhmag" }, - { "item": "scarhmag", "prob": 50 } + { "group": "nested_scar_h_mag" }, + { "group": "nested_scar_h_mag", "prob": 50 } ] }, { @@ -1131,8 +1199,8 @@ "ammo": 100, "entries": [ { "item": "scar_h", "charges-min": 0, "charges-max": 20, "contents-group": "military_accessories_grenadier" }, - { "item": "scarhmag" }, - { "item": "scarhmag", "prob": 50 } + { "group": "nested_scar_h_mag" }, + { "group": "nested_scar_h_mag", "prob": 50 } ] }, { @@ -1143,8 +1211,8 @@ "ammo": 100, "entries": [ { "item": "m110a1", "charges-min": 0, "charges-max": 20 }, - { "item": "hk417mag_20rd" }, - { "item": "hk417mag_20rd", "prob": 50 } + { "group": "nested_hk417_13_mag" }, + { "group": "nested_hk417_13_mag", "prob": 50 } ] }, { @@ -1155,8 +1223,8 @@ "ammo": 100, "entries": [ { "item": "acr_300blk", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -1165,7 +1233,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "ak47", "charges-min": 0, "charges-max": 30 }, { "item": "akmag10" }, { "item": "akmag10", "prob": 50 } ] + "entries": [ + { "item": "ak47", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_ak47_mag" }, + { "group": "nested_ak47_mag", "prob": 50 } + ] }, { "id": "everyday_ak74", @@ -1173,7 +1245,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "ak74", "charges-min": 0, "charges-max": 30 }, { "item": "ak74mag" }, { "item": "ak74mag", "prob": 50 } ] + "entries": [ + { "item": "ak74", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_ak74_mag" }, + { "group": "nested_ak74_mag", "prob": 50 } + ] }, { "id": "everyday_famas", @@ -1189,7 +1265,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "oa93", "charges-min": 0, "charges-max": 30 }, { "item": "stanag10" }, { "item": "stanag10", "prob": 50 } ] + "entries": [ + { "item": "oa93", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } + ] }, { "id": "everyday_steyr_aug", @@ -1199,8 +1279,8 @@ "ammo": 100, "entries": [ { "item": "steyr_aug", "charges-min": 0, "charges-max": 30 }, - { "item": "augmag_10rd" }, - { "item": "augmag_10rd", "prob": 50 } + { "group": "nested_steyr_aug_mag" }, + { "group": "nested_steyr_aug_mag", "prob": 50 } ] }, { @@ -1209,7 +1289,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "arx160", "charges-min": 0, "charges-max": 30 }, { "item": "akmag10" }, { "item": "akmag10", "prob": 50 } ] + "entries": [ + { "item": "arx160", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_ak47_mag" }, + { "group": "nested_ak47_mag", "prob": 50 } + ] }, { "id": "everyday_rm20", @@ -1219,8 +1303,8 @@ "ammo": 100, "entries": [ { "item": "rm20", "charges-min": 0, "charges-max": 20 }, - { "item": "20x66_20_mag" }, - { "item": "20x66_20_mag", "prob": 50 } + { "group": "nested_rm20_mag" }, + { "group": "nested_rm20_mag", "prob": 50 } ] }, { @@ -1231,8 +1315,8 @@ "ammo": 100, "entries": [ { "item": "saiga_12", "charges-min": 0, "charges-max": 10 }, - { "item": "saiga10mag" }, - { "item": "saiga10mag", "prob": 50 } + { "group": "nested_saiga_12_mag" }, + { "group": "nested_saiga_12_mag", "prob": 50 } ] }, { @@ -1243,8 +1327,8 @@ "ammo": 100, "entries": [ { "item": "saiga_410", "charges-min": 0, "charges-max": 10 }, - { "item": "saiga410mag_10rd" }, - { "item": "saiga410mag_10rd", "prob": 50 } + { "group": "nested_saiga_410_mag" }, + { "group": "nested_saiga_410_mag", "prob": 50 } ] }, { @@ -1789,7 +1873,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "an94", "charges-min": 0, "charges-max": 30 }, { "item": "ak74mag" }, { "item": "ak74mag", "prob": 50 } ] + "entries": [ + { "item": "an94", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_ak74_mag" }, + { "group": "nested_ak74_mag", "prob": 50 } + ] }, { "id": "everyday_USAS_12", @@ -1799,8 +1887,8 @@ "ammo": 100, "entries": [ { "item": "USAS_12", "charges-min": 0, "charges-max": 10 }, - { "item": "USAS10mag" }, - { "item": "USAS10mag", "prob": 50 } + { "group": "nested_USAS_12_mag" }, + { "group": "nested_USAS_12_mag", "prob": 50 } ] }, { @@ -1819,8 +1907,8 @@ "ammo": 100, "entries": [ { "item": "needlepistol", "charges-min": 0, "charges-max": 50 }, - { "item": "5x50_50_mag" }, - { "item": "5x50_50_mag", "prob": 50 } + { "group": "nested_needlepistol_mag" }, + { "group": "nested_needlepistol_mag", "prob": 50 } ] }, { @@ -1831,8 +1919,8 @@ "ammo": 100, "entries": [ { "item": "rm99_pistol", "charges-min": 0, "charges-max": 50 }, - { "item": "8x40_50_mag" }, - { "item": "8x40_50_mag", "prob": 50 } + { "group": "nested_rm51_mag" }, + { "group": "nested_rm51_mag", "prob": 50 } ] }, { @@ -1841,7 +1929,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "ppsh", "charges-min": 0, "charges-max": 35 }, { "item": "ppshmag" }, { "item": "ppshmag", "prob": 50 } ] + "entries": [ + { "item": "ppsh", "charges-min": 0, "charges-max": 35 }, + { "group": "nested_ppsh_mag" }, + { "group": "nested_ppsh_mag", "prob": 50 } + ] }, { "id": "everyday_skorpion_61", @@ -1873,7 +1965,11 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "acr", "charges-min": 0, "charges-max": 30 }, { "item": "stanag30" }, { "item": "stanag30", "prob": 50 } ] + "entries": [ + { "item": "acr", "charges-min": 0, "charges-max": 30 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } + ] }, { "id": "everyday_ar15_retool_300blk", @@ -1883,8 +1979,8 @@ "ammo": 100, "entries": [ { "item": "ar15_retool_300blk", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 } + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 } ] }, { @@ -1895,8 +1991,8 @@ "ammo": 100, "entries": [ { "item": "needlegun", "charges-min": 0, "charges-max": 100 }, - { "item": "5x50_100_mag" }, - { "item": "5x50_100_mag", "prob": 50 } + { "group": "nested_needlegun_mag" }, + { "group": "nested_needlegun_mag", "prob": 50 } ] }, { diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 88a77429a8b2..a120fc2737a1 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -7,8 +7,8 @@ "ammo": 100, "entries": [ { "item": "glock_17", "charges-min": 0, "charges-max": 15 }, - { "item": "glock17_17" }, - { "item": "glock17_17", "prob": 50 }, + { "group": "nested_glock17_mag" }, + { "group": "nested_glock17_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -20,8 +20,8 @@ "ammo": 100, "entries": [ { "item": "glock_19", "charges-min": 0, "charges-max": 15 }, - { "item": "glockmag" }, - { "item": "glockmag", "prob": 50 }, + { "group": "nested_glock19_mag" }, + { "group": "nested_glock19_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -33,8 +33,8 @@ "ammo": 100, "entries": [ { "item": "glock_21", "charges-min": 0, "charges-max": 15 }, - { "item": "glock_21mag" }, - { "item": "glock_21mag", "prob": 50 }, + { "group": "nested_glock21_mag" }, + { "group": "nested_glock21_mag", "prob": 50 }, { "group": "on_hand_45" } ] }, @@ -46,8 +46,8 @@ "ammo": 100, "entries": [ { "item": "glock_22", "charges-min": 0, "ammo-item": "40sw", "charges-max": 15 }, - { "item": "glock40mag" }, - { "item": "glock40mag", "prob": 50 }, + { "group": "nested_glock22_mag" }, + { "group": "nested_glock22_mag", "prob": 50 }, { "group": "on_hand_40" } ] }, @@ -59,8 +59,8 @@ "ammo": 100, "entries": [ { "item": "glock_31", "charges-min": 0, "charges-max": 15 }, - { "item": "glock40mag" }, - { "item": "glock40mag", "prob": 50 }, + { "group": "nested_glock22_mag" }, + { "group": "nested_glock22_mag", "prob": 50 }, { "group": "on_hand_357sig" } ] }, @@ -72,8 +72,8 @@ "ammo": 100, "entries": [ { "item": "m1911", "charges-min": 0, "charges-max": 7 }, - { "item": "m1911mag" }, - { "item": "m1911mag", "prob": 50 }, + { "group": "nested_m1911_mag" }, + { "group": "nested_m1911_mag", "prob": 50 }, { "group": "on_hand_45" } ] }, @@ -85,8 +85,8 @@ "ammo": 100, "entries": [ { "item": "m1911_MEU", "charges-min": 0, "charges-max": 7 }, - { "item": "m1911mag" }, - { "item": "m1911mag", "prob": 50 }, + { "group": "nested_m1911_mag" }, + { "group": "nested_m1911_mag", "prob": 50 }, { "group": "on_hand_45" } ] }, @@ -98,8 +98,8 @@ "ammo": 100, "entries": [ { "item": "m9", "charges-min": 0, "charges-max": 15 }, - { "item": "m9mag" }, - { "item": "m9mag", "prob": 50 }, + { "group": "nested_m9_mag" }, + { "group": "nested_m9_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -286,8 +286,8 @@ "ammo": 100, "entries": [ { "item": "hi_power_9mm", "charges-min": 0, "charges-max": 15 }, - { "item": "bhp9mag_13rd" }, - { "item": "bhp9mag_13rd", "prob": 50 }, + { "group": "nested_hi_power_9mm_mag" }, + { "group": "nested_hi_power_9mm_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -325,8 +325,8 @@ "ammo": 100, "entries": [ { "item": "walther_ppq_9mm", "charges-min": 0, "charges-max": 17 }, - { "item": "ppq9mag_10rd" }, - { "item": "ppq9mag_10rd", "prob": 50 }, + { "group": "nested_walther_ppq_9mm_mag" }, + { "group": "nested_walther_ppq_9mm_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -338,8 +338,8 @@ "ammo": 100, "entries": [ { "item": "walther_ppq_40", "charges-min": 0, "charges-max": 14 }, - { "item": "ppq40mag_10rd" }, - { "item": "ppq40mag_10rd", "prob": 50 }, + { "group": "nested_walther_ppq_40_mag" }, + { "group": "nested_walther_ppq_40_mag", "prob": 50 }, { "group": "on_hand_40" } ] }, @@ -364,8 +364,8 @@ "ammo": 100, "entries": [ { "item": "hptc9", "charges-min": 0, "charges-max": 15 }, - { "item": "hptc9mag_8rd" }, - { "item": "hptc9mag_8rd", "prob": 50 }, + { "group": "nested_hptc9_mag" }, + { "group": "nested_hptc9_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -377,8 +377,8 @@ "ammo": 100, "entries": [ { "item": "hptcf380", "charges-min": 0, "charges-max": 10 }, - { "item": "hptcf380mag_8rd" }, - { "item": "hptcf380mag_8rd", "prob": 50 }, + { "group": "nested_hptcf380_mag" }, + { "group": "nested_hptcf380_mag", "prob": 50 }, { "group": "on_hand_380" } ] }, @@ -416,8 +416,8 @@ "ammo": 100, "entries": [ { "item": "cz75", "charges-min": 0, "charges-max": 26 }, - { "item": "cz75mag_12rd" }, - { "item": "cz75mag_12rd", "prob": 50 }, + { "group": "nested_cz75_mag" }, + { "group": "nested_cz75_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -455,8 +455,8 @@ "ammo": 100, "entries": [ { "item": "90two", "charges-min": 0, "charges-max": 15 }, - { "item": "m9mag" }, - { "item": "m9mag", "prob": 50 }, + { "group": "nested_m9_mag" }, + { "group": "nested_m9_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -612,8 +612,8 @@ "ammo": 100, "entries": [ { "item": "draco", "charges-min": 0, "charges-max": 30 }, - { "item": "akmag10" }, - { "item": "akmag10", "prob": 50 }, + { "group": "nested_ak47_mag" }, + { "group": "nested_ak47_mag", "prob": 50 }, { "group": "on_hand_762" } ] }, @@ -638,8 +638,8 @@ "ammo": 100, "entries": [ { "item": "glock_18c", "charges-min": 0, "charges-max": 17 }, - { "item": "glock17_17" }, - { "item": "glock17_17", "prob": 50 }, + { "group": "nested_glock17_mag" }, + { "group": "nested_glock17_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -712,8 +712,8 @@ "ammo": 100, "entries": [ { "item": "rm103a_pistol" }, - { "item": "8x40_10_mag" }, - { "item": "8x40_10_mag", "prob": 50 }, + { "group": "nested_rm103a_mag" }, + { "group": "nested_rm103a_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, @@ -746,8 +746,8 @@ "ammo": 100, "entries": [ { "item": "m1911-460", "charges-min": 0, "charges-max": 7 }, - { "item": "m1911mag" }, - { "item": "m1911mag", "prob": 50 }, + { "group": "nested_m1911_mag" }, + { "group": "nested_m1911_mag", "prob": 50 }, { "group": "on_hand_460" } ] }, @@ -796,8 +796,8 @@ "ammo": 100, "entries": [ { "item": "hk_mp5_semi_pistol", "charges-min": 0, "charges-max": 30 }, - { "item": "mp5mag" }, - { "item": "mp5mag", "prob": 50 }, + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -835,8 +835,8 @@ "ammo": 100, "entries": [ { "item": "tommygun", "charges-min": 0, "charges-max": 20 }, - { "item": "thompson_mag" }, - { "item": "thompson_mag", "prob": 50 }, + { "group": "nested_tommygun_mag" }, + { "group": "nested_tommygun_mag", "prob": 50 }, { "group": "on_hand_45" } ] }, @@ -874,8 +874,8 @@ "ammo": 100, "entries": [ { "item": "hk_mp5", "charges-min": 0, "charges-max": 30 }, - { "item": "mp5mag" }, - { "item": "mp5mag", "prob": 50 }, + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -887,8 +887,8 @@ "ammo": 100, "entries": [ { "item": "hk_mp5", "charges-min": 0, "charges-max": 30 }, - { "item": "mp5mag" }, - { "item": "mp5mag", "prob": 50 }, + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -939,8 +939,8 @@ "ammo": 100, "entries": [ { "item": "TDI", "charges-min": 0, "charges-max": 30 }, - { "item": "tdi_mag" }, - { "item": "tdi_mag", "prob": 50 }, + { "group": "nested_TDI_mag" }, + { "group": "nested_TDI_mag", "prob": 50 }, { "group": "on_hand_45" } ] }, @@ -965,8 +965,8 @@ "ammo": 100, "entries": [ { "item": "briefcase_smg", "charges-min": 0, "charges-max": 30 }, - { "item": "mp5mag" }, - { "item": "mp5mag", "prob": 50 }, + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -991,8 +991,8 @@ "ammo": 100, "entries": [ { "item": "hk_mp7", "charges-min": 0, "charges-max": 20 }, - { "item": "hk46mag" }, - { "item": "hk46mag", "prob": 50 }, + { "group": "nested_hk_mp7_mag" }, + { "group": "nested_hk_mp7_mag", "prob": 50 }, { "group": "on_hand_46" } ] }, @@ -1004,8 +1004,8 @@ "ammo": 100, "entries": [ { "item": "rm2000_smg", "charges-min": 0, "charges-max": 10 }, - { "item": "8x40_10_mag" }, - { "item": "8x40_10_mag", "prob": 50 }, + { "group": "nested_rm103a_mag" }, + { "group": "nested_rm103a_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, @@ -1017,8 +1017,8 @@ "ammo": 100, "entries": [ { "item": "hk_mp5k", "charges-min": 0, "charges-max": 30 }, - { "item": "mp5mag" }, - { "item": "mp5mag", "prob": 50 }, + { "group": "nested_mp5_mag" }, + { "group": "nested_mp5_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -1043,8 +1043,8 @@ "ammo": 100, "entries": [ { "item": "ar_pistol", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag10" }, - { "item": "stanag10", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1082,8 +1082,8 @@ "ammo": 100, "entries": [ { "item": "ar15", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag10" }, - { "item": "stanag10", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1095,8 +1095,8 @@ "ammo": 100, "entries": [ { "item": "cx4", "charges-min": 0, "charges-max": 15 }, - { "item": "m9mag" }, - { "item": "m9mag", "prob": 50 }, + { "group": "nested_m9_mag" }, + { "group": "nested_m9_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -1108,8 +1108,8 @@ "ammo": 100, "entries": [ { "item": "ksub2000", "charges-min": 0, "charges-max": 15 }, - { "item": "glockmag" }, - { "item": "glockmag", "prob": 50 }, + { "group": "nested_glock19_mag" }, + { "group": "nested_glock19_mag", "prob": 50 }, { "group": "on_hand_9mm" } ] }, @@ -1121,8 +1121,8 @@ "ammo": 100, "entries": [ { "item": "m1a", "charges-min": 0, "charges-max": 5 }, - { "item": "m14smallmag" }, - { "item": "m14smallmag", "prob": 50 }, + { "group": "nested_m14_mag" }, + { "group": "nested_m14_mag", "prob": 50 }, { "group": "on_hand_308" } ] }, @@ -1174,8 +1174,8 @@ "ammo": 100, "entries": [ { "item": "ruger_1022", "charges-min": 0, "charges-max": 10 }, - { "item": "ruger1022mag" }, - { "item": "ruger1022mag", "prob": 50 }, + { "group": "nested_ruger_1022_mag" }, + { "group": "nested_ruger_1022_mag", "prob": 50 }, { "group": "on_hand_22" } ] }, @@ -1187,8 +1187,8 @@ "ammo": 100, "entries": [ { "item": "ruger_mini", "charges-min": 0, "charges-max": 5 }, - { "item": "ruger10" }, - { "item": "ruger10", "prob": 50 }, + { "group": "nested_ruger_mini_mag" }, + { "group": "nested_ruger_mini_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1224,8 +1224,8 @@ "ammo": 100, "entries": [ { "item": "aksemi", "charges-min": 0, "charges-max": 30 }, - { "item": "akmag10" }, - { "item": "akmag10", "prob": 50 }, + { "group": "nested_ak47_mag" }, + { "group": "nested_ak47_mag", "prob": 50 }, { "group": "on_hand_762" } ] }, @@ -1245,8 +1245,8 @@ "ammo": 100, "entries": [ { "item": "fn_fal", "charges-min": 0, "charges-max": 20 }, - { "item": "falmag" }, - { "item": "falmag", "prob": 50 }, + { "group": "nested_fn_fal_mag" }, + { "group": "nested_fn_fal_mag", "prob": 50 }, { "group": "on_hand_308" } ] }, @@ -1258,8 +1258,8 @@ "ammo": 100, "entries": [ { "item": "hk_g3", "charges-min": 0, "charges-max": 20 }, - { "item": "g3mag" }, - { "item": "g3mag", "prob": 50 }, + { "group": "nested_hk_g3_mag" }, + { "group": "nested_hk_g3_mag", "prob": 50 }, { "group": "on_hand_308" } ] }, @@ -1271,8 +1271,8 @@ "ammo": 100, "entries": [ { "item": "hk_g36", "charges-min": 0, "charges-max": 30 }, - { "item": "g36mag_30rd" }, - { "item": "g36mag_30rd", "prob": 50 }, + { "group": "nested_hk_g36_mag" }, + { "group": "nested_hk_g36_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1292,8 +1292,8 @@ "ammo": 100, "entries": [ { "item": "m14ebr", "charges-min": 0, "charges-max": 20 }, - { "item": "m14mag" }, - { "item": "m14mag", "prob": 50 }, + { "group": "nested_m14_mag" }, + { "group": "nested_m14_mag", "prob": 50 }, { "group": "on_hand_308" } ] }, @@ -1313,8 +1313,8 @@ "ammo": 100, "entries": [ { "item": "m4a1", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1334,8 +1334,8 @@ "ammo": 100, "entries": [ { "item": "m1918", "charges-min": 0, "charges-max": 20 }, - { "item": "m1918mag" }, - { "item": "m1918mag", "prob": 50 }, + { "group": "nested_m1918_mag" }, + { "group": "nested_m1918_mag", "prob": 50 }, { "group": "on_hand_3006" } ] }, @@ -1387,8 +1387,8 @@ "ammo": 100, "entries": [ { "item": "hk417_13", "charges-min": 0, "charges-max": 20 }, - { "item": "hk417mag_20rd" }, - { "item": "hk417mag_20rd", "prob": 50 }, + { "group": "nested_hk417_13_mag" }, + { "group": "nested_hk417_13_mag", "prob": 50 }, { "group": "on_hand_308" } ] }, @@ -1400,8 +1400,8 @@ "ammo": 100, "entries": [ { "item": "iwi_tavor_x95_300blk", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_300BLK" } ] }, @@ -1413,8 +1413,8 @@ "ammo": 100, "entries": [ { "item": "h&k416a5", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1426,8 +1426,8 @@ "ammo": 100, "entries": [ { "item": "m27iar", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1439,8 +1439,8 @@ "ammo": 100, "entries": [ { "item": "scar_l", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1531,8 +1531,8 @@ "ammo": 100, "entries": [ { "item": "rm11b_sniper_rifle", "charges-min": 0, "charges-max": 10 }, - { "item": "8x40_10_mag" }, - { "item": "8x40_10_mag", "prob": 50 }, + { "group": "nested_rm103a_mag" }, + { "group": "nested_rm103a_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, @@ -1544,8 +1544,8 @@ "ammo": 100, "entries": [ { "item": "rm298", "charges-min": 0, "charges-max": 100 }, - { "item": "8x40_250_mag" }, - { "item": "8x40_250_mag", "prob": 50 }, + { "group": "nested_rm298_mag" }, + { "group": "nested_rm298_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, @@ -1557,8 +1557,8 @@ "ammo": 100, "entries": [ { "item": "rm51_assault_rifle", "charges-min": 0, "charges-max": 50 }, - { "item": "8x40_50_mag" }, - { "item": "8x40_50_mag", "prob": 50 }, + { "group": "nested_rm51_mag" }, + { "group": "nested_rm51_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, @@ -1570,8 +1570,8 @@ "ammo": 100, "entries": [ { "item": "rm614_lmg", "charges-min": 0, "charges-max": 100 }, - { "item": "8x40_250_mag" }, - { "item": "8x40_250_mag", "prob": 50 }, + { "group": "nested_rm298_mag" }, + { "group": "nested_rm298_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, @@ -1583,8 +1583,8 @@ "ammo": 100, "entries": [ { "item": "rm88_battle_rifle", "charges-min": 0, "charges-max": 50 }, - { "item": "8x40_50_mag" }, - { "item": "8x40_50_mag", "prob": 50 }, + { "group": "nested_rm51_mag" }, + { "group": "nested_rm51_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, @@ -1596,8 +1596,8 @@ "ammo": 100, "entries": [ { "item": "sig552", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1609,8 +1609,8 @@ "ammo": 100, "entries": [ { "item": "scar_h", "charges-min": 0, "charges-max": 20 }, - { "item": "scarhmag" }, - { "item": "scarhmag", "prob": 50 }, + { "group": "nested_scar_h_mag" }, + { "group": "nested_scar_h_mag", "prob": 50 }, { "group": "on_hand_308" } ] }, @@ -1622,8 +1622,8 @@ "ammo": 100, "entries": [ { "item": "m110a1", "charges-min": 0, "charges-max": 20 }, - { "item": "hk417mag_20rd" }, - { "item": "hk417mag_20rd", "prob": 50 }, + { "group": "nested_hk417_13_mag" }, + { "group": "nested_hk417_13_mag", "prob": 50 }, { "group": "on_hand_308" } ] }, @@ -1635,8 +1635,8 @@ "ammo": 100, "entries": [ { "item": "acr_300blk", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_300BLK" } ] }, @@ -1648,8 +1648,8 @@ "ammo": 100, "entries": [ { "item": "ak47", "charges-min": 0, "charges-max": 30 }, - { "item": "akmag10" }, - { "item": "akmag10", "prob": 50 }, + { "group": "nested_ak47_mag" }, + { "group": "nested_ak47_mag", "prob": 50 }, { "group": "on_hand_762" } ] }, @@ -1661,8 +1661,8 @@ "ammo": 100, "entries": [ { "item": "ak74", "charges-min": 0, "charges-max": 30 }, - { "item": "ak74mag" }, - { "item": "ak74mag", "prob": 50 }, + { "group": "nested_ak74_mag" }, + { "group": "nested_ak74_mag", "prob": 50 }, { "group": "on_hand_545x39" } ] }, @@ -1727,8 +1727,8 @@ "ammo": 100, "entries": [ { "item": "oa93", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag10" }, - { "item": "stanag10", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1740,8 +1740,8 @@ "ammo": 100, "entries": [ { "item": "steyr_aug", "charges-min": 0, "charges-max": 30 }, - { "item": "augmag_10rd" }, - { "item": "augmag_10rd", "prob": 50 }, + { "group": "nested_steyr_aug_mag" }, + { "group": "nested_steyr_aug_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -1761,8 +1761,8 @@ "ammo": 100, "entries": [ { "item": "arx160", "charges-min": 0, "charges-max": 30 }, - { "item": "akmag10" }, - { "item": "akmag10", "prob": 50 }, + { "group": "nested_ak47_mag" }, + { "group": "nested_ak47_mag", "prob": 50 }, { "group": "on_hand_762" } ] }, @@ -1902,8 +1902,8 @@ "ammo": 100, "entries": [ { "item": "rm20", "charges-min": 0, "charges-max": 20 }, - { "item": "20x66_20_mag" }, - { "item": "20x66_20_mag", "prob": 50 }, + { "group": "nested_rm20_mag" }, + { "group": "nested_rm20_mag", "prob": 50 }, { "group": "on_hand_20x66mm" } ] }, @@ -1931,8 +1931,8 @@ "ammo": 100, "entries": [ { "item": "saiga_12", "charges-min": 0, "charges-max": 10 }, - { "item": "saiga10mag" }, - { "item": "saiga10mag", "prob": 50 }, + { "group": "nested_saiga_12_mag" }, + { "group": "nested_saiga_12_mag", "prob": 50 }, { "group": "on_hand_shot" } ] }, @@ -1952,8 +1952,8 @@ "ammo": 100, "entries": [ { "item": "saiga_410", "charges-min": 0, "charges-max": 10 }, - { "item": "saiga410mag_10rd" }, - { "item": "saiga410mag_10rd", "prob": 50 }, + { "group": "nested_saiga_410_mag" }, + { "group": "nested_saiga_410_mag", "prob": 50 }, { "group": "on_hand_410shot" } ] }, @@ -1965,8 +1965,8 @@ "ammo": 100, "entries": [ { "item": "needlepistol", "charges-min": 0, "charges-max": 50 }, - { "item": "5x50_50_mag" }, - { "item": "5x50_50_mag", "prob": 50 }, + { "group": "nested_needlepistol_mag" }, + { "group": "nested_needlepistol_mag", "prob": 50 }, { "group": "on_hand_5x50mm" } ] }, @@ -1978,8 +1978,8 @@ "ammo": 100, "entries": [ { "item": "rm99_pistol", "charges-min": 0, "charges-max": 50 }, - { "item": "8x40_50_mag" }, - { "item": "8x40_50_mag", "prob": 50 }, + { "group": "nested_rm51_mag" }, + { "group": "nested_rm51_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, @@ -1991,8 +1991,8 @@ "ammo": 100, "entries": [ { "item": "ppsh", "charges-min": 0, "charges-max": 35 }, - { "item": "ppshmag" }, - { "item": "ppshmag", "prob": 50 }, + { "group": "nested_ppsh_mag" }, + { "group": "nested_ppsh_mag", "prob": 50 }, { "group": "on_hand_762x25" } ] }, @@ -2030,8 +2030,8 @@ "ammo": 100, "entries": [ { "item": "acr", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_223" } ] }, @@ -2043,8 +2043,8 @@ "ammo": 100, "entries": [ { "item": "ar15_retool_300blk", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, + { "group": "nested_stanag_mag" }, + { "group": "nested_stanag_mag", "prob": 50 }, { "group": "on_hand_300BLK" } ] }, @@ -2056,8 +2056,8 @@ "ammo": 100, "entries": [ { "item": "needlegun", "charges-min": 0, "charges-max": 100 }, - { "item": "5x50_100_mag" }, - { "item": "5x50_100_mag", "prob": 50 }, + { "group": "nested_needlegun_mag" }, + { "group": "nested_needlegun_mag", "prob": 50 }, { "group": "on_hand_5x50mm" } ] }, @@ -2090,8 +2090,8 @@ "ammo": 100, "entries": [ { "item": "an94", "charges-min": 0, "charges-max": 30 }, - { "item": "ak74mag" }, - { "item": "ak74mag", "prob": 50 }, + { "group": "nested_ak74_mag" }, + { "group": "nested_ak74_mag", "prob": 50 }, { "group": "on_hand_545x39" } ] }, @@ -2103,8 +2103,8 @@ "ammo": 100, "entries": [ { "item": "USAS_12", "charges-min": 0, "charges-max": 10 }, - { "item": "USAS10mag" }, - { "item": "USAS10mag", "prob": 50 }, + { "group": "nested_USAS_12_mag" }, + { "group": "nested_USAS_12_mag", "prob": 50 }, { "group": "on_hand_shot" } ] }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json new file mode 100644 index 000000000000..b93225323725 --- /dev/null +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json @@ -0,0 +1,339 @@ +[ + { + "id": "nested_glock17_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "glock17_17", "prob": 100 }, + { "item": "glock17_22", "prob": 5 }, + { "item": "glock_drum_50rd", "prob": 5 }, + { "item": "glock_drum_100rd", "prob": 5 }, + { "item": "glockbigmag", "prob": 5 } + ] + }, + { + "id": "nested_glock19_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "glockmag", "prob": 100 }, + { "item": "glock17_17", "prob": 5 }, + { "item": "glock17_22", "prob": 5 }, + { "item": "glock_drum_50rd", "prob": 5 }, + { "item": "glock_drum_100rd", "prob": 5 }, + { "item": "glockbigmag", "prob": 5 } + ] + }, + { + "id": "nested_glock21_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "glock_21mag", "prob": 100 }, { "item": "glock_21mag26", "prob": 5 } ] + }, + { + "id": "nested_glock22_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "glock40mag", "prob": 100 }, { "item": "glock40bigmag", "prob": 5 } ] + }, + { + "id": "nested_m1911_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "m1911mag", "prob": 100 }, { "item": "m1911bigmag", "prob": 5 } ] + }, + { + "id": "nested_m9_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "m9mag", "prob": 100 }, { "item": "m9bigmag", "prob": 5 } ] + }, + { + "id": "nested_hi_power_9mm_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "bhp9mag_13rd", "prob": 100 }, { "item": "bhp9mag_15rd", "prob": 5 } ] + }, + { + "id": "nested_walther_ppq_9mm_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "ppq9mag_10rd", "prob": 100 }, + { "item": "ppq9mag_15rd", "prob": 5 }, + { "item": "ppq9mag_17rd", "prob": 5 } + ] + }, + { + "id": "nested_walther_ppq_40_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "ppq40mag_10rd", "prob": 100 }, + { "item": "ppq40mag_12rd", "prob": 5 }, + { "item": "ppq40mag_14rd", "prob": 5 } + ] + }, + { + "id": "nested_hptc9_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "hptc9mag_8rd", "prob": 100 }, + { "item": "hptc9mag_10rd", "prob": 5 }, + { "item": "hptc9mag_15rd", "prob": 5 } + ] + }, + { + "id": "nested_hptcf380_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "hptcf380mag_8rd", "prob": 100 }, { "item": "hptcf380mag_10rd", "prob": 5 } ] + }, + { + "id": "nested_cz75_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "cz75mag_12rd", "prob": 100 }, + { "item": "cz75mag_20rd", "prob": 5 }, + { "item": "cz75mag_26rd", "prob": 5 } + ] + }, + { + "id": "nested_ak47_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "akmag30", "prob": 100 }, + { "item": "akmag10", "prob": 5 }, + { "item": "akmag20", "prob": 5 }, + { "item": "akmag40", "prob": 5 }, + { "item": "akdrum75", "prob": 5 } + ] + }, + { + "id": "nested_rm103a_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "8x40_25_mag", "prob": 100 }, { "item": "8x40_10_mag", "prob": 5 } ] + }, + { + "id": "nested_mp5_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "mp5mag", "prob": 100 }, { "item": "mp5bigmag", "prob": 5 } ] + }, + { + "id": "nested_tommygun_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "thompson_mag", "prob": 100 }, + { "item": "thompson_bigmag", "prob": 5 }, + { "item": "thompson_drum", "prob": 5 } + ] + }, + { + "id": "nested_TDI_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "tdi_mag", "prob": 100 }, { "item": "glock_21mag", "prob": 5 }, { "item": "glock_21mag26", "prob": 5 } ] + }, + { + "id": "nested_hk_mp7_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "hk46mag", "prob": 100 }, { "item": "hk46bigmag", "prob": 5 } ] + }, + { + "id": "nested_stanag_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "stanag30", "prob": 170 }, + { "item": "stanag5", "prob": 5 }, + { "item": "stanag10", "prob": 5 }, + { "item": "stanag20", "prob": 5 }, + { "item": "stanag40", "prob": 5 }, + { "item": "stanag50", "prob": 5 }, + { "item": "stanag60", "prob": 5 }, + { "item": "stanag60drum", "prob": 5 }, + { "item": "stanag90", "prob": 5 }, + { "item": "stanag100", "prob": 5 }, + { "item": "stanag100drum", "prob": 5 }, + { "item": "stanag150", "prob": 5 } + ] + }, + { + "id": "nested_m14_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "m14mag", "prob": 100 }, { "item": "m14smallmag", "prob": 5 } ] + }, + { + "id": "nested_ruger_1022_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "ruger1022mag", "prob": 100 }, { "item": "ruger1022bigmag", "prob": 5 } ] + }, + { + "id": "nested_ruger_mini_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "ruger20", "prob": 100 }, + { "item": "ruger5", "prob": 5 }, + { "item": "ruger10", "prob": 5 }, + { "item": "ruger30", "prob": 5 }, + { "item": "ruger90", "prob": 5 }, + { "item": "ruger100", "prob": 5 } + ] + }, + { + "id": "nested_fn_fal_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "falmag", "prob": 100 }, { "item": "falbigmag", "prob": 5 } ] + }, + { + "id": "nested_hk_g3_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "g3mag", "prob": 100 }, { "item": "g3bigmag", "prob": 5 } ] + }, + { + "id": "nested_hk_g36_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "g36mag_30rd", "prob": 100 }, { "item": "g36mag_100rd", "prob": 5 } ] + }, + { + "id": "nested_m1918_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "m1918mag", "prob": 100 }, { "item": "m1918bigmag", "prob": 5 } ] + }, + { + "id": "nested_hk417_13_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "hk417mag_20rd", "prob": 100 }, { "item": "hk417mag_10rd", "prob": 5 } ] + }, + { + "id": "nested_rm298_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "8x40_500_mag", "prob": 100 }, { "item": "8x40_250_mag", "prob": 5 } ] + }, + { + "id": "nested_rm51_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "8x40_50_mag", "prob": 100 }, { "item": "8x40_100_mag", "prob": 5 } ] + }, + { + "id": "nested_scar_h_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "scarhmag", "prob": 100 }, { "item": "scarhbigmag", "prob": 5 }, { "item": "scarhmag_30rd", "prob": 5 } ] + }, + { + "id": "nested_ak74_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "ak74mag", "prob": 100 }, { "item": "rpk74mag", "prob": 5 } ] + }, + { + "id": "nested_steyr_aug_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ + { "item": "augmag_30rd", "prob": 100 }, + { "item": "augmag_10rd", "prob": 5 }, + { "item": "augmag_42rd", "prob": 5 }, + { "item": "augmag_100rd", "prob": 5 } + ] + }, + { + "id": "nested_rm20_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "20x66_20_mag", "prob": 100 }, { "item": "20x66_40_mag", "prob": 5 } ] + }, + { + "id": "nested_saiga_12_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "saiga10mag", "prob": 100 }, { "item": "saiga30mag", "prob": 5 } ] + }, + { + "id": "nested_saiga_410_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "saiga410mag_10rd", "prob": 100 }, { "item": "saiga410mag_30rd", "prob": 5 } ] + }, + { + "id": "nested_needlepistol_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "5x50_50_mag", "prob": 100 }, { "item": "5x50_100_mag", "prob": 5 } ] + }, + { + "id": "nested_needlegun_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "5x50_100_mag", "prob": 100 }, { "item": "5x50_50_mag", "prob": 5 } ] + }, + { + "id": "nested_ppsh_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "ppshmag", "prob": 100 }, { "item": "ppshdrum", "prob": 5 } ] + }, + { + "id": "nested_USAS_12_mag", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "entries": [ { "item": "USAS10mag", "prob": 100 }, { "item": "USAS20mag", "prob": 5 } ] + } +] diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index 1b6d7c727d95..aad9d6a0d79a 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -99,7 +99,26 @@ "dispersion": 380, "durability": 6, "min_cycle_recoil": 1350, - "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ] + "magazines": [ + [ + "223", + [ + "stanag30", + "stanag5", + "stanag10", + "stanag20", + "stanag40", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + ] + ] }, { "id": "famas",