diff --git a/data/json/itemgroups/Locations_MapExtras/map_extras.json b/data/json/itemgroups/Locations_MapExtras/map_extras.json index 48eb0f3b2729b..5ddbe159f1e5e 100644 --- a/data/json/itemgroups/Locations_MapExtras/map_extras.json +++ b/data/json/itemgroups/Locations_MapExtras/map_extras.json @@ -18,7 +18,11 @@ "type": "item_group", "subtype": "collection", "id": "map_extra_military", - "entries": [ { "item": "corpse", "damage": 3 }, { "group": "mon_zombie_soldier_death_drops" } ] + "entries": [ + { "group": "mon_zombie_soldier_death_drops" }, + { "group": "military_standard_sniper_rifles", "prob": 10 }, + { "item": "corpse", "damage": 3 } + ] }, { "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index c048bb7d6a613..8ee64a79743cf 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -690,29 +690,40 @@ }, { "type": "item_group", - "id": "guns_cop", - "//": "Police issue weapons of all types", + "id": "longguns_cop", + "items": [ + { "item": "ar15", "prob": 15, "charges": [ 0, 30 ] }, + { "item": "cx4", "prob": 20, "charges": [ 0, 15 ] }, + { "item": "fn_p90", "prob": 5, "charges": [ 0, 50 ] }, + { "item": "hk_mp5", "prob": 10, "charges": [ 0, 30 ] }, + { "item": "mossberg_500", "prob": 15, "charges": [ 0, 8 ] }, + { "item": "remington_700", "prob": 5, "charges": [ 0, 4 ] }, + { "item": "remington_870", "prob": 20, "charges": [ 0, 6 ] } + ] + }, + { + "type": "item_group", + "id": "sidearms_cop", "items": [ - { "item": "ar15", "prob": 15, "charges-min": 0, "charges-max": 30 }, - { "item": "cx4", "prob": 20, "charges-min": 0, "charges-max": 15 }, - { "item": "fn57", "prob": 20, "charges-min": 0, "charges-max": 20 }, - { "item": "fn_p90", "prob": 5, "charges-min": 0, "charges-max": 50 }, - { "item": "glock_19", "prob": 15, "charges-min": 0, "charges-max": 15 }, - { "item": "glock_22", "prob": 20, "charges-min": 0, "charges-max": 15 }, - { "item": "hk_mp5", "prob": 10, "charges-min": 0, "charges-max": 30 }, - { "item": "m9", "prob": 5, "charges-min": 0, "charges-max": 15 }, - { "item": "mossberg_500", "prob": 15, "charges-min": 0, "charges-max": 8 }, - { "item": "remington_700", "prob": 5, "charges-min": 0, "charges-max": 4 }, - { "item": "remington_870", "prob": 20, "charges-min": 0, "charges-max": 6 }, - { "item": "sig_40", "prob": 20, "charges-min": 0, "charges-max": 12 }, - { "item": "usp_45", "prob": 10, "charges-min": 0, "charges-max": 12 }, - { "item": "usp_9mm", "prob": 10, "charges-min": 0, "charges-max": 15 }, - { "item": "kp32", "prob": 1, "charges-min": 0, "charges-max": 7 }, - { "item": "kp3at", "prob": 2, "charges-min": 0, "charges-max": 6 }, - { "item": "rugerlcp", "prob": 2, "charges-min": 0, "charges-max": 6 }, - { "item": "kpf9", "prob": 3, "charges-min": 0, "charges-max": 7 } + { "item": "fn57", "prob": 20, "charges": [ 0, 20 ] }, + { "item": "glock_19", "prob": 15, "charges": [ 0, 15 ] }, + { "item": "glock_22", "prob": 20, "charges": [ 0, 15 ] }, + { "item": "m9", "prob": 5, "charges": [ 0, 15 ] }, + { "item": "sig_40", "prob": 20, "charges": [ 0, 12 ] }, + { "item": "usp_45", "prob": 10, "charges": [ 0, 12 ] }, + { "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] }, + { "item": "kp32", "prob": 1, "charges": [ 0, 7 ] }, + { "item": "kp3at", "prob": 2, "charges": [ 0, 6 ] }, + { "item": "rugerlcp", "prob": 2, "charges": [ 0, 6 ] }, + { "item": "kpf9", "prob": 3, "charges": [ 0, 7 ] } ] }, + { + "type": "item_group", + "id": "guns_cop", + "//": "Police issue weapons of all types", + "items": [ { "group": "longguns_cop", "prob": 50 }, { "group": "sidearms_cop", "prob": 50 } ] + }, { "type": "item_group", "id": "guns_swat", diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index 2ace5aae10dfb..b54dd17be8ea0 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -78,6 +78,12 @@ { "id": "cop_weapons", "type": "item_group", - "items": [ { "group": "cop_melee", "prob": 60 }, { "group": "guns_cop", "prob": 40 } ] + "items": [ + { "group": "cop_melee", "prob": 60 }, + { + "distribution": [ { "group": "longguns_cop", "prob": 50, "contents-item": "shoulder_strap" }, { "group": "sidearms_cop", "prob": 50 } ], + "prob": 40 + } + ] } ] diff --git a/data/json/monsterdrops/zombie_default.json b/data/json/monsterdrops/zombie_default.json index 70164ef5c6df1..92bce238fd0f8 100644 --- a/data/json/monsterdrops/zombie_default.json +++ b/data/json/monsterdrops/zombie_default.json @@ -218,15 +218,15 @@ "id": "default_zombie_items", "ammo": 30, "magazine": 100, - "groups": [ - [ "default_zombie_items_bags", 16 ], - [ "default_zombie_items_pockets", 20 ], - [ "ammo_pistol_common", 2 ], - [ "ammo_shotgun_common", 1 ], - [ "guns_pistol_common", 2 ], - [ "guns_shotgun_common", 1 ], - [ "postman_gear", 5 ], - [ "hardware_plumbing", 5 ] + "entries": [ + { "group": "default_zombie_items_bags", "prob": 16 }, + { "group": "default_zombie_items_pockets", "prob": 20 }, + { "group": "ammo_pistol_common", "prob": 2 }, + { "group": "ammo_shotgun_common", "prob": 1 }, + { "group": "guns_pistol_common", "prob": 2 }, + { "group": "guns_shotgun_common", "prob": 1, "contents-item": "shoulder_strap" }, + { "group": "postman_gear", "prob": 5 }, + { "group": "hardware_plumbing", "prob": 5 } ] }, { diff --git a/data/json/monsterdrops/zombie_soldier.json b/data/json/monsterdrops/zombie_soldier.json index ab7b17f5c48f9..62c96f5b71063 100644 --- a/data/json/monsterdrops/zombie_soldier.json +++ b/data/json/monsterdrops/zombie_soldier.json @@ -14,11 +14,11 @@ }, { "distribution": [ - { "group": "military_standard_assault_rifles", "prob": 75 }, - { "group": "military_standard_lmgs", "prob": 10 }, - { "group": "military_standard_sniper_rifles", "prob": 10 }, - { "group": "military_standard_shotguns", "prob": 5 } - ] + { "group": "military_standard_assault_rifles", "contents-item": "shoulder_strap", "prob": 75 }, + { "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10 }, + { "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5 } + ], + "prob": 70 }, { "group": "infantry_common_gear" }, { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 }, @@ -50,10 +50,10 @@ { "distribution": [ { "group": "military_standard_assault_rifles", "contents-group": "sopmod", "prob": 75 }, - { "group": "military_standard_lmgs", "prob": 10 }, - { "group": "military_standard_sniper_rifles", "prob": 10 }, - { "group": "military_standard_shotguns", "prob": 5 } - ] + { "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10 }, + { "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5 } + ], + "prob": 70 }, { "group": "infantry_common_gear" }, { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 }, diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json index 9de7ad9edc94b..b55ebf8e47101 100644 --- a/data/json/monsterdrops/zombie_survivor.json +++ b/data/json/monsterdrops/zombie_survivor.json @@ -4,6 +4,7 @@ "subtype": "collection", "id": "mon_zombie_survivor_death_drops", "magazine": 100, + "ammo": 60, "entries": [ { "group": "clothing_outdoor_set", "damage": [ 1, 4 ] }, { "group": "bags", "damage": [ 1, 4 ], "prob": 10 }, @@ -15,7 +16,7 @@ { "distribution": [ { "group": "survivor_melee", "prob": 40, "damage": [ 1, 4 ] }, - { "group": "guns_survival", "prob": 60, "damage": [ 1, 4 ] } + { "group": "survivor_longguns", "prob": 60, "contents-item": "shoulder_strap", "damage": [ 1, 4 ] } ], "prob": 50 }, @@ -42,6 +43,57 @@ [ "spear_rebar", 10 ] ] }, + { + "type": "item_group", + "subtype": "collection", + "id": "mon_zombie_survivor_elite_death_drops", + "entries": [ + { "group": "survivorzed_gloves", "damage": [ 1, 4 ] }, + { "group": "survivorzed_boots", "damage": [ 1, 4 ] }, + { "group": "survivorzed_head", "damage": [ 1, 4 ] }, + { "group": "survivorzed_extra", "damage": [ 1, 4 ] }, + { + "distribution": [ + { "group": "survivorzed_suits", "prob": 25, "damage": [ 1, 4 ] }, + { + "collection": [ + { "group": "survivorzed_tops", "prob": 25, "damage": [ 1, 4 ] }, + { "group": "survivorzed_bottoms", "prob": 25, "damage": [ 1, 4 ] } + ], + "prob": 75 + } + ] + }, + { + "distribution": [ { "group": "underwear", "prob": 1, "damage": [ 1, 4 ] }, { "group": "loincloth", "prob": 2, "damage": [ 1, 4 ] } ] + }, + { + "distribution": [ + { + "distribution": [ + { "group": "guns_pistol_common", "prob": 100 }, + { "group": "guns_rifle_common", "prob": 20, "contents-item": "shoulder_strap" }, + { "group": "guns_smg_common", "prob": 5, "contents-item": "shoulder_strap" }, + { "group": "guns_shotgun_common", "prob": 40, "contents-item": "shoulder_strap" } + ], + "prob": 24 + }, + { "group": "grenades", "prob": 10 }, + { "group": "mil_hw", "prob": 1 }, + { "group": "launchers", "prob": 1 }, + { "group": "stash_food", "prob": 40 }, + { "group": "ammo_common", "prob": 26 }, + { "group": "stash_drugs", "prob": 28 }, + { "group": "gear_survival", "prob": 18 }, + { "group": "mil_food", "prob": 22 }, + { "group": "mil_food_nodrugs", "prob": 34 }, + { "group": "shelter", "prob": 8 }, + { "group": "mil_surplus", "prob": 6 } + ] + }, + { "item": "cash_card", "charges-min": 50000, "charges-max": 150000 } + ] + }, { "id": "survivor_cutting", "type": "item_group", @@ -89,46 +141,28 @@ ] }, { + "id": "survivor_longguns", "type": "item_group", - "subtype": "collection", - "id": "mon_zombie_survivor_elite_death_drops", + "subtype": "distribution", "entries": [ - { "group": "survivorzed_gloves", "damage": [ 1, 4 ] }, - { "group": "survivorzed_boots", "damage": [ 1, 4 ] }, - { "group": "survivorzed_head", "damage": [ 1, 4 ] }, - { "group": "survivorzed_extra", "count": [ 3, 10 ], "damage": [ 1, 4 ] }, { "distribution": [ - { "group": "survivorzed_suits", "prob": 25, "damage": [ 1, 4 ] }, - { - "collection": [ - { "group": "survivorzed_tops", "prob": 25, "damage": [ 1, 4 ] }, - { "group": "survivorzed_bottoms", "prob": 25, "damage": [ 1, 4 ] } - ], - "prob": 75 - } - ] - }, - { - "distribution": [ { "group": "underwear", "prob": 10, "damage": [ 1, 4 ] }, { "group": "loincloth", "prob": 1, "damage": [ 1, 4 ] } ] - }, - { - "distribution": [ - { "group": "guns_common", "prob": 24 }, - { "group": "grenades", "prob": 10 }, - { "group": "mil_hw", "prob": 1 }, - { "group": "launchers", "prob": 1 }, - { "group": "stash_food", "prob": 40 }, - { "group": "ammo_common", "prob": 26 }, - { "group": "stash_drugs", "prob": 28 }, - { "group": "gear_survival", "prob": 18 }, - { "group": "mil_food", "prob": 22 }, - { "group": "mil_food_nodrugs", "prob": 34 }, - { "group": "shelter", "prob": 8 }, - { "group": "mil_surplus", "prob": 6 } - ] + { "group": "guns_smg_improvised", "prob": 10 }, + { "group": "guns_rifle_improvised", "prob": 100 }, + { "group": "guns_shotgun_improvised", "prob": 100 }, + { "group": "guns_launcher_improvised", "prob": 30 } + ], + "prob": 200 }, - { "item": "cash_card", "prob": 25, "charges-min": 50000, "charges-max": 150000 } + { "item": "ar15", "prob": 5, "charges": [ 0, 30 ] }, + { "item": "mossberg_500", "prob": 5, "charges": [ 0, 8 ] }, + { "item": "remington_870", "prob": 5, "charges": [ 0, 6 ] }, + { "item": "ruger_1022", "prob": 15, "charges": [ 0, 10 ] }, + { "item": "shotgun_410", "prob": 10, "charges": [ 0, 1 ] }, + { "item": "shotgun_s", "prob": 10, "charges": [ 0, 1 ] }, + { "item": "shotgun_d", "prob": 10, "charges": [ 0, 2 ] }, + { "item": "sten", "prob": 20, "charges": [ 0, 32 ] }, + { "item": "sks", "prob": 10, "charges": [ 0, 10 ] } ] } ]