From 2bd041319d40624254f4ea5b3d80ae25d65d5c93 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 12 Oct 2019 17:25:43 -0400 Subject: [PATCH] add 4 more nested house foundations --- data/json/mapgen/house/house_w_2.json | 69 +++++++++++++++ data/json/mapgen/house/house_w_3.json | 85 +++++++++++++++++++ data/json/mapgen/house/house_w_4.json | 73 ++++++++++++++++ data/json/mapgen/house/house_w_5.json | 75 ++++++++++++++++ .../overmap_terrain_residential.json | 36 ++++++++ data/json/regional_map_settings.json | 8 +- 6 files changed, 344 insertions(+), 2 deletions(-) create mode 100644 data/json/mapgen/house/house_w_2.json create mode 100644 data/json/mapgen/house/house_w_3.json create mode 100644 data/json/mapgen/house/house_w_4.json create mode 100644 data/json/mapgen/house/house_w_5.json diff --git a/data/json/mapgen/house/house_w_2.json b/data/json/mapgen/house/house_w_2.json new file mode 100644 index 0000000000000..5064fb663619b --- /dev/null +++ b/data/json/mapgen/house/house_w_2.json @@ -0,0 +1,69 @@ +{ + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_2", + "object": { + "fill_ter": "t_floor", + "rows": [ + "........G.sss...........", + "...CsssCssssssCsssC.....", + "...ssssssssssssssss.....", + "..||o|o|||+|||o||o||....", + "..|1 | a|5 6 |....", + "..| | I| |....", + "..| | I| |....", + "..| + |||| |||....", + "..||+|||| |....", + "..|O O| + 7 o....", + "..||||||| 8 o....", + "..|4 |....", + "..o | |||||||||....", + "..| | y| tT|.......", + "..o | + To.......", + "..| | |j |.......", + "..||+|||||+||||+|.......", + "..|J K|2 |w|.......", + "..|J L K| |||.......", + "..on L i| |O|.......", + "..|J K| + |.......", + "..|lJJ a| |O|.......", + "..||o|+|||o||||||.......", + "...ssssss..............." + ], + "palettes": [ "house_w_foundation_palette" ], + "nested": { + "1": { "chunks": [ [ "bedroom_4x4_adult_1_N", 20 ] ] }, + "2": { + "chunks": [ + [ "bedroom_5x5_adult_S_1", 50 ], + [ "bedroom_5x5_adult_W_1", 50 ], + [ "bedroom_5x5_adult_N_2", 50 ], + [ "bedroom_5x5_adult_S_2", 50 ], + [ "bedroom_5x5_adult_E_2", 50 ], + [ "bedroom_5x5_adult_W_2", 50 ] + ] + }, + "4": { "chunks": [ [ "diningroom_5x5_N_S", 50 ], [ "diningroom_5x5_E_W", 50 ] ] }, + "5": { + "chunks": [ + [ "bonus_room_2x2_1", 50 ], + [ "bonus_room_2x2_2", 50 ], + [ "bonus_room_2x2_4_W", 50 ], + [ "bonus_room_3x3_1", 50 ], + [ "bonus_room_3x3_2", 50 ] + ] + }, + "6": { + "chunks": [ + [ "bonus_room_3x3_4", 50 ], + [ "bonus_room_3x3_N_6", 50 ], + [ "bonus_room_3x3_E_6", 50 ], + [ "bonus_room_3x3_N_8", 50 ], + [ "bonus_room_3x3_E_8", 50 ] + ] + }, + "7": { "chunks": [ [ "bonus_room_3x3_5", 50 ] ] }, + "8": { "chunks": [ [ "bonus_room_2x2_1", 50 ], [ "bonus_room_2x2_2", 50 ] ] } + } + } +} diff --git a/data/json/mapgen/house/house_w_3.json b/data/json/mapgen/house/house_w_3.json new file mode 100644 index 0000000000000..1caa1966a57cd --- /dev/null +++ b/data/json/mapgen/house/house_w_3.json @@ -0,0 +1,85 @@ +{ + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_3", + "object": { + "fill_ter": "t_floor", + "rows": [ + "......G..ss.............", + ".........ss.............", + "......CssssssC..........", + "......ssssssss..........", + "......ssssssss..........", + "||o|o|||o++o|||ooo||....", + "|1 | |6 y|s...", + "| |5 | 7 +s...", + "| | + |s...", + "o | |a |....", + "| + |||||||....", + "|+||||| + d|v|....", + "|O|O|w+ |j t|Q|....", + "|||+|||4 |||||+|....", + "|2 + |QQQY |....", + "o | no....", + "| | |J K|....", + "| | |J i|....", + "| | |lnJJK|....", + "||||o|||o||o|||o||||....", + "........................", + "........................", + "........................", + "........................" + ], + "palettes": [ "house_w_foundation_palette" ], + "nested": { + "1": { + "chunks": [ + [ "bedroom_5x5_adult_N_1", 50 ], + [ "bedroom_5x5_adult_S_1", 50 ], + [ "bedroom_5x5_adult_N_2", 50 ], + [ "bedroom_5x5_adult_S_2", 50 ], + [ "bedroom_5x5_adult_E_2", 50 ], + [ "bedroom_5x5_adult_W_2", 50 ] + ] + }, + "2": { + "chunks": [ + [ "bedroom_5x5_adult_S_1", 50 ], + [ "bedroom_5x5_adult_E_1", 50 ], + [ "bedroom_5x5_adult_W_1", 50 ], + [ "bedroom_5x5_adult_S_2", 50 ], + [ "bedroom_5x5_adult_E_2", 50 ], + [ "bedroom_5x5_adult_W_2", 50 ] + ] + }, + "4": { + "chunks": [ + [ "diningroom_6x6_N_S_1A", 20 ], + [ "diningroom_6x6_E_W_1", 20 ], + [ "diningroom_6x6_E_W_2", 20 ], + [ "diningroom_6x6_N_S_2", 20 ] + ] + }, + "5": { "chunks": [ [ "livingroom_5x5_N_1", 20 ], [ "livingroom_5x5_S_1", 20 ] ] }, + "6": { + "chunks": [ + [ "bonus_room_2x2_1", 50 ], + [ "bonus_room_2x2_2", 50 ], + [ "bonus_room_2x2_4_W", 50 ], + [ "bonus_room_2x2_4_N", 50 ], + [ "bonus_room_3x3_1", 50 ], + [ "bonus_room_3x3_2", 50 ] + ] + }, + "7": { + "chunks": [ + [ "bonus_room_3x3_4", 50 ], + [ "bonus_room_3x3_W_6", 50 ], + [ "bonus_room_3x3_S_6", 50 ], + [ "bonus_room_3x3_W_8", 50 ], + [ "bonus_room_3x3_S_8", 50 ] + ] + } + } + } +} diff --git a/data/json/mapgen/house/house_w_4.json b/data/json/mapgen/house/house_w_4.json new file mode 100644 index 0000000000000..a10779b3bdb41 --- /dev/null +++ b/data/json/mapgen/house/house_w_4.json @@ -0,0 +1,73 @@ +{ + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_4", + "object": { + "fill_ter": "t_floor", + "rows": [ + ".........sG.............", + ".........s..............", + "........sss.............", + "...||ooo|+||oo|o|.......", + "...|5 |R 7 |.......", + "...| |R o.......", + "...| o.......", + "...| |6 o.......", + "...| | |.......", + ".|o|||||||||| |||.......", + ".|4 |KKlKy J|........", + ".o io........", + ".o A no........", + ".o |a JJJ |........", + ".| ||+||||+|........", + ".|o||||| |Q |........", + "...|w + |QQ|........", + "...||||||| |||||||.....", + "...|1 + +2 |.....", + "...o ||+| |.....", + "...| |t | |.....", + "...| |T | |.....", + "...| |Tj| |.....", + "...||||o|||o||o||||....." + ], + "palettes": [ "house_w_foundation_palette" ], + "nested": { + "1": { + "chunks": [ + [ "bedroom_5x5_adult_N_1", 50 ], + [ "bedroom_5x5_adult_W_1", 50 ], + [ "bedroom_5x5_adult_N_2", 50 ], + [ "bedroom_5x5_adult_S_2", 50 ], + [ "bedroom_5x5_adult_E_2", 50 ], + [ "bedroom_5x5_adult_W_2", 50 ] + ] + }, + "2": { + "chunks": [ + [ "bedroom_5x5_adult_N_1", 50 ], + [ "bedroom_5x5_adult_S_1", 50 ], + [ "bedroom_5x5_adult_E_1", 50 ], + [ "bedroom_5x5_adult_W_1", 50 ], + [ "bedroom_5x5_adult_N_2", 50 ], + [ "bedroom_5x5_adult_S_2", 50 ], + [ "bedroom_5x5_adult_E_2", 50 ], + [ "bedroom_5x5_adult_W_2", 50 ] + ] + }, + "4": { "chunks": [ [ "diningroom_5x5_N_S", 50 ], [ "diningroom_5x5_E_W", 50 ] ] }, + "5": { "chunks": [ [ "livingroom_5x5_S_1", 20 ], [ "livingroom_5x5_E_1", 20 ], [ "livingroom_5x5_W_1", 20 ] ] }, + "6": { + "chunks": [ [ "bonus_room_2x2_1", 50 ], [ "bonus_room_2x2_2", 50 ], [ "bonus_room_2x2_4_S", 50 ], [ "bonus_room_2x2_4_W", 50 ] ] + }, + "7": { + "chunks": [ + [ "bonus_room_3x3_4", 40 ], + [ "bonus_room_3x3_E_6", 20 ], + [ "bonus_room_3x3_N_6", 20 ], + [ "bonus_room_3x3_E_8", 30 ], + [ "bonus_room_3x3_N_8", 30 ] + ] + } + } + } +} diff --git a/data/json/mapgen/house/house_w_5.json b/data/json/mapgen/house/house_w_5.json new file mode 100644 index 0000000000000..c16fb33b7e276 --- /dev/null +++ b/data/json/mapgen/house/house_w_5.json @@ -0,0 +1,75 @@ +{ + "type": "mapgen", + "method": "json", + "om_terrain": "house_w_5", + "object": { + "fill_ter": "t_floor", + "rows": [ + "........ss...G...ss.ss..", + "......CssssC.....ss.ss..", + ".....ssssssss....ss.ssu.", + "..||oo||+||||o|||xxxxx||", + "..|5 |y7 |~~~~~~u|", + "..| |~~~~~~U|", + "..| Y |~~~~~~~o", + "..| ||||||~~~~~~U|", + "..| +w| t|~~~~~~~o", + "..|||||| |||+||~~~~~~U|", + "..|4 +~~~~~UU|", + "..o ||||||||~|o||||", + "..o | 1 |sss.....", + "..o | o........", + "..| | o........", + "||| ||| | |........", + "|lK |+|||+|........", + "oK J| |O|O|........", + "on i||+|+|+|||........", + "|K Jy |t |6 |........", + "|| || |T | 3 o........", + "|QLQ| |Tj| |........", + "||o||+||o|||o|||........", + "....ssss................" + ], + "palettes": [ "house_w_foundation_palette" ], + "terrain": { "U": "t_thconc_floor" }, + "nested": { + "1": { + "chunks": [ + [ "bedroom_4x4_adult_1_E", 20 ], + [ "bedroom_4x4_adult_1_N", 20 ], + [ "bedroom_4x4_adult_2_E", 20 ], + [ "bedroom_4x4_adult_2_N", 20 ] + ] + }, + "4": { "chunks": [ [ "diningroom_5x5_N_S", 50 ], [ "diningroom_5x5_E_W", 50 ] ] }, + "3": { + "chunks": [ [ "bonus_room_2x2_2", 50 ], [ "bonus_room_2x2_3", 50 ], [ "bonus_room_2x2_4_S", 50 ], [ "bonus_room_2x2_4_E", 50 ] ] + }, + "5": { + "chunks": [ + [ "livingroom_5x5_N_1", 20 ], + [ "livingroom_5x5_S_1", 20 ], + [ "livingroom_5x5_E_1", 20 ], + [ "livingroom_5x5_W_1", 20 ] + ] + }, + "6": { + "chunks": [ + [ "bonus_room_3x3_1", 100 ], + [ "bonus_room_3x3_S_5", 20 ], + [ "bonus_room_3x3_E_7", 40 ], + [ "bonus_room_3x3_S_7", 40 ] + ] + }, + "7": { + "chunks": [ + [ "bonus_room_3x3_4", 20 ], + [ "bonus_room_3x3_E_6", 20 ], + [ "bonus_room_3x3_S_6", 20 ], + [ "bonus_room_3x3_E_8", 30 ], + [ "bonus_room_3x3_S_8", 30 ] + ] + } + } + } +} diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index edbeac5f95083..e6da865b1adbf 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -354,6 +354,42 @@ "sym": "#", "color": "i_white" }, + { + "type": "overmap_terrain", + "id": "house_w_2", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_w_3", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_w_4", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_w_5", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, { "type": "overmap_terrain", "id": "emptyresidentiallot", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index d1a3faab12335..17b7a4cba865f 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -584,9 +584,13 @@ "houses": { "house_two_story_basement": 1, "house": 1000, - "house_prepper": 30, + "house_prepper": 20, "house_base": 333, - "duplex": 50, + "duplex": 40, + "house_w_2": 40, + "house_w_3": 40, + "house_w_4": 40, + "house_w_5": 40, "emptyresidentiallot": 20, "apartments_con_new": 10, "apartments_mod_new": 10,