From d134d6e63bb0be9adcf4c49698cde5fcb3843077 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 11 Feb 2020 20:20:11 -0500 Subject: [PATCH] add more basic basements (#37940) --- data/json/mapgen/house/house13.json | 35 +++++++++++++++++++ data/json/mapgen/house/house14.json | 35 +++++++++++++++++++ data/json/mapgen/house/house15.json | 35 +++++++++++++++++++ data/json/mapgen/house/house16.json | 35 +++++++++++++++++++ data/json/mapgen/house/house17.json | 35 +++++++++++++++++++ data/json/mapgen/house/house19.json | 35 +++++++++++++++++++ data/json/mapgen/house/house22.json | 35 +++++++++++++++++++ .../overmap/multitile_city_buildings.json | 14 ++++---- .../overmap_terrain_residential.json | 35 +++++++++++++++++++ 9 files changed, 287 insertions(+), 7 deletions(-) diff --git a/data/json/mapgen/house/house13.json b/data/json/mapgen/house/house13.json index b26a49f9ade9d..960730e42137a 100644 --- a/data/json/mapgen/house/house13.json +++ b/data/json/mapgen/house/house13.json @@ -83,5 +83,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_13_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " |||||| |||||| ", + " |||....||||....|| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |.............z.| ", + " |............z.z| ", + " |||||||||||%+%||| ", + " |g.<| ", + " |F.U| ", + " ||||| " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house14.json b/data/json/mapgen/house/house14.json index 286190633e209..1ee2ee5a19e80 100644 --- a/data/json/mapgen/house/house14.json +++ b/data/json/mapgen/house/house14.json @@ -84,5 +84,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_14_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ||||||||| ", + " |t.%g%JJ| ", + " |..+....| ", + " |S8%.%WZ| ", + " |%%%.%%%||||||||||||| ", + " |.................F.| ", + " |...............z...| ", + " |............z......| ", + " |...................| ", + " |.....|.......|.....| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |<..................| ", + " ||||||||......z.....| ", + " |.........z..| ", + " |........zz..| ", + " |||||||||||||| ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house15.json b/data/json/mapgen/house/house15.json index 1bd1e7f10ff27..5a1388c65f4ab 100644 --- a/data/json/mapgen/house/house15.json +++ b/data/json/mapgen/house/house15.json @@ -74,5 +74,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_15_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " |||||||| ", + " ||......|| ", + " ||........|| ", + " ||||||..........|||||| ", + " |....................| ", + " |.......zUzU.........| ", + " |.......%%%%%........| ", + " |.......%.<.%........| ", + " |.................z..| ", + " |....................| ", + " |.....zz.............| ", + " |....................| ", + " ||||||..JJWJZJ..|||||| ", + " |||||||||||| ", + " ", + " ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house16.json b/data/json/mapgen/house/house16.json index a71faac50d9ea..b89f1ad5a8de9 100644 --- a/data/json/mapgen/house/house16.json +++ b/data/json/mapgen/house/house16.json @@ -72,5 +72,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_16_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " |||||||||||||||||||| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |..................| ", + " |...............z.F| ", + " |..............z...| ", + " |................zg| ", + " ||||||||||||%%+%|||| ", + " |<..U| ", + " |||||| ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house17.json b/data/json/mapgen/house/house17.json index f5604788f0266..f2b46934a643f 100644 --- a/data/json/mapgen/house/house17.json +++ b/data/json/mapgen/house/house17.json @@ -72,5 +72,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_17_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ||||||| ||||||| ", + " |.....| |.....| ", + " |.....| |.....| ", + " |.....| |.....| ", + " |.....| |.....| ", + " |.....| |.....| ", + " |.....||||||||.....| ", + " |..................| ", + " |||................| ", + " |...............<| ", + " |................| ", + " |................| ", + " |..............%+||| ", + " |..............%..J| ", + " ||||||||%+%|||||..Z| ", + " |F.g| |UWJ| ", + " ||||| ||||| ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house19.json b/data/json/mapgen/house/house19.json index ab070727cfc89..cd25db99f8e18 100644 --- a/data/json/mapgen/house/house19.json +++ b/data/json/mapgen/house/house19.json @@ -85,5 +85,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_19_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ||||||| ||||||| ", + " |.UU..| |.g.F.| ", + " |.....| |.....| ", + " |....U| |.....| ", + " |Z....||||||.....| ", + " |J....%..........| ", + " |W....%........z.| ", + " |J....+..........| ", + " |%%+%%%......z...| ", + " |S...8%<.........| ", + " |t...8%......z...| ", + " |%%%%%%........z.| ", + " |zz..............| ", + " |z...............| ", + " |................| ", + " |................| ", + " |................| ", + " |||||||||||||||||| ", + " ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house22.json b/data/json/mapgen/house/house22.json index d5ee1afdf8f9a..d4738456e6991 100644 --- a/data/json/mapgen/house/house22.json +++ b/data/json/mapgen/house/house22.json @@ -215,5 +215,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_22_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " |||||| |||||||| ", + " |.U..| |......| ", + " |F..g| |......| ", + " |....| |......| ", + " |%%+%|||||||||......| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |...................| ", + " |..................U| ", + " |..................Z| ", + " |.............<..WJJ| ", + " ||||||||||||||||||||| ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 28bec89bd6243..d1a6019483b3b 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -199,7 +199,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_13_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_13_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_13_basement_north" } ] }, { @@ -209,7 +209,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_14_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_14_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_14_basement_north" } ] }, { @@ -219,7 +219,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_15_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_15_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_15_basement_north" } ] }, { @@ -229,7 +229,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_16_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_16_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_16_basement_north" } ] }, { @@ -239,7 +239,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_17_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_17_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_17_basement_north" } ] }, { @@ -255,7 +255,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_19_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_19_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_19_basement_north" } ] }, { @@ -277,7 +277,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_22_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_22_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_22_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 a06aa3a9ca48c..ba4aa23b4dffb 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -1013,6 +1013,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_13_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_14", @@ -1030,6 +1035,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_14_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_15", @@ -1047,6 +1057,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_15_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_16", @@ -1064,6 +1079,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_16_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_17", @@ -1081,6 +1101,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_17_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_18", @@ -1115,6 +1140,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_19_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_20", @@ -1166,6 +1196,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_22_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_23",