From da596eabc195a2fff80ade77f7f36fdd7edf9de1 Mon Sep 17 00:00:00 2001 From: 0Monet <146018959+0Monet@users.noreply.github.com> Date: Tue, 20 Feb 2024 16:17:29 +0100 Subject: [PATCH] fix: remove root wall from survivor bunker (#4239) * Update ws_survivor_bunker.json * Update zombies.json * Update locations.json * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- .../Locations_MapExtras/locations.json | 92 +++++++++ data/json/mapgen/ws_survivor_bunker.json | 177 +++--------------- data/json/monstergroups/zombies.json | 11 ++ 3 files changed, 130 insertions(+), 150 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index ca17cd0cefe6..e2af9431db4b 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -2635,5 +2635,97 @@ { "item": "chem_black_powder", "charges": [ 100, 2500 ], "container-item": "wooden_barrel_small", "prob": 50 }, { "item": "4570_low", "charges": [ 1, 240 ], "prob": 50 } ] + }, + { + "type": "item_group", + "id": "oa_ig_sb_food", + "items": [ + { "item": "veggy_pickled", "prob": 30, "charges": 2, "container-item": "jar_glass_sealed" }, + { "item": "fish_pickled", "prob": 26, "charges": 2, "container-item": "jar_glass_sealed" }, + { "item": "meat_pickled", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" }, + [ "dry_meat", 20 ], + [ "dry_veggy", 20 ], + [ "carrot", 20 ], + [ "water_clean", 80 ], + [ "water_mineral", 5 ], + [ "cola", 70 ], + [ "creamsoda", 60 ], + [ "lemonlime", 60 ], + [ "orangesoda", 60 ], + [ "crispycran", 40 ], + [ "colamdew", 60 ], + [ "choc_drink", 30 ], + [ "jerky", 55 ], + [ "salted_fish", 35 ], + [ "porkstick", 55 ], + [ "cheese_hard", 15 ], + [ "can_beans", 40 ], + [ "can_corn", 35 ], + [ "can_spam", 30 ], + [ "salt", 10 ], + [ "seasoning_salt", 5 ], + [ "jar_sauerkraut_pickled", 20 ], + [ "lutefisk", 20 ], + [ "pemmican", 20 ] + ] + }, + { + "type": "item_group", + "id": "oa_ig_sb_equipment", + "items": [ + [ "flask_hip", 20 ], + [ "shortbow", 20 ], + [ "arrow_wood_heavy", 20 ], + [ "arrow_fire_hardened_fletched", 20 ], + [ "quiver_birchbark", 30 ], + [ "fire_drill", 30 ], + [ "lighter", 30 ], + [ "matches", 30 ], + [ "sunglasses", 30 ], + [ "fitover_sunglasses", 20 ], + [ "ax", 10 ], + [ "saw", 10 ], + [ "backpack", 30 ], + [ "backpack_leather", 30 ], + [ "quiver", 20 ], + [ "canteen", 20 ], + [ "knife_hunting", 30 ], + [ "shovel", 30 ], + { "group": "ammo_pocket_batteries_full", "prob": 30 } + ] + }, + { + "type": "item_group", + "id": "oa_ig_sb_rare", + "items": [ + { "item": "gasoline", "prob": 5, "charges-min": 450, "charges-max": 2000, "container-item": "jug_plastic" }, + { "item": "gasoline", "prob": 5, "charges-min": 450, "charges-max": 4000, "container-item": "jerrycan" }, + { "item": "gasoline", "prob": 5, "charges-min": 450, "charges-max": 10000, "container-item": "jerrycan_big" }, + [ "gasoline_lantern", 15 ], + [ "electric_lantern", 15 ], + [ "oil_lamp", 15 ], + [ "lamp_oil", 15 ], + [ "compbow", 20 ], + [ "binoculars", 20 ], + [ "ref_lighter", 30 ], + [ "e_tool", 30 ], + [ "jackhammer", 5 ], + [ "elec_jackhammer", 5 ] + ] + }, + { + "type": "item_group", + "id": "oa_ig_sb_books", + "items": [ [ "book_archery", 20 ] ] + }, + { + "type": "item_group", + "id": "oa_ig_sb_wood", + "items": [ [ "2x4", 20 ], [ "stick", 20 ], [ "pointy_stick", 10 ], [ "log", 20 ] ] + }, + { + "type": "item_group", + "id": "oa_ig_sb_water", + "items": [ { "item": "water", "prob": 30, "charges-min": 0, "charges-max": 200, "container-item": "keg" } ] } ] diff --git a/data/json/mapgen/ws_survivor_bunker.json b/data/json/mapgen/ws_survivor_bunker.json index 2b98acf48e84..2230051d7e18 100644 --- a/data/json/mapgen/ws_survivor_bunker.json +++ b/data/json/mapgen/ws_survivor_bunker.json @@ -1,107 +1,4 @@ [ - { - "type": "monstergroup", - "name": "GROUP_ZOMBIE_BUNKER", - "default": "mon_zombie_survivor", - "monsters": [ - { "monster": "mon_zombie_survivor", "freq": 250, "cost_multiplier": 0 }, - { "monster": "mon_zombie_child", "freq": 100, "cost_multiplier": 0 }, - { "monster": "mon_zombie_dog", "freq": 150, "cost_multiplier": 0 }, - { "monster": "mon_dog_zombie_rot", "freq": 150, "cost_multiplier": 0 } - ] - }, - { - "type": "item_group", - "id": "oa_ig_sb_food", - "items": [ - { "item": "veggy_pickled", "prob": 30, "charges": 2, "container-item": "jar_glass_sealed" }, - { "item": "fish_pickled", "prob": 26, "charges": 2, "container-item": "jar_glass_sealed" }, - { "item": "meat_pickled", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" }, - [ "dry_meat", 20 ], - [ "dry_veggy", 20 ], - [ "carrot", 20 ], - [ "water_clean", 80 ], - [ "water_mineral", 5 ], - [ "cola", 70 ], - [ "creamsoda", 60 ], - [ "lemonlime", 60 ], - [ "orangesoda", 60 ], - [ "crispycran", 40 ], - [ "colamdew", 60 ], - [ "choc_drink", 30 ], - [ "jerky", 55 ], - [ "salted_fish", 35 ], - [ "porkstick", 55 ], - [ "cheese_hard", 15 ], - [ "can_beans", 40 ], - [ "can_corn", 35 ], - [ "can_spam", 30 ], - [ "salt", 10 ], - [ "seasoning_salt", 5 ], - [ "jar_sauerkraut_pickled", 20 ], - [ "lutefisk", 20 ], - [ "pemmican", 20 ] - ] - }, - { - "type": "item_group", - "id": "oa_ig_sb_equipment", - "items": [ - [ "flask_hip", 20 ], - [ "shortbow", 20 ], - [ "arrow_wood_heavy", 20 ], - [ "arrow_fire_hardened_fletched", 20 ], - [ "quiver_birchbark", 30 ], - [ "fire_drill", 30 ], - [ "lighter", 30 ], - [ "matches", 30 ], - [ "sunglasses", 30 ], - [ "fitover_sunglasses", 20 ], - [ "ax", 10 ], - [ "saw", 10 ], - [ "backpack", 30 ], - [ "backpack_leather", 30 ], - [ "quiver", 20 ], - [ "canteen", 20 ], - [ "knife_hunting", 30 ], - [ "shovel", 30 ], - { "group": "ammo_pocket_batteries_full", "prob": 30 } - ] - }, - { - "type": "item_group", - "id": "oa_ig_sb_rare", - "items": [ - { "item": "gasoline", "prob": 5, "charges-min": 450, "charges-max": 2000, "container-item": "jug_plastic" }, - { "item": "gasoline", "prob": 5, "charges-min": 450, "charges-max": 4000, "container-item": "jerrycan" }, - { "item": "gasoline", "prob": 5, "charges-min": 450, "charges-max": 10000, "container-item": "jerrycan_big" }, - [ "gasoline_lantern", 15 ], - [ "electric_lantern", 15 ], - [ "oil_lamp", 15 ], - [ "lamp_oil", 15 ], - [ "compbow", 20 ], - [ "binoculars", 20 ], - [ "ref_lighter", 30 ], - [ "e_tool", 30 ], - [ "jackhammer", 5 ], - [ "elec_jackhammer", 5 ] - ] - }, - { - "type": "item_group", - "id": "oa_ig_sb_books", - "items": [ [ "book_archery", 20 ] ] - }, - { - "type": "item_group", - "id": "oa_ig_sb_wood", - "items": [ [ "2x4", 20 ], [ "stick", 20 ], [ "pointy_stick", 10 ], [ "log", 20 ] ] - }, - { - "type": "item_group", - "id": "oa_ig_sb_water", - "items": [ { "item": "water", "prob": 30, "charges-min": 0, "charges-max": 200, "container-item": "keg" } ] - }, { "type": "mapgen", "method": "json", @@ -137,7 +34,6 @@ "terrain": { ".": "t_grass", ",": "t_dirt", - "O": "t_pit_shallow", "T": "t_tree", "Y": "t_tree_young", "b": "t_underbrush", @@ -155,53 +51,34 @@ "om_terrain": [ "ws_survivor_bunker_f-1" ], "weight": 1000, "object": { + "fill_ter": "t_rock_floor", "rows": [ - "####R#####R########RRR##", - "###RRR#########R####R###", - "########RRR#r##R########", - "####R####R#rrrRRR###R###", - "##RRR####Rrr