From 7537c89a673bf1dfc8b5b44f2a7c85a327607094 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 4 May 2019 13:16:12 -0400 Subject: [PATCH] Add 2 church roofs also adds 4 new nested chunks --- data/json/mapgen/church.json | 376 ++++++++++++++++-- .../mapgen/nested/nested_chunks_roof.json | 101 +++++ data/json/mapgen_palettes/church.json | 7 +- data/json/mapgen_palettes/roof_palette.json | 4 + .../overmap/multitile_city_buildings.json | 25 ++ .../overmap_terrain_public_institutional.json | 64 +++ data/json/regional_map_settings.json | 1 + 7 files changed, 546 insertions(+), 32 deletions(-) diff --git a/data/json/mapgen/church.json b/data/json/mapgen/church.json index e79b1506167ed..2e692a9d7b55b 100644 --- a/data/json/mapgen/church.json +++ b/data/json/mapgen/church.json @@ -10,30 +10,30 @@ "rows": [ " ^^^^^^ ", " |---|--------| ", - " ||dh.|.6ooo.ll|| ", + " ||dhy|.6ooo.ll|| ", " |W...+.........Dsss ", " ^^|--+-|------+--|^^s ", - " ^||..............||^s ", - " wp...b..tt..b....w s ", - " |................| s ", - " ^w................w^s ", - " ^|.######..######.|^s ", - " ^w................w^s ", - " ^|.######..######.|^s ", - " w................w s ", - " |.######..######.| s ", - " ^w................w^s ", - " ^|.######..######.|^s ", - " ^|................|^s ", - " |-w|----..----|w-| s ", - " ^^|ll|....|ST|^^ s ", - " ^|.......+..|^ s ", + " ^||yy...rrrr...yy||^s ", + " wp...b.rttr.b....w s ", + " |......rrrr......| s ", + " ^w.......rr.......w^s ", + " ^|.######rr######.|^s ", + " ^w.......rr.......w^s ", + " ^|.######rr######.|^s ", + " w.......rr.......w s ", + " |.######rr######.| s ", + " ^w.......rr.......w^s ", + " ^|.######rr######.|^s ", + " ^|y......rr......y|^s ", + " |-w|----rr----|w-| s ", + " ^^|ll| <#..3 ", + " |..#____#..3 ", + " |--######--3 ", + " O O ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { + "O": "t_column", + ".": "t_shingle_flat_roof", + ">": "t_stairs_down", + "<": "t_stairs_up", + "#": "t_wall_w", + "Q": "t_open_air" + } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "church_steeple", + "object": { + "fill_ter": "t_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ##oo## ", + " #____# ", + " o> ": "t_stairs_down", "o": "t_wall_glass", "#": "t_wall_w" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "church_steeple_end", + "object": { + "fill_ter": "t_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ##oo## ", + " #____# ", + " o_ >o ", + " #____# ", + " ##oo## ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ">": "t_stairs_down", "#": "t_wall_w", "o": "t_wall_glass" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "church_steeple_roof", + "object": { + "fill_ter": "t_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "church_1" ], "//": "Gothic Church", "weight": 1000, "object": { @@ -82,11 +233,11 @@ "s $ WW#####..#####WW $ s", "s $ WW............WW $ s", "s V####....####B s", - "s WWWW--|--gg-----WWWW s", - "s WLLWTS|.....lll.W..W s", - "s W..+..+.........+..W s", - "s W..WWWWWW++WWWWWW6.W s", - "s W.CWW$$WWssWW$$WW..W s", + "s WWWW-----gg-----WWWW s", + "s WSyWlll,y,,y,lllW,w ", + " w...c.+......+.....w ", + " B.h...wywBBwywf..h.B ", + " wdddwwwww wwwwwdddw ", + " wGGGw wGGGw ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { + ".": "t_floor", + "x": "t_rock_wall_half", + "w": "t_rock_wall", + "+": "t_door_locked", + "D": "t_window_domestic", + "B": "t_window_stained_blue", + "_": "t_rock_floor_no_roof", + "U": "t_rock_floor_no_roof", + ">": "t_stairs_down", + "<": "t_stairs_up", + "G": "t_window_stained_green" + }, + "furniture": { "d": "f_desk", "H": "f_bookcase", "c": "f_armchair", "b": "f_bench", "h": "f_chair", "f": "f_filing_cabinet" }, + "items": { + "d": { "item": "cubical_office", "chance": 20 }, + "H": { "item": "religious_books", "chance": 50 }, + "f": { "item": "office_paper", "chance": 70, "repeat": [ 2, 4 ] } + }, + "nested": { + "U": { + "chunks": [ + [ "roof_6x6_greenhouse_1", 25 ], + [ "roof_6x6_greenhouse_2", 25 ], + [ "roof_6x6_garden_1", 25 ], + [ "roof_6x6_garden_2", 25 ] + ] + } + } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "church_3rdfloor_1", + "object": { + "fill_ter": "t_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " xxxxxx ", + " x____x ", + " x____x ", + " x____x ", + " wwwDwwwwwDDwwwwwDwww ", + " wK.ytmw.mttm.w.y.>.w ", + " w.....+......+....cw ", + " Bj..HHwtsssstwth..SB ", + " wjt.wwwwwGGwwwwwFecw ", + " wBGBw wBGBw ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { + ".": "t_floor", + "x": "t_rock_wall_half", + "w": "t_rock_wall", + "+": "t_door_locked", + "D": "t_window_domestic", + "B": "t_window_stained_blue", + "_": "t_flat_roof", + ">": "t_stairs_down", + "G": "t_window_stained_green" + }, + "furniture": { + "d": "f_desk", + "H": "f_bookcase", + "K": "f_wardrobe", + "m": "f_armchair", + "j": "f_bed", + "h": "f_chair", + "f": "f_filing_cabinet" + }, + "items": { + "d": { "item": "cubical_office", "chance": 5 }, + "H": { "item": "novels", "chance": 30, "repeat": [ 2, 4 ] }, + "K": { "item": "allclothes", "chance": 40, "repeat": [ 2, 4 ] }, + "e": { "item": "oven", "chance": 40, "repeat": [ 2, 4 ] }, + "j": { "item": "bed", "chance": 70, "repeat": [ 2, 4 ] }, + "f": { "item": "office_paper", "chance": 70, "repeat": [ 2, 4 ] }, + "F": { "item": "fridgesnacks", "chance": 60, "repeat": [ 2, 4 ] } + } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "church_roof_1", + "object": { + "fill_ter": "t_rock_floor_no_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " xxxxxxxxxxxxxxxxxxxx ", + " x..................x ", + " x..X............A..x ", + " x.........:........x ", + " x...xxxxxxxxxxxx...x ", + " xxxxx xxxxx ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { "x": "t_rock_wall_half", ".": "t_rock_floor_no_roof" } + } } ] diff --git a/data/json/mapgen/nested/nested_chunks_roof.json b/data/json/mapgen/nested/nested_chunks_roof.json index 3f5918ea6fb55..dcf0f05598e25 100644 --- a/data/json/mapgen/nested/nested_chunks_roof.json +++ b/data/json/mapgen/nested/nested_chunks_roof.json @@ -298,5 +298,106 @@ { "item": "can_food_unsealed", "x": [ 0, 5 ], "y": [ 0, 5 ], "chance": 40, "repeat": [ 2, 3 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "roof_6x6_greenhouse_1", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + "%#++#%", + "%p__p%", + "#p__p#", + "#p__p#", + "%p__p%", + "%#++#%" + ], + "terrain": { + "_": "t_null", + "p": "t_grass_long", + "#": "t_reinforced_glass_shutter_open", + "+": "t_reinforced_door_glass_c", + "%": "t_reinforced_glass_shutter", + "$": "t_wall_glass" + }, + "furniture": { + "p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ], + "S": "f_statue" + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "roof_6x6_greenhouse_2", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + "%#++#%", + "%p__p%", + "#S__b#", + "#S__b#", + "%p__p%", + "%#++#%" + ], + "terrain": { + "_": "t_null", + "p": "t_null", + "#": "t_reinforced_glass_shutter_open", + "+": "t_reinforced_door_glass_c", + "%": "t_reinforced_glass_shutter", + "$": "t_wall_glass" + }, + "furniture": { "p": [ "f_indoor_plant_y", "f_indoor_plant" ], "S": "f_statue", "b": "f_bench" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "roof_6x6_garden_1", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + "______", + "______", + "bpppb_", + "bpBpb_", + "bpppb_", + "______" + ], + "terrain": { "_": "t_null", "p": "t_grass_long", "B": "t_grass_long" }, + "furniture": { + "p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ], + "b": "f_bench", + "B": [ "f_birdbath", "f_statue" ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "roof_6x6_garden_2", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + "p____p", + "p_bb_p", + "pp__Bp", + "pB__pp", + "p_bb_p", + "p____p" + ], + "terrain": { "_": "t_railroad_rubble", "b": "t_railroad_rubble", "p": "t_grass_long", "B": "t_grass_long" }, + "furniture": { + "p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ], + "B": [ "f_birdbath", "f_statue" ], + "b": "f_bench" + } + } } ] diff --git a/data/json/mapgen_palettes/church.json b/data/json/mapgen_palettes/church.json index 31b45fee66d2b..53a79df26191e 100644 --- a/data/json/mapgen_palettes/church.json +++ b/data/json/mapgen_palettes/church.json @@ -5,7 +5,7 @@ "terrain": { "#": "t_floor", "+": "t_door_c", - "-": "t_wall", + "-": "t_wall_w", ".": "t_floor", "6": "t_console", "=": "t_door_locked_alarm", @@ -24,7 +24,7 @@ "s": "t_sidewalk", "t": "t_floor", "w": "t_window", - "|": "t_wall" + "|": "t_wall_w" }, "furniture": { "#": "f_bench", @@ -37,7 +37,8 @@ "l": "f_locker", "o": "f_bookcase", "t": "f_table", - "C": "f_crate_c" + "C": "f_crate_c", + "y": [ "f_indoor_plant_y", "f_indoor_plant" ] } } ] diff --git a/data/json/mapgen_palettes/roof_palette.json b/data/json/mapgen_palettes/roof_palette.json index 0cfcd51059386..c35f880483f4f 100644 --- a/data/json/mapgen_palettes/roof_palette.json +++ b/data/json/mapgen_palettes/roof_palette.json @@ -39,6 +39,10 @@ "L": "f_locker", "C": "f_crate_c", "Y": "f_stool", + "s": "f_sofa", + "S": "f_sink", + "e": "f_oven", + "F": "f_fridge", "y": [ "f_indoor_plant_y", "f_indoor_plant" ] }, "toilets": { "T": { } } diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index b466791c15765..909e02ec1747d 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -15,6 +15,31 @@ { "point": [ 0, 0, -1 ], "overmap": "basement" } ] }, + { + "type": "city_building", + "id": "church", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "church_north" }, + { "point": [ 0, 0, 1 ], "overmap": "church_roof_north" }, + { "point": [ 0, 0, 2 ], "overmap": "church_steeple_north" }, + { "point": [ 0, 0, 3 ], "overmap": "church_steeple_north" }, + { "point": [ 0, 0, 4 ], "overmap": "church_steeple_north" }, + { "point": [ 0, 0, 5 ], "overmap": "church_steeple_end_north" }, + { "point": [ 0, 0, 6 ], "overmap": "church_steeple_roof_north" } + ] + }, + { + "type": "city_building", + "id": "church_1", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "church_1_north" }, + { "point": [ 0, 0, 1 ], "overmap": "church_2ndfloor_1_north" }, + { "point": [ 0, 0, 2 ], "overmap": "church_3rdfloor_1_north" }, + { "point": [ 0, 0, 3 ], "overmap": "church_roof_1_north" } + ] + }, { "type": "city_building", "id": "s_bookstore", diff --git a/data/json/overmap_terrain_public_institutional.json b/data/json/overmap_terrain_public_institutional.json index 6f4c1a104b906..4cb664c00c6c4 100644 --- a/data/json/overmap_terrain_public_institutional.json +++ b/data/json/overmap_terrain_public_institutional.json @@ -7,6 +7,70 @@ "sym": "C", "color": "light_red" }, + { + "type": "overmap_terrain", + "id": "church_roof", + "copy-from": "generic_city_building", + "name": "church roof", + "sym": "C", + "color": "light_red" + }, + { + "type": "overmap_terrain", + "id": "church_steeple", + "copy-from": "generic_city_building", + "name": "church steeple", + "sym": "C", + "color": "light_red" + }, + { + "type": "overmap_terrain", + "id": "church_steeple_end", + "copy-from": "generic_city_building", + "name": "church steeple", + "sym": "C", + "color": "light_red" + }, + { + "type": "overmap_terrain", + "id": "church_steeple_roof", + "copy-from": "generic_city_building", + "name": "church steeple", + "sym": "C", + "color": "light_red" + }, + { + "type": "overmap_terrain", + "id": "church_1", + "copy-from": "generic_city_building", + "name": "church", + "sym": "C", + "color": "light_red" + }, + { + "type": "overmap_terrain", + "id": "church_2ndfloor_1", + "copy-from": "generic_city_building", + "name": "church roof", + "sym": "C", + "color": "light_red" + }, + { + "type": "overmap_terrain", + "id": "church_3rdfloor_1", + "copy-from": "generic_city_building", + "name": "church roof", + "sym": "C", + "color": "light_red" + }, + { + "type": "overmap_terrain", + "id": "church_roof_1", + "copy-from": "generic_city_building", + "name": "church roof", + "sym": "C", + "color": "light_red" + }, { "type": "overmap_terrain", "id": "cathedral_1_NW", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 50362f5617d32..86c9e94b23ecd 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -621,6 +621,7 @@ "s_teashop_1": 100, "bowling_alley": 200, "church": 200, + "church_1": 200, "office_cubical": 200, "furniture": 200, "abstorefront": 200,