diff --git a/data/json/mapgen/house/house_2story.json b/data/json/mapgen/house/house_2story.json index 78669189dd1df..6841e4c204f16 100644 --- a/data/json/mapgen/house/house_2story.json +++ b/data/json/mapgen/house/house_2story.json @@ -137,5 +137,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_2story_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " |||||||||||||||||||| ", + " |U..F.g............| ", + " |..................| ", + " |.............z.z.z| ", + " |.......z..z..z..zz| ", + " |.<...............z| ", + " |..................| ", + " |W.................| ", + " |J..A..............| ", + " |Z.................| ", + " |JJ................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |||||||||||||||||||| ", + " ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house_w_1.json b/data/json/mapgen/house/house_w_1.json index cb7814bc0ddc4..aa3868cf56214 100644 --- a/data/json/mapgen/house/house_w_1.json +++ b/data/json/mapgen/house/house_w_1.json @@ -15,7 +15,7 @@ ".# opss.....", ".o7 opXs.....", ".# | #p.s.....", - ".# | #p.s.....", + ".# |>y | #p.s.....", ".#||||| | ||||##pss.....", ".#1 | | yJJl#ssss.....", ".# | | *ssss.....", @@ -129,5 +129,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_1_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " |||||||| ", + " |......| ", + " |......|||||||| ", + " |.............| ", + " |.............| ", + " |F............| ", + " |.z..z........| ", + " |U............| ", + " |Z..<.........| ", + " |J...........|| ", + " |W..z........| ", + " |JJ..........| ", + " |............| ", + " |............||| ", + " |..............| ", + " |............||| ", + " |........||||| ", + " |........| ", + " |........| ", + " |........| ", + " |........| ", + " |||||||||| ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house_w_2.json b/data/json/mapgen/house/house_w_2.json index 3320871ce0cbb..55971e9d44c38 100644 --- a/data/json/mapgen/house/house_w_2.json +++ b/data/json/mapgen/house/house_w_2.json @@ -15,7 +15,7 @@ "..# | I| #....", "..# + |||| ||#....", "..#|+|||| 8 #....", - "..#O O| + 7 o....", + "..#O O|>+ 7 o....", "..#|||||| o....", "..#4 #....", "..o | |||||####....", @@ -119,5 +119,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_2_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " |||||||||||||||||| ", + " |F.g.............| ", + " |................| ", + " |................| ", + " |................| ", + " |z.W%............| ", + " |U.J%<...........| ", + " |z.Z%............| ", + " |................| ", + " |.............|||| ", + " |.............| ", + " |.............| ", + " |.............| ", + " |.............| ", + " |.............| ", + " |.............| ", + " |.............| ", + " |.............| ", + " |.............| ", + " ||||||||||||||| ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house_w_3.json b/data/json/mapgen/house/house_w_3.json index c8b80e0d6249f..2292d90788a3f 100644 --- a/data/json/mapgen/house/house_w_3.json +++ b/data/json/mapgen/house/house_w_3.json @@ -18,7 +18,7 @@ "o | |a #pps.", "# + ||||||###s.", "#||+||| + d|v|U*s.", - "#O|O|w+ |j t|Q|g#..", + "#O|O|>+ |jwt|Q|g#..", "#+|||||4 |||||+###..", "#2 + |QQQY #^...", "o | no....", @@ -140,5 +140,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_3_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + "|||||||||||||||||||| ", + "|..................| ", + "|..................| ", + "|..................| ", + "|..................| ", + "|..................||| ", + "|JJ...........z..z..F| ", + "|W...<..............g| ", + "|J..A.....z..z.....||| ", + "|Z.................| ", + "|..................| ", + "|..................| ", + "|.......z.........z| ", + "|..................| ", + "|||||||||||||||||||| ", + " ", + " ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house_w_4.json b/data/json/mapgen/house/house_w_4.json index 6578f0ba210f7..53ecee29d624c 100644 --- a/data/json/mapgen/house/house_w_4.json +++ b/data/json/mapgen/house/house_w_4.json @@ -22,7 +22,7 @@ "Mo |a JJJ #........", ".# ||+||||+#........", ".#o#|+||y RR|Q #........", - "..^#W Z| R|QQ#........", + "..^#W Z|> R|QQ#........", "...#|||||| |||####.....", ".$.#1 + +2 #.....", "...o ||+| o.....", @@ -126,5 +126,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_4_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " |||||||||||||| ", + " |............| ", + " |............| ", + " |............| ", + " |............| ", + " |............| ", + " |||...........|| ", + " |U............| ", + " |U............| ", + " |.............| ", + " |F............| ", + " |g............| ", + " |||...........| ", + " |....<......| ", + " |z.z........|||| ", + " |zz...z........| ", + " |..............| ", + " |..............| ", + " |..............| ", + " |..............| ", + " |||||||||||||||| " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house_w_5.json b/data/json/mapgen/house/house_w_5.json index 2c08e21beaeea..57aeba4ec4584 100644 --- a/data/json/mapgen/house/house_w_5.json +++ b/data/json/mapgen/house/house_w_5.json @@ -14,7 +14,7 @@ "..# #~~~~~~U#", "..# Y #~~~~~~~o", "..# |||||#~~~~~~U#", - "..# +w| t#~~~~~~~o", + "..# +w|>w#~~~~~~~o", "..#||||| |||+|#~~~~~~U#", "..#4 *~~~~~UU#", ".Mo ||||||##~#o####", @@ -124,5 +124,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_5_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ||||||||||||||||||||||", + " |....................|", + " |.............z......|", + " |.z..................|", + " |..z.................|", + " |z.........<.....A..J|", + " |...................Z|", + " |.............F.g..WU|", + " |............|||||||||", + " |............| ", + " |............| ", + " |............| ", + "|||............| ", + "|..............| ", + "|..............| ", + "|..............| ", + "|..............| ", + "|..............| ", + "|..............| ", + "|||||||||||||||| ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house_w_6.json b/data/json/mapgen/house/house_w_6.json index 6ff717ee0d8d2..6c1fbc37c2d24 100644 --- a/data/json/mapgen/house/house_w_6.json +++ b/data/json/mapgen/house/house_w_6.json @@ -18,7 +18,7 @@ "....#Yv | h#....", "..M##||||| #....", "..Mo< #....", - "..MoRRRa y|+|||| |#....", + "..Mo>RRa y|+|||| |#....", "..M##||| ||jt|4 y#....", "...^#KiK l|||| #....", "...Mon Y|QQ| oM...", @@ -183,5 +183,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_6_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " |||||||||||||||| ", + " |...F.g........| ", + " |Z.............| ", + " |JJ............| ", + " |W.............| ", + " ||..............| ", + " |...............| ", + " |<..............| ", + " ||..............| ", + " |..............| ", + " |..............| ", + " |..............| ", + " |..............| ", + " |||||||||||||||| ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index d1a6019483b3b..b33c1c7ebee45 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -37,7 +37,7 @@ { "point": [ 0, 0, 0 ], "overmap": "house_2story_base_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_2story_second_north" }, { "point": [ 0, 0, 2 ], "overmap": "house_2story_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_2story_basement_north" } ] }, { @@ -78,7 +78,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_w_5_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_w_5_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_w_5_basement_north" } ] }, { @@ -89,7 +89,7 @@ { "point": [ 0, 0, 0 ], "overmap": "house_w_6_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_w_6_2ndfloor_north" }, { "point": [ 0, 0, 2 ], "overmap": "house_w_6_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_w_6_basement_north" } ] }, { @@ -415,7 +415,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_w_1_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_w_1_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_w_1_basement_north" } ] }, { @@ -425,7 +425,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_w_2_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_w_2_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_w_2_basement_north" } ] }, { @@ -435,7 +435,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_w_3_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_w_3_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_w_3_basement_north" } ] }, { @@ -445,7 +445,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_w_4_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_w_4_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_w_4_basement_north" } ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index ba4aa23b4dffb..787f2d8fa6130 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -796,6 +796,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_w_2_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_w_3", @@ -813,6 +818,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_w_3_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_w_4", @@ -830,6 +840,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_w_4_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_w_5", @@ -847,6 +862,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_w_5_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_w_6", @@ -873,6 +893,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_w_6_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "emptyresidentiallot", @@ -909,6 +934,11 @@ "see_cost": 2, "mondensity": 2 }, + { + "type": "overmap_terrain", + "id": "house_2story_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_2story_roof", @@ -952,6 +982,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_w_1_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_11",