From 6120e9f8c7fc42f0f6f61b5092415a0ccef8435c Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 11 Apr 2020 15:27:49 -0400 Subject: [PATCH] add nested basement maps --- data/json/mapgen/house/house14.json | 19 ++-- data/json/mapgen/house/house16.json | 24 ++++- data/json/mapgen/house/house22.json | 32 ++++-- data/json/mapgen/house/house_2story.json | 22 ++-- data/json/mapgen/nested/basement_nested.json | 106 +++++++++++++++++++ 5 files changed, 176 insertions(+), 27 deletions(-) diff --git a/data/json/mapgen/house/house14.json b/data/json/mapgen/house/house14.json index 1ee2ee5a19e80..5d7aeafc3d19e 100644 --- a/data/json/mapgen/house/house14.json +++ b/data/json/mapgen/house/house14.json @@ -101,23 +101,24 @@ " |..+....| ", " |S8%.%WZ| ", " |%%%.%%%||||||||||||| ", - " |.................F.| ", - " |...............z...| ", - " |............z......| ", - " |...................| ", - " |.....|.......|.....| ", + " |zzz....1...........| ", + " |zz.................| ", + " |.z.................| ", " |...................| ", + " |g....|.......|.....| ", " |...................| ", + " |F..................| ", " |...................| ", " |<..................| ", - " ||||||||......z.....| ", - " |.........z..| ", - " |........zz..| ", + " ||||||||............| ", + " |............| ", + " |............| ", " |||||||||||||| ", " ", " " ], - "palettes": [ "basement_empty" ] + "palettes": [ "basement_empty" ], + "nested": { "1": { "chunks": [ [ "recroom_12x12", 33 ], [ "tvroom_12x12", 33 ], [ "workoutroom_12x12", 33 ] ] } } } } ] diff --git a/data/json/mapgen/house/house16.json b/data/json/mapgen/house/house16.json index b89f1ad5a8de9..abf5de7a378b6 100644 --- a/data/json/mapgen/house/house16.json +++ b/data/json/mapgen/house/house16.json @@ -86,8 +86,8 @@ " ", " ", " |||||||||||||||||||| ", - " |..................| ", - " |..................| ", + " |.............2....| ", + " |1.................| ", " |..................| ", " |..................| ", " |..................| ", @@ -105,7 +105,25 @@ " ", " " ], - "palettes": [ "basement_empty" ] + "palettes": [ "basement_empty" ], + "nested": { + "1": { "chunks": [ [ "null", 25 ], [ "recroom_12x12", 25 ], [ "tvroom_12x12", 25 ], [ "workoutroom_12x12", 25 ] ] }, + "2": { + "chunks": [ + [ "null", 40 ], + [ "livingroom_5x5_S_1", 10 ], + [ "livingroom_5x5_E_1", 10 ], + [ "livingroom_5x5_N_1", 10 ], + [ "livingroom_5x5_W_1", 10 ], + [ "livingroom_5x5_S_2", 10 ], + [ "livingroom_5x5_E_2", 10 ], + [ "livingroom_5x5_N_2", 10 ], + [ "livingroom_5x5_W_2", 10 ], + [ "home_office_4x4_N", 10 ], + [ "home_office_4x4_S", 10 ] + ] + } + } } } ] diff --git a/data/json/mapgen/house/house22.json b/data/json/mapgen/house/house22.json index d4738456e6991..bf7cfeb8678f7 100644 --- a/data/json/mapgen/house/house22.json +++ b/data/json/mapgen/house/house22.json @@ -227,11 +227,12 @@ " ", " ", " |||||| |||||||| ", - " |.U..| |......| ", + " |.U..| |2.....| ", " |F..g| |......| ", " |....| |......| ", " |%%+%|||||||||......| ", " |...................| ", + " |1..................| ", " |...................| ", " |...................| ", " |...................| ", @@ -240,15 +241,34 @@ " |...................| ", " |...................| ", " |...................| ", - " |...................| ", - " |..................U| ", - " |..................Z| ", - " |.............<..WJJ| ", + " |............%.....U| ", + " |............%.....Z| ", + " |............%<..WJJ| ", " ||||||||||||||||||||| ", " ", " " ], - "palettes": [ "basement_empty" ] + "palettes": [ "basement_empty" ], + "nested": { + "1": { "chunks": [ [ "null", 25 ], [ "recroom_12x12", 25 ], [ "tvroom_12x12", 25 ], [ "workoutroom_12x12", 25 ] ] }, + "2": { + "chunks": [ + [ "null", 40 ], + [ "room_6x6_woodworker", 20 ], + [ "room_6x6_bike", 20 ], + [ "livingroom_5x5_S_1", 10 ], + [ "livingroom_5x5_E_1", 10 ], + [ "livingroom_5x5_N_1", 10 ], + [ "livingroom_5x5_W_1", 10 ], + [ "livingroom_5x5_S_2", 10 ], + [ "livingroom_5x5_E_2", 10 ], + [ "livingroom_5x5_N_2", 10 ], + [ "livingroom_5x5_W_2", 10 ], + [ "home_office_4x4_N", 10 ], + [ "home_office_4x4_S", 10 ] + ] + } + } } } ] diff --git a/data/json/mapgen/house/house_2story.json b/data/json/mapgen/house/house_2story.json index 6841e4c204f16..28d4f6482bdcf 100644 --- a/data/json/mapgen/house/house_2story.json +++ b/data/json/mapgen/house/house_2story.json @@ -149,16 +149,16 @@ " ", " ", " |||||||||||||||||||| ", - " |U..F.g............| ", - " |..................| ", - " |.............z.z.z| ", + " |U..F.g...WJZ......| ", + " |...........J......| ", + " |...........J.z.z.z| ", " |.......z..z..z..zz| ", - " |.<...............z| ", + " |.<....1...........| ", + " |2.................| ", + " |..................| ", + " |..................| ", + " |..................| ", " |..................| ", - " |W.................| ", - " |J..A..............| ", - " |Z.................| ", - " |JJ................| ", " |..................| ", " |..................| ", " |..................| ", @@ -170,7 +170,11 @@ " ", " " ], - "palettes": [ "basement_empty" ] + "palettes": [ "basement_empty" ], + "nested": { + "1": { "chunks": [ [ "null", 25 ], [ "recroom_12x12", 25 ], [ "tvroom_12x12", 25 ], [ "workoutroom_12x12", 25 ] ] }, + "2": { "chunks": [ [ "null", 25 ], [ "room_6x6_woodworker", 25 ], [ "room_6x6_junk", 25 ], [ "room_6x6_bike", 25 ] ] } + } } } ] diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json index 2d1a84b9d6ae6..e07c8fc30fc10 100644 --- a/data/json/mapgen/nested/basement_nested.json +++ b/data/json/mapgen/nested/basement_nested.json @@ -304,5 +304,111 @@ "furniture": { "!": "f_fridge", "$": "f_rack_wood" }, "items": { "!": { "item": "produce", "chance": 80, "repeat": [ 2, 8 ] }, "$": { "item": "a_television", "chance": 100 } } } + }, + { + "type": "mapgen", + "method": "json", + "//": "a nested map for basements", + "nested_mapgen_id": "room_6x6_woodworker", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + "||||||", + "|GEEA|", + "|G C|", + "|G FD|", + "|GF B|", + "|||+||" + ], + "terrain": { + "|": "t_wall_w", + "+": "t_door_locked", + " ": "t_thconc_floor", + "A": "t_thconc_floor", + "B": "t_thconc_floor", + "C": "t_thconc_floor", + "D": "t_thconc_floor", + "E": "t_thconc_floor", + "F": "t_thconc_floor", + "G": "t_thconc_floor" + }, + "furniture": { + "A": [ "f_drill_press", "f_planer" ], + "B": [ "f_jointer", "f_router", "f_mitresaw" ], + "C": "f_tablesaw", + "D": "f_bandsaw", + "E": "f_workbench", + "F": "f_stool", + "G": "f_rack_wood" + }, + "place_items": [ + { "item": "home_hw", "x": [ 1, 3 ], "y": 4, "chance": 50, "repeat": [ 1, 3 ] }, + { "item": "wood_workshop", "x": 1, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 3 ] } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "a nested map for basements", + "nested_mapgen_id": "room_6x6_bike", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + "||||||", + "| T|", + "| B|", + "| B|", + "| S|", + "||++||" + ], + "terrain": { + "|": "t_wall_w", + "+": "t_door_c", + " ": "t_thconc_floor", + "T": "t_thconc_floor", + "S": "t_thconc_floor", + "B": "t_thconc_floor" + }, + "furniture": { "T": "f_trashcan", "S": "f_utility_shelf", "B": "f_workbench" }, + "place_vehicles": [ { "vehicle": "bikeshop", "x": 1, "y": 2, "rotation": 270, "chance": 50 } ], + "place_items": [ { "item": "bikeshop_tools", "x": 4, "y": [ 2, 4 ], "chance": 10, "repeat": [ 1, 3 ] } ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "a nested map for basement", + "nested_mapgen_id": "room_6x6_junk", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + "||++||", + "|O Q|", + "|z Q|", + "|zzSQ|", + "|SzzQ|", + "||||||" + ], + "palettes": [ "house_w_nest_palette" ], + "terrain": { + "|": "t_wall_w", + "+": "t_door_c", + " ": "t_thconc_floor", + "S": "t_thconc_floor", + "z": "t_thconc_floor", + "Q": "t_thconc_floor", + "O": "t_thconc_floor" + }, + "place_items": [ + { "item": "home_hw", "x": 4, "y": [ 1, 4 ], "chance": 25, "repeat": [ 1, 3 ] }, + { "item": "allclothes", "x": 1, "y": 1, "chance": 25, "repeat": [ 1, 3 ] }, + { "item": "livingroom", "x": 1, "y": [ 2, 3 ], "chance": 55, "repeat": [ 1, 4 ] }, + { "item": "bedroom", "x": 2, "y": [ 3, 4 ], "chance": 55, "repeat": [ 1, 4 ] } + ] + } } ]