From 6d5dd3555d976c82bd79f608975482f65e8bbfb2 Mon Sep 17 00:00:00 2001 From: Viss Valdyr <33199510+Lamandus@users.noreply.github.com> Date: Sun, 21 Jul 2024 00:14:18 +0200 Subject: [PATCH] feat(content): zombies drop bows/crossbows/slingshots with ammo, house spawns for archery added. (#5024) * feat(content): zombies drop bows/crossbows/slingshots with ammo, house spawns for archery added. * addition to lockers in cabins. * flamming arrows are bugged, only spawned one. --- .../Locations_MapExtras/locations.json | 2 + .../Weapons_Mods_Ammo/everydaycarry_guns.json | 648 ++++++++++++++++++ .../itemgroups/Weapons_Mods_Ammo/guns.json | 27 + .../Weapons_Mods_Ammo/guns_stored.json | 2 + .../Weapons_Mods_Ammo/nested_ammo.json | 58 ++ .../json/itemgroups/collections_domestic.json | 2 + data/json/mapgen/basement/basement_guns.json | 1 + data/json/mapgen/nested/basement_nested.json | 40 +- data/json/mapgen/store/s_hunting.json | 6 +- data/json/monsterdrops/zombie_default.json | 4 +- 10 files changed, 777 insertions(+), 13 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index c83db630db8f..d8ec6545a7bc 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -106,6 +106,7 @@ { "group": "guns_pistol_common", "prob": 20 }, { "group": "guns_rifle_common", "prob": 20 }, { "group": "guns_shotgun_common", "prob": 20 }, + { "group": "carried_guns_archery", "prob": 10 }, { "group": "guns_pistol_obscure", "prob": 60 }, { "group": "guns_rifle_obscure", "prob": 60 }, { "group": "guns_shotgun_obscure", "prob": 60 }, @@ -126,6 +127,7 @@ { "group": "guns_rifle_common", "prob": 50 }, { "group": "guns_shotgun_common", "prob": 50 }, { "group": "guns_survival", "prob": 100 }, + { "group": "carried_guns_archery", "prob": 20 }, { "item": "flaregun", "prob": 25 }, { "item": "large_repairkit", "prob": 5 }, { "item": "signal_flare", "prob": 20 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json index 99893760b9a8..458172aff8fd 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json @@ -2617,5 +2617,653 @@ { "group": "nested_stanag_carbon_mag", "charges-min": 0, "prob": 50 }, { "group": "on_hand_223", "prob": 25, "charges": [ 10, 20 ], "count": [ 1, 2 ] } ] + }, + { + "id": "everyday_compgreatbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compgreatbow", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_compositebow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compositebow", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_compositebow_short", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compositebow_short", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_compbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compbow", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_compbow_high", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compbow_high", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_compbow_low", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compbow_low", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_longbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "longbow", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_selfbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "selfbow", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_shortbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "shortbow", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_woodgreatbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "woodgreatbow", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_arrows", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_arrows", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_crossbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "crossbow", "ammo-group": "on_hand_bolts", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_bolts", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_rep_crossbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "rep_crossbow", "ammo-group": "on_hand_bolts", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_bolts", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_hand_crossbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "hand_crossbow", "ammo-group": "on_hand_bolts", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_bolts", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_huge_crossbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "huge_crossbow", "ammo-group": "on_hand_bolts", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_bolts", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_crossbow_carbon", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "crossbow_carbon", "ammo-group": "on_hand_bolts", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_bolts", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_compcrossbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compcrossbow", "ammo-group": "on_hand_bolts", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_bolts", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_compositecrossbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compositecrossbow", "ammo-group": "on_hand_bolts", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_bolts", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_compositecrossbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "compositecrossbow", "ammo-group": "on_hand_bolts", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large" } ], + "prob": 15 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 20 ] }, { "item": "quiver_birchbark" } ], + "prob": 5 + }, + { + "collection": [ { "group": "on_hand_bolts", "charges": [ 0, 60 ] }, { "item": "quiver_large_birchbark" } ], + "prob": 5 + } + ], + "prob": 50 + }, + { "group": "on_hand_bolts", "prob": 50, "charges": [ 10, 20 ], "count": [ 1, 2 ] } + ] + } + ] + }, + { + "id": "everyday_wristrocket", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "wristrocket", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_pebbles", "charges": [ 0, 30 ] }, { "item": "ammo_satchel_leg" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_pebbles", "charges": [ 0, 60 ] }, { "item": "ammo_pouch" } ], + "prob": 15 + } + ], + "prob": 50 + }, + { "group": "on_hand_pebbles", "prob": 50, "charges": [ 10, 20 ], "count": [ 2, 3 ] } + ] + } + ] + }, + { + "id": "everyday_slingshot", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "slingshot", "charges": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_pebbles", "charges": [ 0, 30 ] }, { "item": "ammo_satchel_leg" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_pebbles", "charges": [ 0, 60 ] }, { "item": "ammo_pouch" } ], + "prob": 15 + } + ], + "prob": 50 + }, + { "group": "on_hand_pebbles", "prob": 50, "charges": [ 10, 20 ], "count": [ 2, 3 ] } + ] + } + ] + }, + { + "id": "everyday_bullet_crossbow", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "bullet_crossbow", "ammo-group": "on_hand_pebbles", "charges-min": 0 }, + { + "distribution": [ + { + "distribution": [ + { "collection": [ { "group": "on_hand_pebbles", "charges": [ 0, 30 ] }, { "item": "ammo_satchel_leg" } ], "prob": 100 }, + { + "collection": [ { "group": "on_hand_pebbles", "charges": [ 0, 60 ] }, { "item": "ammo_pouch" } ], + "prob": 15 + } + ], + "prob": 50 + }, + { "group": "on_hand_pebbles", "prob": 50, "charges": [ 10, 20 ], "count": [ 2, 3 ] } + ] + } + ] } ] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 3dcc6dcf4d69..f54d97db74de 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -640,6 +640,33 @@ { "group": "everyday_acr_300blk", "prob": 15 } ] }, + { + "type": "item_group", + "id": "carried_guns_archery", + "//": "Crossbows, bows, slingshots carried by zombies.", + "items": [ + { "group": "everyday_crossbow", "prob": 25 }, + { "group": "everyday_rep_crossbow", "prob": 10 }, + { "group": "everyday_hand_crossbow", "prob": 10 }, + { "group": "everyday_huge_crossbow", "prob": 5 }, + { "group": "everyday_crossbow_carbon", "prob": 15 }, + { "group": "everyday_compcrossbow", "prob": 15 }, + { "group": "everyday_compositecrossbow", "prob": 15 }, + { "group": "everyday_compgreatbow", "prob": 5 }, + { "group": "everyday_compositebow", "prob": 15 }, + { "group": "everyday_compositebow_short", "prob": 15 }, + { "group": "everyday_compbow", "prob": 5 }, + { "group": "everyday_compbow_high", "prob": 5 }, + { "group": "everyday_compbow_low", "prob": 5 }, + { "group": "everyday_longbow", "prob": 15 }, + { "group": "everyday_selfbow", "prob": 10 }, + { "group": "everyday_shortbow", "prob": 15 }, + { "group": "everyday_woodgreatbow", "prob": 10 }, + { "group": "everyday_wristrocket", "prob": 15 }, + { "group": "everyday_slingshot", "prob": 30 }, + { "group": "everyday_bullet_crossbow", "prob": 10 } + ] + }, { "type": "item_group", "id": "guns_bank_vault", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_stored.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_stored.json index 549e0c751442..5e346e9fdad8 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_stored.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_stored.json @@ -65,6 +65,8 @@ { "group": "tools_earthworking", "prob": 130 }, { "group": "tools_home", "prob": 130 }, { "group": "guns_rifle_common", "prob": 30 }, + { "group": "carried_guns_archery", "prob": 15 }, + { "group": "archery_mods", "prob": 5 }, { "group": "guns_shotgun_common", "prob": 15 }, { "group": "guns_pistol_common", "prob": 5 }, { "group": "gunmod_common", "prob": 5 } diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json index 1a0ba15af229..c9367164be9d 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json @@ -409,5 +409,63 @@ "//": "Used for when a gun can freely use either .410 shotshells or .45 Colt, for example bond_410.", "subtype": "distribution", "entries": [ { "group": "on_hand_454", "prob": 100 }, { "group": "on_hand_410_or_45colt", "prob": 50 } ] + }, + { + "id": "on_hand_arrows", + "type": "item_group", + "//": "A collection of arrows that would be found with a bow.", + "subtype": "distribution", + "entries": [ + { "item": "arrow_heavy_fire_hardened_fletched", "prob": 10, "charges": [ 5, 20 ] }, + { "item": "arrow_heavy_field_point_fletched", "prob": 10, "charges": [ 5, 20 ] }, + { "item": "arrow_metal_sharpened_fletched", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "arrow_fire_hardened_fletched", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "arrow_field_point_fletched", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "arrow_small_game_fletched", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "arrow_metal_target", "prob": 20, "charges": [ 5, 20 ] }, + { "item": "arrow_metal_bodkin", "prob": 20, "charges": [ 5, 20 ] }, + { "item": "arrow_wood_heavy", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "arrow_exploding", "prob": 5, "charges": [ 5, 20 ] }, + { "item": "arrow_plastic", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "arrow_metal", "prob": 20, "charges": [ 5, 20 ] }, + { "item": "arrow_wood", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "arrow_cf", "prob": 20, "charges": [ 5, 20 ] } + ] + }, + { + "id": "on_hand_bolts", + "type": "item_group", + "//": "A collection of bolts that would be found with a crossbow.", + "subtype": "distribution", + "entries": [ + { "item": "bolt_simple_small_game", "prob": 10, "charges": [ 5, 20 ] }, + { "item": "bolt_wood_small_game", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "bolt_steel_bodkin", "prob": 20, "charges": [ 5, 20 ] }, + { "item": "bolt_steel_target", "prob": 20, "charges": [ 5, 20 ] }, + { "item": "bolt_wood_bodkin", "prob": 20, "charges": [ 5, 20 ] }, + { "item": "bolt_simple_wood", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "bolt_explosive", "prob": 5, "charges": [ 5, 20 ] }, + { "item": "bolt_makeshift", "prob": 10, "charges": [ 5, 20 ] }, + { "item": "bolt_crude", "prob": 10, "charges": [ 5, 20 ] }, + { "item": "bolt_metal", "prob": 20, "charges": [ 5, 20 ] }, + { "item": "bolt_steel", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "bolt_wood", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "bolt_cf", "prob": 20, "charges": [ 5, 20 ] } + ] + }, + { + "id": "on_hand_pebbles", + "type": "item_group", + "//": "A collection of pebbles that would be found with a slingshot.", + "subtype": "distribution", + "entries": [ + { "item": "bearing", "prob": 30, "charges": [ 10, 30 ] }, + { "item": "pebble_clay", "prob": 15, "charges": [ 5, 20 ] }, + { "item": "marble", "prob": 25, "charges": [ 5, 20 ] }, + { "item": "metal_RPG_die", "prob": 5, "charges": [ 5, 20 ] }, + { "item": "pebble", "prob": 40, "charges": [ 5, 20 ] }, + { "item": "RPG_die", "prob": 5, "charges": [ 5, 20 ] }, + { "item": "sling_bullet_small", "prob": 15, "charges": [ 5, 20 ] } + ] } ] diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 5b7050abfe1a..efc260a4c000 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -404,6 +404,7 @@ { "item": "reading_light", "prob": 9 }, { "item": "balloon", "prob": 5 }, { "group": "ammo_common", "prob": 20 }, + { "group": "carried_guns_archery", "prob": 2 }, { "group": "guns_rifle_common", "prob": 2 }, { "group": "guns_pistol_common", "prob": 5 }, { "group": "guns_smg_common", "prob": 3 }, @@ -952,6 +953,7 @@ { "item": "reading_light", "prob": 8 }, { "item": "condom", "prob": 50, "count": [ 1, 5 ] }, { "group": "ammo_common", "prob": 20 }, + { "group": "carried_guns_archery", "prob": 2 }, { "group": "guns_rifle_common", "prob": 2 }, { "group": "guns_pistol_common", "prob": 5 }, { "group": "guns_smg_common", "prob": 3 }, diff --git a/data/json/mapgen/basement/basement_guns.json b/data/json/mapgen/basement/basement_guns.json index 27f53448761a..d9736c9845de 100644 --- a/data/json/mapgen/basement/basement_guns.json +++ b/data/json/mapgen/basement/basement_guns.json @@ -67,6 +67,7 @@ { "group": "ammo_rifle_reloaded", "x": 10, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, { "group": "ammo_rifle_common", "x": 11, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, { "group": "ammo_smg_common", "x": 12, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, + { "group": "archery_ammo", "x": 12, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, { "group": "ammo_pistol_common", "x": 13, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, { "group": "ammo_rifle_common", "x": 14, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, { "group": "ammo_pistol_common", "x": 15, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json index caaf45302860..eb9a1e0a90a0 100644 --- a/data/json/mapgen/nested/basement_nested.json +++ b/data/json/mapgen/nested/basement_nested.json @@ -1442,7 +1442,8 @@ { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "carried_guns_archery", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, @@ -1465,9 +1466,11 @@ { "item": "ammo_shotgun_common", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_reloaded", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ @@ -1517,7 +1520,8 @@ { "item": "guns_rifle_common", "chance": 60, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_rifle_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_pistol_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "carried_guns_archery", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, @@ -1540,9 +1544,11 @@ { "item": "ammo_shotgun_common", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_reloaded", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ @@ -1592,7 +1598,8 @@ { "item": "guns_rifle_common", "chance": 60, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_rifle_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_pistol_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "carried_guns_archery", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, @@ -1615,9 +1622,11 @@ { "item": "ammo_shotgun_common", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_reloaded", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ @@ -1666,7 +1675,8 @@ { "item": "guns_rifle_common", "chance": 60, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_rifle_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_pistol_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "carried_guns_archery", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, @@ -1689,9 +1699,11 @@ { "item": "ammo_shotgun_common", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_reloaded", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ @@ -3690,7 +3702,8 @@ { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "carried_guns_archery", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, @@ -3713,9 +3726,11 @@ { "item": "ammo_shotgun_common", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_reloaded", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ @@ -3780,7 +3795,8 @@ { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "carried_guns_archery", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, @@ -3803,9 +3819,11 @@ { "item": "ammo_shotgun_common", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_reloaded", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ @@ -3870,7 +3888,8 @@ { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "carried_guns_archery", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, @@ -3893,9 +3912,11 @@ { "item": "ammo_shotgun_common", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_reloaded", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ @@ -3960,7 +3981,8 @@ { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "carried_guns_archery", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, @@ -3983,9 +4005,11 @@ { "item": "ammo_shotgun_common", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_reloaded", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_common", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_rifle_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "archery_ammo", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ diff --git a/data/json/mapgen/store/s_hunting.json b/data/json/mapgen/store/s_hunting.json index 75f25c1a87dc..5269dca8f44e 100644 --- a/data/json/mapgen/store/s_hunting.json +++ b/data/json/mapgen/store/s_hunting.json @@ -61,7 +61,7 @@ "O": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ], "o": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ], "X": "f_safe_l", - "x": "f_safe_l", + "x": [ "f_gunsafe_ml", "f_gun_safe_el" ], "B": "f_bulletin", "^": "f_indoor_plant", "F": "f_filing_cabinet", @@ -80,8 +80,8 @@ "f": { "item": "fridgesnacks", "chance": 80, "repeat": [ 2, 3 ] }, "L": { "item": "jackets", "chance": 50 }, "F": { "item": "office_supplies", "chance": 80, "repeat": [ 2, 4 ] }, - "X": { "item": "ammo_rifle_common", "chance": 80, "repeat": [ 4, 6 ] }, - "x": { "item": "ammo_shotgun_common", "chance": 80, "repeat": [ 4, 6 ] }, + "X": { "item": "house_safe" }, + "x": { "item": "guns_safe" }, "Y": { "item": "trash_cart", "chance": 70, "repeat": [ 1, 2 ] }, "I": { "item": "office_supplies", "chance": 50 }, "m": { "item": "clothing_hunting", "chance": 80, "repeat": [ 2, 3 ] } diff --git a/data/json/monsterdrops/zombie_default.json b/data/json/monsterdrops/zombie_default.json index 5406725c2ece..34cef2408438 100644 --- a/data/json/monsterdrops/zombie_default.json +++ b/data/json/monsterdrops/zombie_default.json @@ -238,7 +238,6 @@ "type": "item_group", "subtype": "distribution", "id": "default_zombie_carried_guns", - "//": "Pistols and pistol ammo represent half the total weight. Ratio is 8:1:1 for common, rare, and improvised groups. Zombies won't spawn with loose ammo and no gun.", "entries": [ { "group": "carried_guns_pistol_common", "prob": 40 }, { "group": "guns_pistol_improvised", "prob": 5 }, @@ -251,7 +250,8 @@ { "group": "carried_guns_rifle_rare", "prob": 2 }, { "group": "carried_guns_smg_common", "prob": 8 }, { "group": "guns_smg_improvised", "prob": 1 }, - { "group": "carried_guns_smg_rare", "prob": 1 } + { "group": "carried_guns_smg_rare", "prob": 1 }, + { "group": "carried_guns_archery", "prob": 20 } ] }, {