From 5108349d195f8dfbed0bfb6b6656695709171a55 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 4 Mar 2021 00:44:54 -0600 Subject: [PATCH] Hunting lodge Location (#44378) --- data/json/itemgroups/SUS/lodge.json | 80 ++++++ data/json/mapgen/hunting_lodge.json | 180 ++++++++++++++ data/json/mapgen/nested/lodge_nested.json | 228 +++++++++++++++++ data/json/mapgen_palettes/lodge_palette.json | 235 ++++++++++++++++++ .../overmap/overmap_special/specials.json | 18 ++ .../overmap_terrain/overmap_terrain.json | 28 +++ data/json/scenarios.json | 3 + data/json/start_locations.json | 6 + 8 files changed, 778 insertions(+) create mode 100644 data/json/itemgroups/SUS/lodge.json create mode 100644 data/json/mapgen/hunting_lodge.json create mode 100644 data/json/mapgen/nested/lodge_nested.json create mode 100644 data/json/mapgen_palettes/lodge_palette.json diff --git a/data/json/itemgroups/SUS/lodge.json b/data/json/itemgroups/SUS/lodge.json new file mode 100644 index 0000000000000..d3e03875adf68 --- /dev/null +++ b/data/json/itemgroups/SUS/lodge.json @@ -0,0 +1,80 @@ +[ + { + "id": "SUS_hunting_archery", + "type": "item_group", + "//": "items found in an archery space", + "subtype": "collection", + "entries": [ + { "item": "compbow", "prob": 50 }, + { "item": "compbow_high", "prob": 20 }, + { "item": "compbow_low", "prob": 40 }, + { "item": "recurbow", "prob": 30 }, + { "item": "reflexrecurvebow", "prob": 10 } + ] + }, + { + "id": "SUS_hunting_rifle", + "type": "item_group", + "//": "items found in a rifle hunting space", + "subtype": "collection", + "entries": [ + { "item": "ar15", "prob": 150, "charges-min": 0, "charges-max": 30 }, + { "item": "marlin_9a", "prob": 20, "charges-min": 0, "charges-max": 19 }, + { "item": "remington700_270", "prob": 10, "charges-min": 0, "charges-max": 4 }, + { "item": "remington_700", "prob": 40, "charges-min": 0, "charges-max": 4 }, + { "item": "ruger_1022", "prob": 70, "charges-min": 0, "charges-max": 10 }, + { "item": "ruger_mini", "prob": 10, "charges-min": 0, "charges-max": 5 }, + { "item": "win70", "prob": 20, "charges-min": 0, "charges-max": 3 }, + { "item": "colt_lightning", "prob": 2, "charges-min": 0, "charges-max": 10 }, + { "item": "henry_big_boy", "prob": 2, "charges-min": 0, "charges-max": 10 }, + { "item": "weatherby_5", "prob": 2, "charges-min": 0, "charges-max": 3 } + ] + }, + { + "id": "hunting_lodge_weapons", + "type": "item_group", + "//": "items found in a shotgun hunting space", + "subtype": "distribution", + "entries": [ + { "group": "guns_shotgun_common", "prob": 30 }, + { "group": "SUS_hunting_rifle", "prob": 20 }, + { "group": "SUS_hunting_archery", "prob": 15 } + ] + }, + { + "id": "cannibal_weapons", + "type": "item_group", + "//": "items found in a most dangerous game space", + "subtype": "distribution", + "entries": [ + { "group": "guns_shotgun_common", "prob": 30 }, + { "group": "SUS_hunting_rifle", "prob": 20 }, + { "group": "guns_smg_rare", "prob": 15 } + ] + }, + { + "id": "lodge_archery_ammo", + "type": "item_group", + "//": "archery ammo", + "subtype": "collection", + "entries": [ + { "item": "arrow_metal", "prob": 20 }, + { "item": "arrow_metal_bodkin", "prob": 20 }, + { "item": "arrow_metal_target", "prob": 30 }, + { "item": "arrow_cf", "prob": 10 } + ] + }, + { + "id": "cannibal_food", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "machete", "prob": 20 }, + { "group": "preserved_food", "custom-flags": [ "CANNIBALISM" ], "prob": 30 }, + { "group": "preserved_food", "prob": 20 }, + { "group": "dry_goods", "prob": 30 }, + { "group": "dry_goods", "custom-flags": [ "CANNIBALISM" ], "prob": 60 }, + { "group": "pantry", "prob": 10 } + ] + } +] diff --git a/data/json/mapgen/hunting_lodge.json b/data/json/mapgen/hunting_lodge.json new file mode 100644 index 0000000000000..c675c04bebdcd --- /dev/null +++ b/data/json/mapgen/hunting_lodge.json @@ -0,0 +1,180 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "lodge_ground1", "lodge_ground2" ] ], + "weight": 100, + "object": { + "fill_ter": "t_floor", + "rows": [ + ".%##W###W###W###W###+##W#################%......", + ".*#c B#c B#B c#B c# #h s# >#*......", + ".*Wd B#d B#B d#B d# #h T# W*......", + ".*##=###=###=###=## ##=## #*......", + ".*# #*......", + ".*W W*......", + ".*# YY YY AAAAAAAA a OOO >#*......", + ".%########+######################## ###%......", + ".*********G~~~~~~~~~~~~~~~~~~~~~~%# #***......", + "~~~~~~~~~~G~~~~~~~~~~~*############ #*........", + "oooooooooooooooo~~~~~~*w #%........", + "oooooooooooooooo~~~~~~*#Y w*........", + "ooooooooooooooooGGGGGGG+ ttttt bw*........", + "ooooooooooooooooGGGGGGG+ ttttt bw*........", + "oooooooooooooooo~~~~~G*#Y w*........", + "oooooooooooooooo~~~~~G*w w*........", + "~~~~~~~~~~~~~~~~~~~~~G*##### ########*........", + "~~~~~~~~~~~~~~~~~~~~~G***#<# #********........", + "~~~~~~~~~~~~~~~~%~~~~GGGG+ # #%****...........", + "......*###-###-###-######### #####*...........", + ".....0*#UU URU URU URU #12C 5 F#*...........", + ".....0*#R z C uW*...........", + ".....0*#UU URU URU URU #3CC& 4CVuF#*...........", + "......%###-###-###-##########+######%..........." + ], + "palettes": [ "lodge_palette" ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": 29, "y": 4 } ], + "place_nested": [ + { + "chunks": [ [ "lodge_pantry_15x15", 80 ], [ "lodge_cannibal_15x15", 20 ], [ "lodge_hunting_15x15", 50 ] ], + "x": 8, + "y": 9 + } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "lodge_2ndfloor1", "lodge_2ndfloor2" ] ], + "weight": 100, + "object": { + "fill_ter": "t_floor", + "rows": [ + " ##W###W###W###W###w##W################# ", + " # <# ", + " W W ", + " # # ", + " # # ", + " W W ", + " # <# ", + " ########w#######wwww#############www### ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "lodge_2ndfloor_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "lodge_basement_residential1", "lodge_basement_residential2" ] ], + "weight": 100, + "object": { + "fill_ter": "t_rock", + "rows": [ + " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", + " % % ", + " % % ", + " % % ", + " % % ", + " % % ", + " % % ", + " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% ", + " % % ", + " %%%%%%%%%%%%%% % ", + " % BB% ", + " % % ", + " % % ", + " % % ", + " % % ", + " % % ", + " %%%%% %%%%%%%% ", + " %<| % ", + " % + % ", + " %%%%%%% ", + " ", + " ", + " ", + " " + ], + "palettes": [ "basement_residential" ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": 7, "y": 4 } ], + "place_nested": [ + { "chunks": [ [ "lodge_game_6x6", 80 ], [ "lodge_dungeon_6x6", 20 ], [ "lodge_drug_6x6", 50 ] ], "x": 2, "y": 1 }, + { "chunks": [ [ "5x5_sauna_W", 30 ], [ "5x5_pool", 10 ], [ "5x5_gym_W", 60 ] ], "x": 24, "y": 1 }, + { + "chunks": [ [ "room_6x6_woodworker", 5 ], [ "room_6x6_bike", 15 ], [ "room_6x6_office_E", 5 ] ], + "x": 24, + "y": 10 + } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "lodge_basement_laboratory_entrance" ], + "//": "doesn't work rebuild later", + "object": { + "fill_ter": "t_rock", + "rotation": [ 0, 3 ], + "rows": [ + "##--------------------##", + "##| |>>| |##", + "##| |MM| |##", + "##| |..| |##", + "##| |..| |##", + "##| |..| |##", + "##| |..| |##", + "##| |..| |##", + "##|---+---|..|---+---|##", + "##|.......M..M.......|##", + "##|.......M..M.......|##", + "|----+----|..|----+----|", + "|.........|..|d.......d|", + "|.ccccccc.|..|xh..h..hx|", + "|.........|7.|d..dxd..d|", + "|---------|..|---------|", + "########--|LL6--########", + "########=,,,,,,=########", + "########=,,,,,,=########", + "########=,,,,,,=########", + "########===WW===########", + "##########=,,=##########", + "##########=<<=##########", + "##########====##########" + ], + "palettes": [ "lab_palette" ], + "terrain": { + "=": "t_wall", + ",": "t_rock_floor", + "6": "t_card_science", + "7": "t_rock_floor", + "<": "t_stairs_up", + ">": "t_stairs_down" + }, + "furniture": { "C": "f_centrifuge" }, + "mapping": { "c": { "items": { "item": "chem_lab", "chance": 30 } }, "d": { "items": { "item": "office", "chance": 30 } } }, + "monster": { "7": { "monster": "mon_turret_rifle" } }, + "place_nested": [ + { "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 3, "y": 1 }, + { "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 14, "y": 1 } + ] + } + } +] diff --git a/data/json/mapgen/nested/lodge_nested.json b/data/json/mapgen/nested/lodge_nested.json new file mode 100644 index 0000000000000..7f89e90c344b3 --- /dev/null +++ b/data/json/mapgen/nested/lodge_nested.json @@ -0,0 +1,228 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lodge_cannibal_15x15", + "object": { + "mapgensize": [ 15, 15 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "DF ARF LRL ORa ", + "R ", + "SF DRA LRa ORO ", + "DF ARF LRL LRa ", + "R ", + "SF DRA LRa LRL ", + " " + ], + "palettes": [ "lodge_items" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lodge_hunting_15x15", + "object": { + "mapgensize": [ 15, 15 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "DF ARF BRB BRa ", + "R ", + "SF DRA BRa BRB ", + " " + ], + "palettes": [ "lodge_items" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lodge_pantry_15x15", + "object": { + "mapgensize": [ 15, 15 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "SS SRa SRS SRS ", + "R ", + "SS SRA BRB SRS ", + " " + ], + "palettes": [ "lodge_items" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lodge_game_6x6", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "E CC T", + " ", + " BB ", + " BB ", + " BB ", + "E T" + ], + "terrain": { + ".": "t_floor", + "B": "t_floor", + "C": "t_floor", + "y": "t_floor", + "T": "t_floor", + "E": "t_floor", + " ": "t_carpet_red", + "h": "t_carpet_red", + "A": "t_carpet_red", + "d": "t_carpet_red", + "f": "t_carpet_red", + "O": "t_carpet_red", + "=": "t_carpet_red" + }, + "furniture": { "A": "f_stool", "B": "f_table", "E": "f_armchair", "C": "f_bookcase", "T": "f_floor_lamp" }, + "items": { "C": [ { "item": "games", "chance": 80, "repeat": [ 3, 6 ] } ] } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lodge_dungeon_6x6", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " tc td", + " t t ", + " tttt ", + " ", + " h ", + "C T" + ], + "terrain": { + ".": "t_floor", + "B": "t_floor", + "C": "t_floor", + "c": "t_floor", + "y": "t_floor", + "T": "t_floor", + "t": "t_reb_cage", + "E": "t_floor", + " ": "t_carpet_red", + "h": "t_carpet_red", + "A": "t_carpet_red", + "d": "t_carpet_red", + "f": "t_carpet_red", + "O": "t_carpet_red", + "=": "t_carpet_red" + }, + "furniture": { + "A": "f_stool", + "B": "f_workbench", + "E": "f_armchair", + "C": "f_rack_wood", + "T": "f_floor_lamp", + "d": "f_mannequin", + "b": "f_bench", + "f": "f_table", + "h": "f_butcher_rack", + "y": [ "f_indoor_plant_y", "f_indoor_plant" ] + }, + "items": { + "C": [ + { "item": "SUS_tailoring_materials", "chance": 80, "repeat": [ 3, 6 ] }, + { "item": "leather_shop_repair", "chance": 40, "repeat": [ 2, 4 ] }, + { "item": "bullwhip", "chance": 100 } + ], + "c": [ + { "item": "bone", "chance": 80, "repeat": [ 4, 8 ] }, + { "item": "pants", "chance": 100 }, + { "item": "shirts", "chance": 100 }, + { "item": "leather_shop_accessories", "chance": 10 } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lodge_drug_6x6", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "E CC T", + " ", + " BB ", + " BB ", + " BB ", + "E T" + ], + "terrain": { + ".": "t_floor", + "B": "t_floor", + "C": "t_floor", + "y": "t_floor", + "T": "t_floor", + "E": "t_floor", + " ": "t_carpet_red", + "h": "t_carpet_red", + "A": "t_carpet_red", + "d": "t_carpet_red", + "f": "t_carpet_red", + "O": "t_carpet_red", + "=": "t_carpet_red" + }, + "furniture": { + "A": "f_stool", + "B": "f_workbench", + "E": "f_armchair", + "C": "f_rack_wood", + "T": "f_floor_lamp", + "d": "f_mannequin", + "b": "f_bench", + "f": "f_table", + "h": "f_chair", + "y": [ "f_indoor_plant_y", "f_indoor_plant" ] + }, + "items": { + "C": [ + { "item": "straw_doll", "chance": 80, "repeat": [ 6, 14 ] }, + { "item": "bag_body_bag", "chance": 40, "repeat": [ 2, 4 ] } + ], + "B": [ + { "item": "coke", "chance": 60, "repeat": [ 13, 126 ] }, + { "item": "funnel", "chance": 60, "repeat": [ 0, 1 ] }, + { "item": "plastic_bag", "chance": 90, "repeat": [ 20, 60 ] } + ] + } + } + } +] diff --git a/data/json/mapgen_palettes/lodge_palette.json b/data/json/mapgen_palettes/lodge_palette.json new file mode 100644 index 0000000000000..dd7b0b86e68a3 --- /dev/null +++ b/data/json/mapgen_palettes/lodge_palette.json @@ -0,0 +1,235 @@ +[ + { + "type": "palette", + "id": "lodge_palette", + "terrain": { + "#": "t_rock_wall", + "+": [ [ "t_door_c", 3 ], "t_door_locked" ], + "=": "t_door_c", + "z": "t_door_metal_locked", + ".": [ [ "t_region_groundcover", 4 ], "t_region_groundcover_forest" ], + "~": [ [ "t_region_groundcover_barren", 3 ], "t_region_groundcover" ], + "*": [ [ "t_region_groundcover", 15 ], "t_region_shrub" ], + "G": "t_sidewalk", + "o": "t_pavement", + "P": "t_water_pump", + "R": "t_floor", + "r": "t_floor", + "S": "t_floor", + "-": "t_window_bars_curtains", + "w": "t_double_pane_glass_with_curtain_open_window_closed", + "W": [ [ "t_double_pane_glass_with_curtain", 2 ], "t_double_pane_glass_with_curtain_open_window_closed" ], + "%": "t_gutter_downspout", + "q": "t_swater_sh", + "Q": "t_water_dp", + "H": "t_chickenwire_gate_c", + "I": "t_chickenwire_fence", + "<": "t_wood_stairs_down", + ">": "t_wood_stairs_up" + }, + "furniture": { + "a": "f_armchair", + "A": "f_bookcase", + "b": "f_bench", + "B": "f_bed", + "C": "f_counter", + "c": "f_chair", + "d": "f_desk", + "D": "f_dresser", + "F": "f_fridge", + "h": "f_bathtub", + "l": "f_stool", + "L": "f_locker", + "O": "f_sofa", + "R": [ "f_rack", "f_utility_shelf" ], + "S": "f_woodstove", + "s": "f_sink", + "t": "f_table", + "T": "f_toilet", + "U": "f_utility_shelf", + "V": "f_oven", + "u": "f_cupboard", + "Y": "f_rack_coat", + "Z": "f_fireplace", + "y": [ "f_indoor_plant_y", "f_indoor_plant" ], + "1": "f_cupboard", + "2": "f_cupboard", + "3": "f_cupboard", + "4": "f_cupboard", + "5": "f_sink", + "&": "f_trashcan", + "0": "f_standing_tank" + }, + "liquids": { "0": { "liquid": "water_clean", "amount": [ 10, 900 ] } }, + "items": { + "a": { "item": "livingroom", "chance": 20 }, + "A": [ + { "item": "homebooks", "chance": 60, "repeat": [ 1, 3 ] }, + { "item": "magazines", "chance": 60, "repeat": [ 1, 8 ] }, + { "item": "manuals", "chance": 30 } + ], + "B": { "item": "bed", "chance": 60 }, + "d": [ { "item": "livingroom", "chance": 40 }, { "item": "office", "chance": 40 } ], + "D": [ + { "item": "SUS_dresser_mens", "chance": 50, "repeat": [ 1, 4 ] }, + { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 4 ] } + ], + "F": { "item": "SUS_fridge", "chance": 35 }, + "h": { "item": "shower", "chance": 20 }, + "L": [ + { "item": "tools_earthworking", "chance": 30, "repeat": [ 1, 4 ] }, + { "item": "tools_home", "chance": 30, "repeat": [ 1, 4 ] } + ], + "O": { "item": "livingroom", "chance": 20 }, + "S": { "item": "stash_wood", "chance": 60, "repeat": [ 2, 4 ] }, + "&": { "item": "trash", "chance": 20 }, + "R": [ + { "item": "camping", "chance": 50 }, + { "item": "gear_survival", "chance": 30 }, + { "item": "cannedfood", "chance": 50 }, + { "item": "stash_food", "chance": 50 } + ], + "s": { "item": "SUS_bathroom_sink", "chance": 60 }, + "t": { "item": "dining", "chance": 30, "repeat": [ 1, 2 ] }, + "U": { "item": "camping", "chance": 30, "repeat": [ 1, 4 ] }, + "u": { "item": "SUS_pantry", "chance": 50 }, + "V": { "item": "SUS_oven", "chance": 70 }, + "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] }, + "1": [ { "item": "SUS_dishes", "chance": 35 }, { "item": "SUS_silverware", "chance": 35 } ], + "2": { "item": "SUS_cookware", "chance": 35 }, + "3": [ { "item": "SUS_utensils", "chance": 35 }, { "item": "SUS_knife_drawer", "chance": 35 } ], + "4": [ { "item": "SUS_junk_drawer", "chance": 35 }, { "item": "SUS_spice_collection", "chance": 35 } ], + "5": { "item": "SUS_kitchen_sink", "chance": 35 } + }, + "toilets": { "T": { } } + }, + { + "type": "palette", + "id": "lodge_2ndfloor_palette", + "terrain": { + "#": "t_rock_wall", + "+": [ [ "t_door_c", 3 ], "t_door_locked" ], + "=": "t_door_c", + " ": "t_open_air", + ".": "t_gutter_north", + "~": "t_gutter_south", + "*": "t_gutter_east", + "R": "t_floor", + "p": "t_floor", + "r": "t_rock_floor", + "S": "t_rock_floor", + "-": "t_window_bars_curtains", + "w": "t_double_pane_glass_with_curtain_open_window_closed", + "W": [ [ "t_double_pane_glass_with_curtain", 2 ], "t_double_pane_glass_with_curtain_open_window_closed" ], + "%": "t_gutter_downspout", + "q": "t_swater_sh", + "Q": "t_water_dp", + "H": "t_chickenwire_gate_c", + "I": "t_chickenwire_fence", + "<": "t_wood_stairs_down", + ">": "t_wood_stairs_up" + }, + "furniture": { + "a": "f_armchair", + "A": "f_bookcase", + "b": "f_bench", + "B": "f_bed", + "C": "f_counter", + "c": "f_chair", + "d": "f_desk", + "D": "f_dresser", + "F": "f_fridge", + "h": "f_bathtub", + "l": "f_stool", + "L": "f_locker", + "O": "f_sofa", + "p": "f_pool_table", + "R": [ "f_rack", "f_utility_shelf" ], + "S": "f_woodstove", + "s": "f_sink", + "t": "f_table", + "T": "f_toilet", + "Y": "f_rack_coat", + "Z": "f_fireplace", + "y": [ "f_indoor_plant_y", "f_indoor_plant" ], + "5": "f_sink", + "&": "f_trashcan" + }, + "liquids": { "0": { "liquid": "water_clean", "amount": [ 10, 900 ] } }, + "items": { + "a": { "item": "livingroom", "chance": 20 }, + "A": [ + { "item": "homebooks", "chance": 60, "repeat": [ 1, 3 ] }, + { "item": "magazines", "chance": 60, "repeat": [ 1, 8 ] }, + { "item": "manuals", "chance": 30 } + ], + "B": { "item": "bed", "chance": 60 }, + "d": [ { "item": "livingroom", "chance": 40 }, { "item": "office", "chance": 40 } ], + "D": [ + { "item": "SUS_dresser_mens", "chance": 50, "repeat": [ 1, 4 ] }, + { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 4 ] } + ], + "F": { "item": "SUS_fridge", "chance": 35 }, + "h": { "item": "shower", "chance": 20 }, + "L": [ + { "item": "tools_earthworking", "chance": 30, "repeat": [ 1, 4 ] }, + { "item": "tools_home", "chance": 30, "repeat": [ 1, 4 ] } + ], + "O": { "item": "livingroom", "chance": 20 }, + "S": { "item": "stash_wood", "chance": 60, "repeat": [ 2, 4 ] }, + "&": { "item": "trash", "chance": 20 }, + "R": [ + { "item": "camping", "chance": 50 }, + { "item": "gear_survival", "chance": 30 }, + { "item": "cannedfood", "chance": 50 }, + { "item": "stash_food", "chance": 50 } + ], + "s": { "item": "SUS_bathroom_sink", "chance": 60 }, + "t": { "item": "dining", "chance": 30, "repeat": [ 1, 2 ] }, + "U": { "item": "camping", "chance": 30, "repeat": [ 1, 4 ] }, + "u": { "item": "SUS_pantry", "chance": 50 }, + "V": { "item": "SUS_oven", "chance": 70 }, + "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] }, + "1": [ { "item": "SUS_dishes", "chance": 35 }, { "item": "SUS_silverware", "chance": 35 } ], + "2": { "item": "SUS_cookware", "chance": 35 }, + "3": [ { "item": "SUS_utensils", "chance": 35 }, { "item": "SUS_knife_drawer", "chance": 35 } ], + "4": [ { "item": "SUS_junk_drawer", "chance": 35 }, { "item": "SUS_spice_collection", "chance": 35 } ], + "5": { "item": "SUS_kitchen_sink", "chance": 35 } + }, + "toilets": { "T": { } } + }, + { + "type": "palette", + "id": "lodge_items", + "terrain": { + "a": "t_floor", + "A": "t_floor", + "B": "t_floor", + "D": "t_floor", + "F": "t_floor", + "h": "t_floor", + "L": "t_floor", + "O": "t_floor", + "S": "t_floor", + "&": "t_floor", + "R": "t_floor" + }, + "items": { + "a": { "item": "clothing_hunting", "chance": 20, "repeat": [ 1, 6 ] }, + "A": { "item": "tools_hunting", "chance": 60, "repeat": [ 1, 8 ] }, + "B": { "item": "tools_hunting", "chance": 60 }, + "D": { "item": "hunting_lodge_weapons" }, + "F": { "item": "lodge_archery_ammo", "chance": 30, "repeat": [ 1, 4 ] }, + "h": { "item": "cannibal_weapons", "repeat": [ 1, 4 ] }, + "L": { "item": "cannibal_food", "repeat": [ 1, 4 ] }, + "S": { "item": "stash_wood", "chance": 60, "repeat": [ 2, 4 ] }, + "&": { "item": "trash", "chance": 20 }, + "R": [ + { "item": "camping", "chance": 50 }, + { "item": "gear_survival", "chance": 30 }, + { "item": "cannedfood", "chance": 50, "repeat": [ 3, 8 ] }, + { "item": "stash_food", "chance": 50, "repeat": [ 3, 8 ] } + ] + } + } +] diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 97ce382dbeead..74b1cbf2ccb80 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -249,6 +249,24 @@ "occurrences": [ 0, 2 ], "flags": [ "CLASSIC", "WILDERNESS" ] }, + { + "type": "overmap_special", + "id": "Hunting Lodge", + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "lodge_ground1_north" }, + { "point": [ 1, 0, 0 ], "overmap": "lodge_ground2_north" }, + { "point": [ 0, 0, 1 ], "overmap": "lodge_2ndfloor1_north" }, + { "point": [ 1, 0, 1 ], "overmap": "lodge_2ndfloor2_north" }, + { "point": [ 0, 0, -1 ], "overmap": "lodge_basement_residential1_north" }, + { "point": [ 1, 0, -1 ], "overmap": "lodge_basement_residential2_north" } + ], + "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road", "existing": true } ], + "locations": [ "land", "swamp" ], + "city_distance": [ 15, -1 ], + "city_sizes": [ 1, 8 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC", "WILDERNESS" ] + }, { "type": "overmap_special", "id": "Gas Station", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index 8fc28084fd9c0..171b70dada0cf 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -219,6 +219,34 @@ "see_cost": 5, "extras": "build" }, + { + "type": "overmap_terrain", + "id": [ "lodge_ground1", "lodge_ground2" ], + "name": "hunting lodge", + "sym": "L", + "copy-from": "generic_forest", + "color": "light_green", + "see_cost": 4, + "extend": { "flags": [ "SOURCE_GUN", "SOURCE_AMMO" ] } + }, + { + "type": "overmap_terrain", + "id": [ "lodge_2ndfloor1", "lodge_2ndfloor2" ], + "name": "second floor hunting lodge", + "copy-from": "generic_forest", + "sym": "L", + "see_cost": 4, + "color": "light_green" + }, + { + "type": "overmap_terrain", + "id": [ "lodge_basement_residential1", "lodge_basement_residential2", "lodge_basement_laboratory_entrance" ], + "name": "hunting lodge basement", + "copy-from": "generic_forest", + "sym": "L", + "see_cost": 4, + "color": "light_green" + }, { "type": "overmap_terrain", "id": "dirtroad1_aban1", diff --git a/data/json/scenarios.json b/data/json/scenarios.json index 6ed1b7a5e5e9d..4e463a02f6a79 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -102,6 +102,7 @@ "sloc_horse_ranch", "sloc_lighthouse_ground", "sloc_cabin_lake", + "sloc_lodge_ground", "sloc_freshwater_research_station" ], "start_name": "Safe Building", @@ -303,6 +304,7 @@ "sloc_hermit_shack", "sloc_farm_survivalist", "sloc_campsite", + "sloc_lodge_ground", "sloc_campground" ], "start_name": "Outside Town", @@ -321,6 +323,7 @@ "sloc_field", "sloc_forest", "sloc_cabin", + "sloc_lodge_ground", "sloc_hermit_shack", "sloc_farm_survivalist", "sloc_campsite", diff --git a/data/json/start_locations.json b/data/json/start_locations.json index 42acaee5c02f9..afaa043c83535 100644 --- a/data/json/start_locations.json +++ b/data/json/start_locations.json @@ -463,6 +463,12 @@ "name": "Freshwater Research Station", "terrain": [ "sealab_small_surface" ] }, + { + "type": "start_location", + "id": "sloc_lodge_ground", + "name": "Hunting Lodge", + "terrain": [ "lodge_ground" ] + }, { "type": "start_location", "id": "sloc_gas_station",