From 08753e2e1a88813f133e1cb411a27d1d7e4e85c6 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 14 Mar 2023 22:54:38 -0700 Subject: Port to DDA. --- json/itemgroups/Weapons_Mods_Ammo/ammo.json | 14 +- json/itemgroups/Weapons_Mods_Ammo/field_drops.json | 90 +++++++++++++ json/itemgroups/Weapons_Mods_Ammo/guns.json | 71 +++++++--- json/itemgroups/Weapons_Mods_Ammo/magazines.json | 12 +- json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json | 13 ++ json/itemgroups/Weapons_Mods_Ammo/nested_guns.json | 145 +++++++++++++++++++++ 6 files changed, 308 insertions(+), 37 deletions(-) create mode 100644 json/itemgroups/Weapons_Mods_Ammo/field_drops.json 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/Weapons_Mods_Ammo') diff --git a/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/json/itemgroups/Weapons_Mods_Ammo/ammo.json index 536fef1..5c660ea 100644 --- a/json/itemgroups/Weapons_Mods_Ammo/ammo.json +++ b/json/itemgroups/Weapons_Mods_Ammo/ammo.json @@ -11,7 +11,7 @@ }, { "type": "item_group", - "id": "ammo_pistol_modern_handloads", + "id": "ammo_pistol_reloaded", "//": "Reloaded pistol ammo balanced according to rarity.", "subtype": "distribution", "entries": [ @@ -19,16 +19,6 @@ { "item": "reloaded_46mm_shp", "prob": 20 } ] }, - { - "type": "item_group", - "id": "ammo_pistol_blackpowder_handloads", - "//": "Blackpowder pistol ammo balanced according to rarity, additional weight for calibers that have common, manual-action firearms available in that chambering.", - "subtype": "distribution", - "entries": [ - { "item": "bp_46mm_fmj", "prob": 20 }, - { "item": "bp_46mm_shp", "prob": 20 } - ] - }, { "type": "item_group", "id": "ammo_rifle_milspec", @@ -59,7 +49,7 @@ }, { "type": "item_group", - "id": "ammo_shotgun_modern_handloads", + "id": "ammo_shotgun_reloaded", "//": "Reloaded shotgun ammo balanced according to rarity.", "subtype": "distribution", "entries": [ diff --git a/json/itemgroups/Weapons_Mods_Ammo/field_drops.json b/json/itemgroups/Weapons_Mods_Ammo/field_drops.json new file mode 100644 index 0000000..e0b2a30 --- /dev/null +++ b/json/itemgroups/Weapons_Mods_Ammo/field_drops.json @@ -0,0 +1,90 @@ +[ + { + "id": "field_usp_40", + "type": "item_group", + "//": "this is a distribution for ammo and magazines an active combatant would have immediately on hand. Most should be expended.", + "//2": "usually takes the form of 100% chance for first mag, 70% for second, 50% for third with reducing chances of them being mostly expended.", + "//3": "this group is for the glock 22", + "subtype": "collection", + "entries": [ + { + "distribution": [ { "item": "usp40mag", "charges": 13, "prob": 50 }, { "item": "usp40mag", "charges": [ 0, 5 ], "prob": 50 } ], + "prob": 100 + }, + { + "distribution": [ { "item": "usp40mag", "charges": 13, "prob": 30 }, { "item": "usp40mag", "charges": [ 0, 5 ], "prob": 70 } ], + "prob": 70 + }, + { + "distribution": [ { "item": "usp40mag", "charges": 13, "prob": 30 }, { "item": "usp40mag", "charges": [ 0, 5 ], "prob": 70 } ], + "prob": 50 + } + ] + }, + { + "id": "field_hk_p30_9", + "type": "item_group", + "//": "this is a distribution for ammo and magazines an active combatant would have immediately on hand. Most should be expended.", + "//2": "usually takes the form of 100% chance for first mag, 70% for second, 50% for third with reducing chances of them being mostly expended.", + "//3": "this group is for the glock 22", + "subtype": "collection", + "entries": [ + { + "distribution": [ { "item": "p309mag", "charges": 15, "prob": 50 }, { "item": "p309mag", "charges": [ 0, 5 ], "prob": 50 } ], + "prob": 100 + }, + { + "distribution": [ { "item": "p309mag", "charges": 15, "prob": 30 }, { "item": "p309mag", "charges": [ 0, 5 ], "prob": 70 } ], + "prob": 70 + }, + { + "distribution": [ { "item": "p309mag", "charges": 15, "prob": 30 }, { "item": "p309mag", "charges": [ 0, 5 ], "prob": 70 } ], + "prob": 50 + } + ] + }, + { + "id": "field_hk_p30_40", + "type": "item_group", + "//": "this is a distribution for ammo and magazines an active combatant would have immediately on hand. Most should be expended.", + "//2": "usually takes the form of 100% chance for first mag, 70% for second, 50% for third with reducing chances of them being mostly expended.", + "//3": "this group is for the glock 22", + "subtype": "collection", + "entries": [ + { + "distribution": [ { "item": "p3040mag", "charges": 13, "prob": 50 }, { "item": "p3040mag", "charges": [ 0, 5 ], "prob": 50 } ], + "prob": 100 + }, + { + "distribution": [ { "item": "p3040mag", "charges": 13, "prob": 30 }, { "item": "p3040mag", "charges": [ 0, 5 ], "prob": 70 } ], + "prob": 70 + }, + { + "distribution": [ { "item": "p3040mag", "charges": 13, "prob": 30 }, { "item": "p3040mag", "charges": [ 0, 5 ], "prob": 70 } ], + "prob": 50 + } + ] + }, + { + "id": "field_hk_45", + "type": "item_group", + "//": "this is a distribution for ammo and magazines an active combatant would have immediately on hand. Most should be expended.", + "//2": "usually takes the form of 100% chance for first mag, 70% for second, 50% for third with reducing chances of them being mostly expended.", + "//3": "this group is for the glock 22", + "subtype": "collection", + "entries": [ + { + "distribution": [ { "item": "hk45mag", "charges": 13, "prob": 50 }, { "item": "hk45mag", "charges": [ 0, 5 ], "prob": 50 } ], + "prob": 100 + }, + { + "distribution": [ { "item": "hk45mag", "charges": 13, "prob": 30 }, { "item": "hk45mag", "charges": [ 0, 5 ], "prob": 70 } ], + "prob": 70 + }, + { + "distribution": [ { "item": "hk45mag", "charges": 13, "prob": 30 }, { "item": "hk45mag", "charges": [ 0, 5 ], "prob": 70 } ], + "prob": 50 + } + ] + } +] diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json index 6336f5e..3fe8f7c 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 } + { "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 } ] }, { @@ -15,10 +15,10 @@ "id": "guns_pistol_rare_display", "//": "Empty uncommon pistols found exclusively at gun stores.", "items": [ - { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 0 }, - { "item": "hk_p30_9", "prob": 90, "charges-min": 0, "charges-max": 0 }, - { "item": "hk_p30_40", "prob": 90, "charges-min": 0, "charges-max": 0 }, - { "item": "hk_45", "prob": 90, "charges-min": 0, "charges-max": 0 } + { "item": "usp_40", "prob": 25, "charges-min": 0, "charges-max": 0 }, + { "item": "hk_p30_9", "prob": 25, "charges-min": 0, "charges-max": 0 }, + { "item": "hk_p30_40", "prob": 15, "charges-min": 0, "charges-max": 0 }, + { "item": "hk_45", "prob": 6, "charges-min": 0, "charges-max": 0 } ] }, { @@ -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 } + { "item": "nested_hk_ump9", "prob": 40 }, + { "item": "nested_hk_ump40", "prob": 35 } ] }, { @@ -35,8 +35,8 @@ "id": "guns_smg_rare_display", "//": "Less common SMGs found exclusively in gun stores.", "items": [ - { "item": "hk_ump9", "prob": 30, "charges-min": 0, "charges-max": 0 }, - { "item": "hk_ump40", "prob": 30, "charges-min": 0, "charges-max": 0 } + { "item": "hk_ump9", "prob": 40, "charges-min": 0, "charges-max": 0 }, + { "item": "hk_ump40", "prob": 35, "charges-min": 0, "charges-max": 0 } ] }, { @@ -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, "charges-min": 0, "charges-max": 20 } ] }, { @@ -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 } + { "item": "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 } + { "item": "nested_hk_msg90a2", "prob": 15 }, + { "item": "nested_hk_g11", "prob": 30 } ] }, { @@ -77,13 +77,46 @@ "id": "guns_shotgun_milspec", "//": "Military shotguns currently in service.", "items": [ - { "item": "hk_caws", "prob": 30, "charges-min": 0, "charges-max": 10 } + { "item": "nested_hk_caws", "prob": 30 } ] }, { "type": "item_group", - "id": "guns_cop", - "//": "Police issue weapons of all types", + "id": "sidearms_cop_in_field", + "//": "gun plus potential expended magazines", + "items": [ + { + "collection": [ { "item": "usp_40", "prob": 100, "charges": [ 0, 13 ] }, { "group": "field_usp_40" } ], + "prob": 10 + }, + { + "collection": [ { "item": "hk_p30_9", "prob": 100, "charges": [ 0, 15 ] }, { "group": "field_hk_p30_9" } ], + "prob": 10 + }, + { + "collection": [ { "item": "hk_p30_40", "prob": 100, "charges": [ 0, 13 ] }, { "group": "field_hk_p30_40" } ], + "prob": 10 + }, + { + "collection": [ { "item": "hk_45", "prob": 100, "charges": [ 0, 10 ] }, { "group": "field_hk_45" } ], + "prob": 10 + } + ] + }, + { + "type": "item_group", + "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 } + ] + }, + { + "type": "item_group", + "id": "sidearms_cop", "items": [ { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 }, { "item": "hk_p30_9", "prob": 10, "charges-min": 0, "charges-max": 15 }, diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 122117f..24d0465 100644 --- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -22,12 +22,12 @@ "id": "mags_swat", "//": "Magazines issued to paramilitary forces in addition to standard police issue.", "items": [ - [ "ump9mag", 20 ], - [ "ump40mag", 20 ], - [ "usp40mag", 10 ], - [ "p309mag", 10 ], - [ "p3040mag", 10 ], - [ "hk45mag", 10 ] + { "item": "ump9mag", "prob": 20, "charges": [ 0, 30 ] }, + { "item": "ump40mag", "prob": 20, "charges": [ 0, 30 ] }, + { "item": "usp40mag", "prob": 10, "charges": [ 0, 13 ] }, + { "item": "p309mag", "prob": 10, "charges": [ 0, 15 ] }, + { "item": "p3040mag", "prob": 10, "charges": [ 0, 13 ] }, + { "item": "hk45mag", "prob": 10, "charges": [ 0, 10 ] } ] }, { 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..d995c3d --- /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": "473", "prob": 100, "charges": [ 1, 40 ] }, + { "item": "473", "prob": 75, "charges": [ 44, 80 ] }, + { "item": "473", "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