From 3c7b377f09d125ee6884efa30456be4988ae0563 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 9 Aug 2023 14:21:00 -0700 Subject: Updated for BN's porting of DDA's nseted guns feature. --- json/itemgroups/Weapons_Mods_Ammo/guns.json | 36 ++--- json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json | 13 ++ json/itemgroups/Weapons_Mods_Ammo/nested_guns.json | 145 +++++++++++++++++++++ 3 files changed, 176 insertions(+), 18 deletions(-) create mode 100644 json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json create mode 100644 json/itemgroups/Weapons_Mods_Ammo/nested_guns.json (limited to 'json/itemgroups') diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json index 6336f5e..78bfae1 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 } + { "group": "nested_usp_40", "prob": 90 }, + { "group": "nested_hk_p30_9", "prob": 90 }, + { "group": "nested_hk_p30_40", "prob": 90 }, + { "group": "nested_hk_45", "prob": 90 } ] }, { @@ -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 } + { "group": "nested_hk_ump9", "prob": 30 }, + { "group": "nested_hk_ump40", "prob": 3- } ] }, { @@ -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 } ] }, { @@ -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 } + { "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": "hk_msg90a2", "prob": 15, "charges-min": 0, "charges-max": 20 }, - { "item": "hk_g11", "prob": 30, "charges-min": 0, "charges-max": 50 } + { "group": "nested_hk_msg90a2", "prob": 15 }, + { "group": "nested_hk_g11", "prob": 30 } ] }, { @@ -77,18 +77,18 @@ "id": "guns_shotgun_milspec", "//": "Military shotguns currently in service.", "items": [ - { "item": "hk_caws", "prob": 30, "charges-min": 0, "charges-max": 10 } + { "group": "nested_hk_caws", "prob": 30 } ] }, { "type": "item_group", - "id": "guns_cop", + "id": "sidearms_cop", "//": "Police issue weapons of all types", "items": [ - { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 }, - { "item": "hk_p30_9", "prob": 10, "charges-min": 0, "charges-max": 15 }, - { "item": "hk_p30_40", "prob": 10, "charges-min": 0, "charges-max": 13 }, - { "item": "hk_45", "prob": 10, "charges-min": 0, "charges-max": 10 } + { "group": "nested_usp_40", "prob": 10 }, + { "group": "nested_hk_p30_9", "prob": 10 }, + { "group": "nested_hk_p30_40", "prob": 10 }, + { "group": "nested_hk_45", "prob": 10 } ] }, { @@ -96,8 +96,8 @@ "id": "guns_swat", "//": "Guns issued to paramilitary forces in addition to standard police issue.", "items": [ - { "item": "hk_ump9", "prob": 15, "charges-min": 0, "charges-max": 30 }, - { "item": "hk_ump40", "prob": 15, "charges-min": 0, "charges-max": 30 } + { "group": "nested_hk_ump9", "prob": 15 }, + { "group": "nested_hk_ump40", "prob": 15 } ] } ] diff --git a/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json new file mode 100644 index 0000000..65a940f --- /dev/null +++ b/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json @@ -0,0 +1,13 @@ +[ + { + "id": "on_hand_473", + "type": "item_group", + "//": "a collection of ammo that would be found with a loaded gun.", + "subtype": "distribution", + "entries": [ + { "item": "473x33mm", "prob": 100, "charges": [ 1, 40 ] }, + { "item": "473x33mm", "prob": 75, "charges": [ 44, 80 ] }, + { "item": "473x33mm", "prob": 30, "charges": [ 88, 160 ] } + ] + } +] diff --git a/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json new file mode 100644 index 0000000..86bce89 --- /dev/null +++ b/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -0,0 +1,145 @@ +[ + { + "id": "nested_usp_40", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "usp_40", "charges-min": 0, "charges-max": 13 }, + { "item": "usp40mag" }, + { "item": "usp40mag", "prob": 50 }, + { "group": "on_hand_40" } + ] + }, + { + "id": "nested_hk_p30_9", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_p30_9", "charges-min": 0, "charges-max": 15 }, + { "item": "p309mag" }, + { "item": "p309mag", "prob": 50 }, + { "group": "on_hand_9mm" } + ] + }, + { + "id": "nested_hk_p30_40", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_p30_40", "charges-min": 0, "charges-max": 13 }, + { "item": "p3040mag" }, + { "item": "p3040mag", "prob": 50 }, + { "group": "on_hand_40" } + ] + }, + { + "id": "nested_hk_45", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_p30_40", "charges-min": 0, "charges-max": 10 }, + { "item": "hk45mag" }, + { "item": "hk45mag", "prob": 50 }, + { "group": "on_hand_45" } + ] + }, + { + "id": "nested_hk_ump40", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_ump40", "charges-min": 0, "charges-max": 30 }, + { "item": "ump40mag" }, + { "item": "ump40mag", "prob": 50 }, + { "group": "on_hand_40" } + ] + }, + { + "id": "nested_hk_ump9", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_ump9", "charges-min": 0, "charges-max": 30 }, + { "item": "ump9mag" }, + { "item": "ump9mag", "prob": 50 }, + { "group": "on_hand_9mm" } + ] + }, + { + "id": "nested_hk_ucp", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_ucp", "charges-min": 0, "charges-max": 20 }, + { "item": "hk46mag" }, + { "item": "hk46mag", "prob": 50 }, + { "group": "on_hand_46" } + ] + }, + { + "id": "nested_hk_psg1a1", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_psg1a1", "charges-min": 0, "charges-max": 10 }, + { "item": "g3smallmag" }, + { "item": "g3smallmag", "prob": 50 }, + { "group": "on_hand_308" } + ] + }, + { + "id": "nested_hk_msg90a2", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_msg90a2", "charges-min": 0, "charges-max": 20 }, + { "item": "g3mag" }, + { "item": "g3mag", "prob": 50 }, + { "group": "on_hand_308" } + ] + }, + { + "id": "nested_hk_g11", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_g11", "charges-min": 0, "charges-max": 50 }, + { "item": "hk_g11_mag" }, + { "item": "hk_g11_mag", "prob": 50 }, + { "group": "on_hand_473" } + ] + }, + { + "id": "nested_hk_caws", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "hk_caws", "charges-min": 0, "charges-max": 10 }, + { "item": "hk_caws_mag" }, + { "item": "hk_caws_mag", "prob": 50 }, + { "group": "on_hand_shot" } + ] + } +] -- cgit v1.2.1