From 5c5876cfd701a27d7b897bdf9ae0627131e6935e Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sun, 26 Apr 2020 04:33:54 -0400 Subject: [PATCH] basement variety 9 (#39906) --- data/json/mapgen/house/house_detatched3.json | 11 +- data/json/mapgen/house/house_garage5.json | 9 +- data/json/mapgen/house/house_w_4.json | 42 +++- data/json/mapgen/house/urban_1_house.json | 5 +- .../mapgen/house/urban_4_house_basement.json | 22 +- data/json/mapgen/nested/basement_nested.json | 207 ++++++++++++++++++ 6 files changed, 275 insertions(+), 21 deletions(-) diff --git a/data/json/mapgen/house/house_detatched3.json b/data/json/mapgen/house/house_detatched3.json index a0e36ab871230..4952605dc2782 100644 --- a/data/json/mapgen/house/house_detatched3.json +++ b/data/json/mapgen/house/house_detatched3.json @@ -109,7 +109,7 @@ "rows": [ " ", " ||||||||||||||||| ", - " |...............| ", + " |1.........%..UU| ", " |...............| ", " |...............| ", " |..............F| ", @@ -119,7 +119,7 @@ " |...............| ", " |..............W| ", " |............A.Z| ", - " |..........zz..U| ", + " |...........zJJJ| ", " ||||||||||||||||| ", " ", " ", @@ -132,7 +132,12 @@ " ", " " ], - "palettes": [ "basement_empty" ] + "palettes": [ "basement_empty" ], + "nested": { + "1": { + "chunks": [ [ "null", 70 ], [ "11x11_gym_open", 10 ], [ "11x11_recroom_open", 30 ], [ "room_11x11_apartment_E", 10 ] ] + } + } } } ] diff --git a/data/json/mapgen/house/house_garage5.json b/data/json/mapgen/house/house_garage5.json index 742069616d484..2c6745f37ccf9 100644 --- a/data/json/mapgen/house/house_garage5.json +++ b/data/json/mapgen/house/house_garage5.json @@ -101,7 +101,7 @@ " |J...%%......| ", " |J...........| ", " |||||||||............| ", - " |....................| ", + " |.1..................| ", " |....................| ", " |....................| ", " |....................| ", @@ -115,7 +115,12 @@ " ||||||||||||||||||||| ", " " ], - "palettes": [ "basement_empty" ] + "palettes": [ "basement_empty" ], + "nested": { + "1": { + "chunks": [ [ "null", 70 ], [ "11x11_gym_open", 10 ], [ "11x11_recroom_open", 30 ], [ "room_11x11_apartment_E", 10 ] ] + } + } } } ] diff --git a/data/json/mapgen/house/house_w_4.json b/data/json/mapgen/house/house_w_4.json index 53ecee29d624c..4b374e5094192 100644 --- a/data/json/mapgen/house/house_w_4.json +++ b/data/json/mapgen/house/house_w_4.json @@ -138,28 +138,50 @@ " ", " ", " |||||||||||||| ", - " |............| ", + " |2...........| ", " |............| ", " |............| ", " |............| ", " |............| ", " |||...........|| ", - " |U............| ", - " |U............| ", " |.............| ", - " |F............| ", - " |g............| ", - " |||...........| ", - " |....<......| ", - " |z.z........|||| ", - " |zz...z........| ", + " |.............| ", + " |.............| ", + " |.............| ", + " |.............| ", + " |||F.........U| ", + " |....<.....g| ", + " |...........|||| ", + " |....1.........| ", " |..............| ", " |..............| ", " |..............| ", " |..............| ", " |||||||||||||||| " ], - "palettes": [ "basement_empty" ] + "palettes": [ "basement_empty" ], + "nested": { + "2": { + "chunks": [ [ "null", 50 ], [ "11x11_gym_open", 10 ], [ "11x11_recroom_open", 30 ], [ "room_11x11_apartment_S", 10 ] ] + }, + "1": { + "chunks": [ + [ "null", 80 ], + [ "5x5_holdout_N", 2 ], + [ "5x5_holdout_W", 2 ], + [ "livingroom_5x5_S_1", 30 ], + [ "livingroom_5x5_E_1", 30 ], + [ "livingroom_5x5_N_1", 30 ], + [ "livingroom_5x5_W_1", 30 ], + [ "livingroom_5x5_S_2", 30 ], + [ "livingroom_5x5_E_2", 30 ], + [ "livingroom_5x5_N_2", 30 ], + [ "livingroom_5x5_W_2", 30 ], + [ "home_office_4x4_N", 20 ], + [ "home_office_4x4_S", 20 ] + ] + } + } } } ] diff --git a/data/json/mapgen/house/urban_1_house.json b/data/json/mapgen/house/urban_1_house.json index f82a7ca4e0c64..f97c605085559 100644 --- a/data/json/mapgen/house/urban_1_house.json +++ b/data/json/mapgen/house/urban_1_house.json @@ -139,7 +139,7 @@ " |||||||||||||||| ", " ||||| |..............| ", " ||||||||||||||F.g||||||||..............| ", - " |..................UU..................| ", + " |1.................UU..................| ", " |......................................| ", " |......................................| ", " |......................................| ", @@ -157,7 +157,8 @@ " ", " " ], - "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/urban_4_house_basement.json b/data/json/mapgen/house/urban_4_house_basement.json index 19c6cce8d3000..8535661a9634a 100644 --- a/data/json/mapgen/house/urban_4_house_basement.json +++ b/data/json/mapgen/house/urban_4_house_basement.json @@ -11,13 +11,13 @@ " ", " ", " |||||| ", - " ||||||||||||||||F.g.||||||||||||||||||| ", - " |............................WJJJZ....| ", + " ||||||||||||||||....||||||||||||||||||| ", + " |2...........................WJJJZ..Fg| ", " |...................................zz| ", " |...............................A....z| ", " |..........%%%.............|||||||||||| ", " |..........%.+.............| ", - " |..........%<%.............| ", + " |..........+<%.......1.....| ", " |..........%%%.............| ", " |..........................| ", " |..........................| ", @@ -32,7 +32,21 @@ " ", " " ], - "palettes": [ "basement_empty" ] + "palettes": [ "basement_empty" ], + "nested": { + "2": { + "chunks": [ [ "null", 50 ], [ "11x11_gym_open", 10 ], [ "11x11_recroom_open", 30 ], [ "room_11x11_apartment_E", 10 ] ] + }, + "1": { + "chunks": [ + [ "null", 70 ], + [ "room_6x6_brewer_W", 5 ], + [ "room_6x6_guns_W", 5 ], + [ "room_6x6_junk_W", 30 ], + [ "room_6x6_office_W", 30 ] + ] + } + } } }, { diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json index 6c98a4c1194c8..73641b3de46ca 100644 --- a/data/json/mapgen/nested/basement_nested.json +++ b/data/json/mapgen/nested/basement_nested.json @@ -3999,5 +3999,212 @@ "!": [ { "item": "book_gunref", "chance": 80, "repeat": [ 1, 2 ] } ] } } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "11x11_gym_open", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + " ", + " ", + " $ $ ", + " i$ $ ", + " i!!! ", + " i$ $ ", + " $ $ ", + " === ", + " & =%= ", + " &&& === ", + " " + ], + "palettes": [ "standard_domestic_palette" ], + "terrain": { "=": "t_carpet_green", "%": "t_carpet_green" }, + "furniture": { "&": "f_barricade_road", "%": "f_floor_canvas", "!": "f_sandbag_wall", "$": "f_sandbag_half" }, + "place_loot": [ + { "item": "towel", "x": 5, "y": [ 3, 5 ], "chance": 100, "repeat": [ 1, 2 ] }, + { "item": "wheel_wide", "x": 1, "y": 1, "chance": 100 }, + { "item": "wheel_wide", "x": 2, "y": 2, "chance": 100 }, + { "item": "wheel_wide", "x": 1, "y": 3, "chance": 100 }, + { "item": "wheel_wide", "x": 2, "y": 4, "chance": 100 }, + { "item": "wheel_wide", "x": 1, "y": 5, "chance": 100 }, + { "item": "wheel_wide", "x": 2, "y": 6, "chance": 100 }, + { "item": "wheel_wide", "x": 1, "y": 7, "chance": 100 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "11x11_recroom_open", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + " ", + " T=====!== ", + " x====h=== ", + " x===ss=== ", + " !==hssh== ", + " ====ss=== ", + " =====h=== ", + " y======== ", + " Hll====== ", + " HHHH=A%== ", + " " + ], + "palettes": [ "standard_domestic_palette" ], + "terrain": { + "=": "t_carpet_green", + "x": "t_carpet_green", + "!": "t_carpet_green", + "h": "t_carpet_green", + "s": "t_carpet_green", + "y": "t_carpet_green", + "A": "t_carpet_green", + "%": "t_carpet_green", + "H": "t_carpet_green", + "l": "t_carpet_green", + "T": "t_carpet_green" + }, + "furniture": { "%": [ "f_floor_canvas", "f_arcade_machine", "f_pinball_machine" ], "!": "f_speaker_cabinet" }, + "place_loot": [ { "item": "stereo", "x": 1, "y": 3, "chance": 100 }, { "item": "deck_of_cards", "x": 5, "y": 4, "chance": 100 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "11x11_recroom_open", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + " ", + " T=====!== ", + " x====h=== ", + " x===ss=== ", + " !==hssh== ", + " ===hss=== ", + " =====h=== ", + " y======== ", + " Hll====== ", + " HHHH=A%== ", + " " + ], + "palettes": [ "standard_domestic_palette" ], + "terrain": { + "=": "t_carpet_purple", + "x": "t_carpet_purple", + "!": "t_carpet_purple", + "h": "t_carpet_purple", + "s": "t_carpet_purple", + "y": "t_carpet_purple", + "H": "t_carpet_purple", + "A": "t_carpet_purple", + "%": "t_carpet_purple", + "l": "t_carpet_purple", + "T": "t_carpet_purple" + }, + "furniture": { "%": [ "f_floor_canvas", "f_arcade_machine", "f_pinball_machine" ], "!": "f_speaker_cabinet" }, + "place_loot": [ + { "item": "stereo", "x": 1, "y": 3, "chance": 100 }, + { "item": "dnd_handbook", "x": 5, "y": 3, "chance": 100 }, + { "item": "novel_fantasy", "x": [ 5, 6 ], "y": [ 3, 5 ], "chance": 60, "repeat": [ 0, 4 ] }, + { "item": "character_sheet", "x": [ 5, 6 ], "y": [ 3, 5 ], "chance": 80, "repeat": [ 1, 5 ] }, + { "item": "metal_RPG_die", "x": 6, "y": 3, "chance": 10 }, + { "item": "RPG_die", "x": [ 5, 6 ], "y": [ 3, 5 ], "chance": 90, "repeat": [ 1, 4 ] } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "room_11x11_apartment_N", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + "|||||+|||||", + "|ffh F|", + "|h 41O3|", + "|Hl x|||||", + "|Hl x|t89|", + "|TEs + S|", + "||||| |||||", + "|d + + R|", + "|@ y|+| hr|", + "|@IT|q|Y r|", + "|||||||||||" + ], + "palettes": [ "standard_domestic_palette" ], + "place_loot": [ { "item": "television", "x": 5, "y": 3, "chance": 50 }, { "item": "stereo", "x": 5, "y": 4, "chance": 50 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "room_11x11_apartment_S", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + "|||||||||||", + "|@IT|U|Y r|", + "|@ y|+| hr|", + "|d + + R|", + "||||| |||||", + "|TEs + S|", + "|Hl x|t89|", + "|Hl x|||||", + "|h Y41O3|", + "|ffh F|", + "|||||+|||||" + ], + "palettes": [ "standard_domestic_palette" ], + "place_loot": [ { "item": "television", "x": 5, "y": 6, "chance": 50 }, { "item": "stereo", "x": 5, "y": 7, "chance": 50 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "room_11x11_apartment_E", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + "|||||||||||", + "|@@I|s E T|", + "|@@ |Hl x|", + "|D |Hl x|", + "|||+| A y|", + "|Q+ ff +", + "|||+|+||3 |", + "|E | t|4 |", + "|I | 8|O |", + "|@@d|S9|F1|", + "|||||||||||" + ], + "palettes": [ "standard_domestic_palette" ], + "place_loot": [ { "item": "television", "x": 9, "y": 2, "chance": 50 }, { "item": "stereo", "x": 9, "y": 3, "chance": 50 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "room_11x11_apartment_W", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + "|||||||||||", + "|@@I|s E T|", + "|@@ |Hl x|", + "|D |Hl x|", + "|||+| A y|", + "+ ff |", + "|||+|+||3 |", + "|E | t|4 |", + "|I | 8|O |", + "|@@d|S9|F1|", + "|||||||||||" + ], + "palettes": [ "standard_domestic_palette" ], + "place_loot": [ { "item": "television", "x": 9, "y": 2, "chance": 50 }, { "item": "stereo", "x": 9, "y": 3, "chance": 50 } ] + } } ]