From 7f2be9bc955592e6a70b387af20f193c182cd50b Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 4 Jan 2020 09:41:48 -0500 Subject: [PATCH] renovate houses 06-10 --- data/json/mapgen/house/house06.json | 126 +++---------- data/json/mapgen/house/house07.json | 135 ++++---------- data/json/mapgen/house/house08.json | 168 +++++++++--------- data/json/mapgen/house/house09.json | 165 +++++++---------- data/json/mapgen/house/house10.json | 156 +++++++--------- .../house_general_palette.json | 14 +- .../overmap/multitile_city_buildings.json | 50 ++++++ .../overmap_terrain_residential.json | 69 +++++++ data/json/regional_map_settings.json | 5 + 9 files changed, 399 insertions(+), 489 deletions(-) diff --git a/data/json/mapgen/house/house06.json b/data/json/mapgen/house/house06.json index 810689e47be89..58e4ba11e6c61 100644 --- a/data/json/mapgen/house/house06.json +++ b/data/json/mapgen/house/house06.json @@ -2,115 +2,45 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "house" ], + "om_terrain": [ "house_06" ], "weight": 300, "object": { "fill_ter": "t_floor", "rows": [ - "........##.ss.##.P......", - ".---vvvv--v;;v---------.", - ".| h |Y Y| r r |.", - ".v kkk | | r r |.", - ".v | | r r |.", - ".| | | r r |.", - ".|oooo | | |.", - ".|------+| |---+---|.", - ".| 1|.", - ".|??????? hn lC3 5v.", - ".v? hnn C2 Ov.", - ".v? cc h nn lC4 f|.", - ".|? cc h |.", - ".| v.", - ".|------ v.", - ".| + nK D|.", - ".| |-----------+--|.", - ".|d |t S| |.", - ".v@@ + c| |.", - ".v@@ |BB S| |.", - ".|d |BBB + @@ |.", - ".|n |BBB | d@@d |.", - ".---------vv------vv---.", - "........................" + "........%%.--.%%.p......", + ".###oooo##o**o#########.", + ".#T h y|L L| 6 6 #.", + ".o rrr | | 6 6 #.", + ".o E E | | 6 6 #.", + ".# | | 6 6 #.", + ".#RRRR | | #^", + ".#||||||+| ||||+|||#.", + ".# 1#.", + ".#HHHHHHH ff AC3 5o.", + ".oH hffh 72 Oo.", + ".oH lll h ff AC4 F#.", + ".#H h C#.", + ".#y xxx yo.", + ".#|||||| Yo.", + ".#yHHT + sE ||#.", + ".# |||||||||||| +>#.", + ".#d |t S|DyR|+||#.", + ".o@@ + 8| TE#.", + ".o@@ R|BB S| #.", + ".#d I|BBB + @@ #.", + ".#v R|BBB b| d@@d #.", + ".#########oo######oo###.", + "............^..........." ], + "palettes": [ "standard_domestic_palette" ], "set": [ - { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] }, { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "chance": 40, "repeat": [ 1, 2 ] } ], - "terrain": { - "#": "t_shrub", - "+": "t_door_c", - "-": "t_wall", - ".": "t_grass", - ";": "t_door_locked", - "P": "t_grass", - "s": "t_sidewalk", - "v": "t_window_domestic", - "|": "t_wall" - }, - "furniture": { - "?": "f_sofa", - "@": "f_bed", - "B": "f_bathtub", - "C": "f_cupboard", - "1": "f_cupboard", - "2": "f_cupboard", - "3": "f_cupboard", - "4": "f_cupboard", - "5": "f_sink", - "D": "f_trashcan", - "K": "f_armchair", - "O": "f_oven", - "P": "f_mailbox", - "S": "f_sink", - "l": "f_stool", - "Y": "f_rack_coat", - "c": "f_counter", - "d": "f_dresser", - "f": "f_fridge", - "h": "f_chair", - "k": "f_desk", - "n": "f_table", - "o": "f_bookcase", - "r": "f_rack" - }, - "toilets": { "t": { } }, - "items": { - "Y": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] }, - "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, - "1": [ { "item": "SUS_dishes" }, { "item": "SUS_silverware" } ], - "2": { "item": "SUS_cookware" }, - "3": [ { "item": "SUS_utensils" }, { "item": "SUS_knife_drawer" } ], - "4": { "item": "SUS_junk_drawer" }, - "5": { "item": "SUS_kitchen_sink" } - }, + "terrain": { "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] }, "place_loot": [ - { "group": "bed", "x": [ 2, 3 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "bed", "x": [ 18, 19 ], "y": [ 20, 21 ], "chance": 90, "repeat": [ 1, 3 ] }, { "group": "livingroom", "x": [ 1, 10 ], "y": [ 8, 13 ], "chance": 90, "repeat": [ 1, 5 ] }, - { "group": "bedroom", "x": [ 1, 6 ], "y": [ 15, 21 ], "chance": 80, "repeat": [ 1, 4 ] }, { "group": "consumer_electronics", "x": [ 1, 6 ], "y": [ 15, 21 ], "chance": 50, "repeat": [ 1, 3 ] }, - { "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 }, - { "group": "dresser", "x": [ 2, 2 ], "y": [ 20, 20 ], "chance": 80, "repeat": [ 3, 6 ] }, - { "group": "dresser", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 80, "repeat": [ 2, 4 ] }, - { "group": "bedroom", "x": [ 15, 21 ], "y": [ 17, 21 ], "chance": 80, "repeat": [ 1, 4 ] }, - { "group": "dresser", "x": [ 20, 20 ], "y": [ 21, 21 ], "chance": 80, "repeat": [ 3, 6 ] }, - { "group": "dresser", "x": [ 17, 17 ], "y": [ 21, 21 ], "chance": 80, "repeat": [ 3, 6 ] }, - { "group": "cleaning", "x": [ 7, 14 ], "y": [ 17, 21 ], "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "softdrugs", "x": [ 7, 14 ], "y": [ 17, 21 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "kitchen", "x": [ 15, 21 ], "y": [ 2, 11 ], "chance": 70, "repeat": [ 1, 3 ] }, - { "group": "fridge", "x": [ 21, 21 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 5, 10 ] }, - { "group": "oven", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "kitchen", "x": [ 21, 21 ], "y": [ 9, 9 ], "chance": 80, "repeat": [ 1, 2 ] }, - { "group": "trash_forest", "x": [ 21, 21 ], "y": [ 15, 15 ], "chance": 80, "repeat": [ 1, 3 ] }, - { "group": "homebooks", "x": [ 2, 5 ], "y": [ 6, 6 ], "chance": 70, "repeat": [ 1, 3 ] }, - { "group": "office", "x": [ 4, 6 ], "y": [ 3, 3 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "cannedfood", "x": [ 16, 16 ], "y": [ 2, 5 ], "chance": 80, "repeat": [ 1, 3 ] }, - { "group": "stash_food", "x": [ 16, 16 ], "y": [ 2, 5 ], "chance": 60, "repeat": [ 1, 3 ] }, - { "group": "pasta", "x": [ 20, 20 ], "y": [ 2, 5 ], "chance": 65, "repeat": [ 1, 2 ] }, - { "group": "stash_food", "x": [ 20, 20 ], "y": [ 2, 5 ], "chance": 60, "repeat": [ 1, 3 ] } + { "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ] } diff --git a/data/json/mapgen/house/house07.json b/data/json/mapgen/house/house07.json index 5f7854b000736..a6ede85981b23 100644 --- a/data/json/mapgen/house/house07.json +++ b/data/json/mapgen/house/house07.json @@ -2,117 +2,44 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "house" ], + "om_terrain": [ "house_07" ], "weight": 300, "object": { "fill_ter": "t_floor", "rows": [ - "...T####ss####T..P......", - ".---vvvv;;vvvv---------.", - ".|oo Y| rcccc |.", - ".| h | r c |.", - ".|0 nnh | r l c |.", - ".|o hnn | r c |.", - ".|o h | |.", - ".|o |+------|.", - ".| | 1|.", - ".| ? o| lc2 5v.", - ".vn ? o| c3 Ov.", - ".vn ? o| lc4 f|.", - ".| ? + c|.", - ".| K c | h v.", - ".|------ |h v.", - ".|t + |nnn D|.", - ".| |--+--------+--|.", - ".|BB | nndnn |.", - ".vBB + |.", - ".vBB + |.", - ".| S|--+--| @@ |.", - ".|rr |G r| d@@d |.", - ".-----------------vv---.", - "........................" - ], - "set": [ - { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] }, - { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "chance": 40, "repeat": [ 1, 2 ] } + "...$%%%%--%%%%$..p......", + ".###oooo**oooo#########.", + ".#RR y L| UJJJq #.", + ".# h | 6 6 #.", + ".#a ffh | 6 A 6 #.", + ".#R hff | 6 6 #.", + ".#R h | #^", + ".#R |+||||||#.", + ".# ET| 1#.", + ".#y H R| AJ2 5o.", + ".os Hr R| J3 Oo.", + ".os HrE R| AJ4 F#.", + ".# H + 7#.", + ".# E l y||| h o.", + ".#|||||| +>|h o.", + ".#t + |g|rrr Y#.", + ".# |||+||||||||+||#.", + ".#BB b|y ssdII Ey#.", + ".oBB + h #.", + ".oBB + #.", + ".# S|||+|||R @@ T#.", + ".#ww 8|vD D|R d@@d #.", + ".#################oo###.", + "............^..........." ], + "palettes": [ "standard_domestic_palette" ], + "set": [ { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "chance": 40, "repeat": [ 1, 2 ] } ], "terrain": { - "#": "t_shrub", - "+": "t_door_c", - "-": "t_wall", - ".": "t_grass", - ";": "t_door_locked", - "P": "t_grass", - "T": "t_tree", - "s": "t_sidewalk", - "v": "t_window_domestic", - "|": "t_wall" - }, - "furniture": { - "0": "f_fireplace", - "?": "f_sofa", - "@": "f_bed", - "B": "f_bathtub", - "D": "f_trashcan", - "G": "f_gunsafe_ml", - "K": "f_armchair", - "O": "f_oven", - "P": "f_mailbox", - "l": "f_stool", - "Y": "f_rack_coat", - "S": "f_sink", - "c": "f_counter", - "1": "f_cupboard", - "2": "f_cupboard", - "3": "f_cupboard", - "4": "f_cupboard", - "5": "f_sink", - "d": "f_dresser", - "f": "f_fridge", - "h": "f_chair", - "n": "f_table", - "o": "f_bookcase", - "r": "f_rack" + "#": "t_rock_wall", + "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], + "$": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ] }, - "toilets": { "t": { } }, - "items": { - "Y": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] }, - "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, - "1": [ { "item": "SUS_dishes" }, { "item": "SUS_silverware" } ], - "2": { "item": "SUS_cookware" }, - "3": [ { "item": "SUS_utensils" }, { "item": "SUS_knife_drawer" } ], - "4": { "item": "SUS_junk_drawer" }, - "5": { "item": "SUS_kitchen_sink" } - }, - "place_loot": [ - { "group": "bed", "x": [ 18, 19 ], "y": [ 20, 21 ], "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "livingroom", "x": [ 1, 10 ], "y": [ 1, 13 ], "chance": 90, "repeat": [ 1, 5 ] }, - { "group": "fridge", "x": [ 8, 9 ], "y": [ 4, 5 ], "chance": 40, "repeat": [ 1, 2 ] }, - { "group": "consumer_electronics", "x": [ 1, 6 ], "y": [ 7, 21 ], "chance": 50, "repeat": [ 1, 3 ] }, - { "group": "bedroom", "x": [ 15, 21 ], "y": [ 7, 21 ], "chance": 80, "repeat": [ 1, 5 ] }, - { "group": "dresser", "x": [ 20, 20 ], "y": [ 21, 21 ], "chance": 70, "repeat": [ 3, 6 ] }, - { "group": "dresser", "x": [ 17, 17 ], "y": [ 21, 21 ], "chance": 70, "repeat": [ 3, 6 ] }, - { "group": "guns_pistol_common", "x": [ 8, 8 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 }, - { "group": "dresser", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 90, "repeat": [ 3, 6 ] }, - { "group": "dresser", "x": [ 13, 13 ], "y": [ 17, 17 ], "chance": 50, "repeat": [ 3, 6 ] }, - { "group": "softdrugs", "x": [ 2, 3 ], "y": [ 21, 21 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "harddrugs", "x": [ 2, 3 ], "y": [ 21, 21 ], "chance": 15, "repeat": [ 1, 2 ] }, - { "group": "kitchen", "x": [ 15, 21 ], "y": [ 2, 16 ], "chance": 70, "repeat": [ 1, 3 ] }, - { "group": "fridge", "x": [ 21, 21 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 5, 10 ] }, - { "group": "oven", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "kitchen", "x": [ 21, 21 ], "y": [ 9, 9 ], "chance": 80, "repeat": [ 1, 2 ] }, - { "group": "trash_forest", "x": [ 21, 21 ], "y": [ 15, 15 ], "chance": 80, "repeat": [ 1, 3 ] }, - { "group": "homebooks", "x": [ 2, 2 ], "y": [ 5, 7 ], "chance": 60, "repeat": [ 1, 3 ] }, - { "group": "homebooks", "x": [ 13, 13 ], "y": [ 8, 10 ], "chance": 60, "repeat": [ 1, 3 ] }, - { "group": "cannedfood", "x": [ 16, 16 ], "y": [ 2, 5 ], "chance": 80, "repeat": [ 1, 2 ] }, - { "group": "cannedfood", "x": [ 16, 20 ], "y": [ 2, 2 ], "chance": 75, "repeat": [ 1, 2 ] }, - { "group": "stash_food", "x": [ 16, 16 ], "y": [ 2, 5 ], "chance": 60, "repeat": [ 1, 3 ] }, - { "group": "pasta", "x": [ 20, 20 ], "y": [ 2, 5 ], "chance": 65, "repeat": [ 1, 2 ] }, - { "group": "stash_food", "x": [ 20, 20 ], "y": [ 2, 5 ], "chance": 60, "repeat": [ 1, 3 ] } - ], + "place_loot": [ { "group": "livingroom", "x": [ 1, 10 ], "y": [ 1, 13 ], "chance": 90, "repeat": [ 1, 5 ] } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ] } } diff --git a/data/json/mapgen/house/house08.json b/data/json/mapgen/house/house08.json index e50d4282f8aa2..5f9abd2c71b25 100644 --- a/data/json/mapgen/house/house08.json +++ b/data/json/mapgen/house/house08.json @@ -2,107 +2,105 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "house" ], + "om_terrain": [ "house_08" ], "weight": 300, "object": { "fill_ter": "t_floor", "rows": [ - ".###....P...............", - ".#---v----v;v----------.", - ".#|hk | oooo hv.", - ".#| k + nnn hv.", - ".#| | h|.", - ".|-----+| v.", - ".v | h v.", - ".|d @@ | h h |.", - ".v @@c | | ---nn-|.", - ".|-----+- | 4|.", - ".|d | Ov.", - ".|d |l 31f52|.", - ".|--+-|-[---[---v-----|.", - ".vB S|...............q.", - ".|B t|...............q.", - ".------...............q.", - ".q....................q.", - ".q....................q.", - ".q....................q.", - ".q....................q.", - ".q....................q.", - ".q....................q.", - ".QQQQQQQQQQQQQQQQQQQQQQ.", + ".%%%.....p.-....%%%.....", + ".%###o####o*o##########.", + ".%#hr E | RRRR ho.", + ".^# r E +HHH lll ho.", + ".%#y | h#.", + ".##||||+| o.", + ".o | h o.", + ".#E @@ | A A #.", + ".o d@@s | hfh | ||JJJ||.", + ".#|||||+| hfh | Y 4#.", + ".#g|d Oo.", + ".#>+ |6 31F52#.", + ".#||+|##[###[###o######.", + ".oB8 S#%-----........^=.", + ".#B t#.-----.........=.", + ".######...............=.", + ".=....................=.", + ".=....................=.", + ".=....................=.", + ".=....................=.", + ".=....................=.", + ".=....................=.", + ".======================.", "........................" ], + "palettes": [ "standard_domestic_palette" ], "set": [ - { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] }, { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 1, 2 ] }, - { "point": "terrain", "id": "t_tree", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 2, 6 ] }, - { "point": "terrain", "id": "t_tree_young", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 3, 5 ] } + { "point": "terrain", "id": "t_tree", "x": [ 2, 11 ], "y": [ 16, 21 ], "repeat": [ 2, 6 ] }, + { "point": "terrain", "id": "t_tree_young", "x": [ 2, 11 ], "y": [ 16, 21 ], "repeat": [ 3, 5 ] } ], "terrain": { - "#": "t_shrub", - "+": "t_door_c", - "-": "t_wall", - ".": "t_grass", - ";": "t_door_locked", - "P": "t_grass", - "Q": "t_fence_h", - "S": "t_floor", + "#": "t_rock_wall", "[": "t_door_glass_c", - "q": "t_fence_v", - "v": "t_window_domestic", - "|": "t_wall" - }, - "furniture": { - "@": "f_bed", - "B": "f_bathtub", - "C": "f_cupboard", - "1": "f_cupboard", - "2": "f_cupboard", - "3": "f_cupboard", - "4": "f_cupboard", - "5": "f_sink", - "D": "f_trashcan", - "O": "f_oven", - "P": "f_mailbox", - "S": "f_sink", - "l": "f_stool", - "c": "f_counter", - "d": "f_dresser", - "f": "f_fridge", - "h": "f_chair", - "k": "f_desk", - "n": "f_table", - "o": "f_bookcase" - }, - "toilets": { "t": { } }, - "items": { - "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, - "1": [ { "item": "SUS_dishes" }, { "item": "SUS_silverware" } ], - "2": { "item": "SUS_cookware" }, - "3": [ { "item": "SUS_utensils" }, { "item": "SUS_knife_drawer" } ], - "4": { "item": "SUS_junk_drawer" }, - "5": { "item": "SUS_kitchen_sink" } + "=": "t_fence", + "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] }, "place_loot": [ - { "group": "bed", "x": [ 4, 5 ], "y": [ 7, 8 ], "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "bedroom", "x": [ 2, 8 ], "y": [ 6, 8 ], "chance": 80, "repeat": [ 1, 5 ] }, { "group": "livingroom", "x": [ 9, 21 ], "y": [ 2, 7 ], "chance": 90, "repeat": [ 1, 4 ] }, - { "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 10, 11 ], "chance": 10, "ammo": 90, "magazine": 100 }, - { "group": "dresser", "x": [ 2, 2 ], "y": [ 10, 11 ], "chance": 80, "repeat": [ 3, 5 ] }, - { "group": "dresser", "x": [ 2, 2 ], "y": [ 7, 7 ], "chance": 90, "repeat": [ 2, 4 ] }, - { "group": "fridge", "x": [ 19, 19 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 5, 10 ] }, - { "group": "kitchen", "x": [ 21, 21 ], "y": [ 11, 11 ], "chance": 85, "repeat": [ 1, 2 ] }, - { "group": "kitchen", "x": [ 18, 18 ], "y": [ 11, 11 ], "chance": 80, "repeat": [ 1, 2 ] }, - { "group": "kitchen", "x": [ 18, 20 ], "y": [ 7, 10 ], "chance": 70, "repeat": [ 1, 3 ] }, - { "group": "oven", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "cleaning", "x": [ 2, 5 ], "y": [ 13, 14 ], "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "softdrugs", "x": [ 2, 5 ], "y": [ 12, 14 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "office", "x": [ 2, 7 ], "y": [ 2, 4 ], "chance": 80, "repeat": [ 1, 3 ] } + { "group": "guns_pistol_common", "x": 4, "y": 10, "chance": 10, "ammo": 90, "magazine": 100 } + ], + "place_nested": [ + { + "chunks": [ + [ "null", 50 ], + [ "roof_6x6_garden_4", 15 ], + [ "roof_6x6_garden_1", 15 ], + [ "greenhouse_6x6_herbal", 25 ], + [ "greenhouse_6x6_vegetable", 25 ], + [ "pond_6x6", 25 ], + [ "shed_6x6_junk", 25 ], + [ "shed_6x6_woodworker", 25 ] + ], + "x": 15, + "y": 15 + } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ] } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_08_roof", + "object": { + "fill_ter": "t_shingle_flat_roof", + "rows": [ + " ", + " |22222222222222222223 ", + " |...................3 ", + " 5..............:....3 ", + " |...................3 ", + " ||...................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |..............&.....3 ", + " |....................3 ", + " |....3--------------53 ", + " |.=..3 ", + " |....3 ", + " |22223 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } + } } ] diff --git a/data/json/mapgen/house/house09.json b/data/json/mapgen/house/house09.json index 7818e773dda45..e7bde7b749952 100644 --- a/data/json/mapgen/house/house09.json +++ b/data/json/mapgen/house/house09.json @@ -2,117 +2,78 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "house" ], + "om_terrain": [ "house_09" ], "weight": 300, "object": { "fill_ter": "t_floor", "rows": [ - "............###...sp###.", - "...........----vv-;----.", - "...........|? K k|.", - "...........|? Kk|.", - "...######..|? n --|.", - ".----vv----|? n D|.", - ".| |c |.", - ".| ?????? | h v.", - ".|o + nnnh v.", - ".|o | hnnn v.", - ".|o | h v.", - ".| nnnn | CC|.", - ".|---------|+---------|.", - ".v52fO l| | t B|.", - ".v + + BBv.", - ".v 341 rrr| | S BB|.", - ".|----------+-----+---|.", - ".|d nv.", - ".|@@ nv.", - ".|@@ ---+----|.", - ".|d | |.", - ".| |rrdn YW|.", - ".----vv-----v----------.", - "........................" - ], - "set": [ - { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] } - ], - "terrain": { - "#": "t_shrub", - "+": "t_door_c", - "-": "t_wall", - ".": "t_grass", - "p": "t_grass", - ";": "t_door_locked", - "s": "t_sidewalk", - "v": "t_window_domestic", - "|": "t_wall" - }, - "furniture": { - "?": "f_sofa", - "@": "f_bed", - "B": "f_bathtub", - "C": "f_cupboard", - "1": "f_cupboard", - "2": "f_cupboard", - "3": "f_cupboard", - "4": "f_cupboard", - "5": "f_sink", - "D": "f_trashcan", - "K": "f_armchair", - "O": "f_oven", - "S": "f_sink", - "l": "f_stool", - "p": "f_mailbox", - "W": "f_washer", - "Y": "f_dryer", - "c": "f_counter", - "d": "f_dresser", - "f": "f_fridge", - "h": "f_chair", - "k": "f_desk", - "n": "f_table", - "o": "f_bookcase", - "r": "f_rack" - }, - "toilets": { "t": { } }, - "items": { - "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, - "W": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] }, - "Y": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] }, - "1": [ { "item": "SUS_dishes" }, { "item": "SUS_silverware" } ], - "2": { "item": "SUS_cookware" }, - "3": [ { "item": "SUS_utensils" }, { "item": "SUS_knife_drawer" } ], - "4": { "item": "SUS_junk_drawer" }, - "5": { "item": "SUS_kitchen_sink" } - }, - "place_loot": [ - { "group": "bed", "x": [ 2, 3 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "livingroom", "x": [ 12, 21 ], "y": [ 2, 6 ], "chance": 90, "repeat": [ 1, 4 ] }, - { "group": "livingroom", "x": [ 2, 10 ], "y": [ 6, 11 ], "chance": 90, "repeat": [ 1, 4 ] }, - { "group": "dining", "x": [ 16, 18 ], "y": [ 8, 9 ], "chance": 85, "repeat": [ 1, 3 ] }, - { "group": "cannedfood", "x": [ 20, 21 ], "y": [ 11, 11 ], "chance": 80, "repeat": [ 1, 2 ] }, - { "group": "dining", "x": [ 20, 21 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "bedroom", "x": [ 1, 10 ], "y": [ 17, 21 ], "chance": 80, "repeat": [ 1, 5 ] }, - { "group": "dresser", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 80, "repeat": [ 1, 3 ] }, - { "group": "dresser", "x": [ 2, 2 ], "y": [ 20, 20 ], "chance": 80, "repeat": [ 1, 3 ] }, - { "group": "consumer_electronics", "x": [ 1, 10 ], "y": [ 17, 21 ], "chance": 60, "repeat": [ 1, 3 ] }, - { "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 10, "ammo": 90, "magazine": 100 }, - { "group": "novels", "x": [ 2, 2 ], "y": [ 8, 10 ], "chance": 85, "repeat": [ 1, 3 ] }, - { "group": "softdrugs", "x": [ 15, 15 ], "y": [ 15, 15 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "kitchen", "x": [ 2, 10 ], "y": [ 13, 15 ], "chance": 80, "repeat": [ 1, 3 ] }, - { "group": "fridge", "x": [ 4, 4 ], "y": [ 13, 13 ], "chance": 90, "repeat": [ 5, 10 ] }, - { "group": "oven", "x": [ 5, 5 ], "y": [ 13, 13 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "cannedfood", "x": [ 9, 10 ], "y": [ 15, 15 ], "chance": 70, "repeat": [ 1, 3 ] }, - { "group": "pasta", "x": [ 3, 5 ], "y": [ 15, 15 ], "chance": 60, "repeat": [ 1, 2 ] }, - { "group": "knifeblock", "x": [ 3, 5 ], "y": [ 15, 15 ], "chance": 70, "repeat": [ 1, 2 ] }, - { "group": "camping", "x": [ 21, 21 ], "y": [ 17, 18 ], "chance": 30, "repeat": [ 1, 2 ] }, - { "group": "cleaning", "x": [ 15, 18 ], "y": [ 21, 21 ], "chance": 90, "repeat": [ 1, 2 ] }, - { "item": "television", "x": [ 5, 5 ], "y": [ 11, 11 ], "chance": 80 } + "............%%%...-p%%%.", + "...........####oo#*####.", + "...........#H E r#.", + "...........#H Er#.", + "...%%%%%%.^#H l ||#.", + ".####oo#####H l Y#.", + ".# |s #.", + ".# sHHHHs | h o.", + ".#R + fffh o.", + ".#R | hfff o.", + ".#R | h o.", + ".#v xxxx | y11#.", + ".#||||||||||+|||||||||#.", + ".o52FO A| |Yt y BB#.", + ".o + + BBo.", + ".o 3417 666| |8S8 BB#.", + ".#|||||||||| |||||+|||#.", + ".#d IID| so.", + ".#@@ h + y so.", + ".#@@ |y |||+||||#.", + ".#d E||+|Q #.", + ".# R T|>>|UUdA ZW#.", + ".####oo#####o##########.", + "...................^...." ], + "palettes": [ "standard_domestic_palette" ], + "terrain": { "#": "t_adobe_brick_wall", "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] }, "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 }, { "monster": "GROUP_ROACH", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 6 } ] } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_09_roof", + "object": { + "fill_ter": "t_shingle_flat_roof", + "rows": [ + " ", + " |22222222223 ", + " |..........3 ", + " |..........3 ", + " |..........3 ", + " |2222222225..........3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....X...............3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |...&.............=..3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |-----------------5--3 ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } + } } ] diff --git a/data/json/mapgen/house/house10.json b/data/json/mapgen/house/house10.json index 4173236e33de9..e5bc06c3ef8d9 100644 --- a/data/json/mapgen/house/house10.json +++ b/data/json/mapgen/house/house10.json @@ -2,111 +2,79 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "house" ], + "om_terrain": [ "house_10" ], "weight": 300, "object": { "fill_ter": "t_floor", "rows": [ - "............ss..........", - "............ss..........", - "...........pss..........", - "..|-vv--vv-|ss......#...", - "..| |ss..........", - "..v hnnh vsssssss.....", - "..v hnnh |sssssss.....", - "..| hnnh |;;-|-vvv-|..", - "..| P| d|..", - "..|--| ----| | @@v..", - "..v + + @@v..", - "..|tS|c ?| |..", - "..|--|c nn ?|+|-+-|..", - "..|r + nn ?|r|c t|..", - "..|--|o ?|-|S B|..", - ".....vl |r|c B|..", - ".....v5 f|+|+|-+-|..", - "#....v1 C| |..", - ".....|C 42O3C| v..", - ".....|-;-vvv-| @@ v..", - ".....ssssssssw @@d |..", - ".....ssssssss|-v---v-|..", + "............--..........", + "............--..........", + "....%%..%%.p--..........", + "..##oo##oo##--..........", + "..# y#--..........", + "..o hffh o-------.....", + "..o hffh #-------%%^..", + "..# hffh #**###ooo##..", + "..#y L|Ih d#..", + "..#||| ||||| |I @@o..", + "..o + RRRT + @@o..", + "..#tS|x H| #..", + "..#|||x E ll H|+||+|#..", + "..#U>+ ll H|D|8 t#..", + "..####y E H|||S B#..", + "....^o1 |D|Q B#..", + ".....o5 A F|+|+||+|#..", + ".%...o6 C| ET y#..", + ".....#6 42O37| o..", + ".....##*#ooo## @@ o..", + "...%.--------# s@@d R#..", + ".....--------##o###o##..", "........................", "........................" ], - "set": [ - { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 22, 23 ], "repeat": [ 10, 20 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 0, 1 ], "y": [ 0, 23 ], "repeat": [ 10, 20 ] }, - { "point": "terrain", "id": "t_dirt", "x": [ 22, 23 ], "y": [ 0, 23 ], "repeat": [ 10, 20 ] } - ], - "terrain": { - "#": "t_shrub", - "+": "t_door_c", - "-": "t_wall", - ".": "t_grass", - "p": "t_grass", - ";": "t_door_locked", - "s": "t_sidewalk", - "v": "t_window_domestic", - "w": "t_window", - "|": "t_wall" - }, - "furniture": { - "?": "f_sofa", - "@": "f_bed", - "B": "f_bathtub", - "O": "f_oven", - "l": "f_stool", - "p": "f_mailbox", - "P": "f_indoor_plant", - "S": "f_sink", - "c": "f_counter", - "C": "f_cupboard", - "1": "f_cupboard", - "2": "f_cupboard", - "3": "f_cupboard", - "4": "f_cupboard", - "5": "f_sink", - "d": "f_dresser", - "f": "f_fridge", - "h": "f_chair", - "k": "f_desk", - "n": "f_table", - "o": "f_bookcase", - "r": "f_rack" - }, - "toilets": { "t": { } }, - "items": { - "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, - "1": [ { "item": "SUS_dishes" }, { "item": "SUS_silverware" } ], - "2": { "item": "SUS_cookware" }, - "3": [ { "item": "SUS_utensils" }, { "item": "SUS_knife_drawer" } ], - "4": { "item": "SUS_junk_drawer" }, - "5": { "item": "SUS_kitchen_sink" } - }, + "palettes": [ "standard_domestic_palette" ], + "terrain": { "#": "t_adobe_brick_wall", "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] }, "place_loot": [ - { "group": "dresser", "x": [ 18, 18 ], "y": [ 20, 20 ], "chance": 80, "repeat": [ 1, 4 ] }, - { "group": "dresser", "x": [ 20, 20 ], "y": [ 8, 8 ], "chance": 80, "repeat": [ 1, 4 ] }, - { "group": "dresser", "x": [ 16, 16 ], "y": [ 13, 13 ], "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "dresser", "x": [ 16, 16 ], "y": [ 15, 15 ], "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "dining", "x": [ 6, 7 ], "y": [ 5, 7 ], "chance": 85, "repeat": [ 1, 3 ] }, - { "group": "jackets", "x": [ 3, 3 ], "y": [ 13, 13 ], "chance": 70, "repeat": [ 1, 2 ] }, - { "group": "homebooks", "x": [ 6, 6 ], "y": [ 14, 14 ], "chance": 70, "repeat": [ 1, 3 ] }, { "group": "guns_pistol_common", "x": [ 20, 20 ], "y": [ 8, 8 ], "chance": 4, "ammo": 90, "magazine": 100 }, - { "group": "guns_pistol_common", "x": [ 18, 18 ], "y": [ 20, 20 ], "chance": 3, "ammo": 90, "magazine": 100 }, - { "group": "kitchen", "x": [ 6, 12 ], "y": [ 16, 18 ], "chance": 80, "repeat": [ 1, 3 ] }, - { "group": "fridge", "x": [ 12, 12 ], "y": [ 18, 18 ], "chance": 90, "repeat": [ 5, 10 ] }, - { "group": "oven", "x": [ 10, 10 ], "y": [ 18, 18 ], "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "softdrugs", "x": [ 18, 20 ], "y": [ 13, 15 ], "chance": 75, "repeat": [ 1, 2 ] }, - { "group": "cleaning", "x": [ 18, 19 ], "y": [ 13, 15 ], "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "harddrugs", "x": [ 18, 20 ], "y": [ 13, 15 ], "chance": 15, "repeat": [ 1, 2 ] }, - { "group": "softdrugs", "x": [ 3, 4 ], "y": [ 10, 11 ], "chance": 65, "repeat": [ 1, 2 ] }, - { "group": "cleaning", "x": [ 3, 4 ], "y": [ 10, 11 ], "chance": 75, "repeat": [ 1, 2 ] }, - { "group": "bed", "x": [ 19, 20 ], "y": [ 9, 10 ], "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "bed", "x": [ 16, 17 ], "y": [ 19, 20 ], "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "livingroom", "x": [ 6, 13 ], "y": [ 8, 15 ], "chance": 90, "repeat": [ 1, 4 ] }, - { "group": "bedroom", "x": [ 16, 20 ], "y": [ 8, 11 ], "chance": 80, "repeat": [ 1, 4 ] }, - { "group": "bedroom", "x": [ 14, 20 ], "y": [ 17, 20 ], "chance": 80, "repeat": [ 1, 4 ] } + { "group": "guns_pistol_common", "x": [ 18, 18 ], "y": [ 20, 20 ], "chance": 3, "ammo": 90, "magazine": 100 } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ] } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_10_roof", + "object": { + "fill_ter": "t_shingle_flat_roof", + "rows": [ + " ", + " ", + " ", + " |222222223 ", + " |........3 ", + " |........3 ", + " |........3 ", + " |........32222222225 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |--5.............=.3 ", + " |...............3 ", + " |...............3 ", + " |....&..........3 ", + " |...............3 ", + " |-------|.......3 ", + " |.......3 ", + " |-------3 ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } + } } ] diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json index 57c800ff939cf..7e100031fee59 100644 --- a/data/json/mapgen_palettes/house_general_palette.json +++ b/data/json/mapgen_palettes/house_general_palette.json @@ -2,7 +2,7 @@ { "type": "palette", "id": "standard_domestic_palette", - "//": "Intended as a palette for non-nested houses. Symbols still open for use: ! $ % & _ = ~ - ? / , and some symbols that conflict with json (like brackets).", + "//": "Intended as a palette for non-nested houses. Symbols still open for use: ! $ % & _ = ~ ? / , and some symbols that conflict with json (like brackets).", "toilets": { "t": { } }, "furniture": { "a": "f_fireplace", @@ -72,7 +72,7 @@ "p": "t_region_groundcover_urban", "u": "t_region_groundcover_urban", "X": "t_region_groundcover_urban", - ".": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub_decorative" ], + ".": "t_region_groundcover_urban", " ": "t_floor", "+": [ [ "t_door_c", 10 ], [ "t_door_o", 5 ], [ "t_door_locked_interior", 3 ] ], "*": [ [ "t_door_locked_peep", 2 ], "t_door_locked_alarm", [ "t_door_locked", 10 ], "t_door_c" ], @@ -112,7 +112,7 @@ { "item": "livingroom", "chance": 10, "repeat": [ 1, 3 ] } ], "s": [ - { "item": "elecsto_persele", "chance": 10, "repeat": [ 1, 3 ] }, + { "item": "consumer_electronics", "chance": 10, "repeat": [ 1, 3 ] }, { "item": "livingroom", "chance": 10, "repeat": [ 1, 3 ] } ], "m": { "item": "SUS_fridge", "chance": 100 }, @@ -137,7 +137,7 @@ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] } ], - "x": { "item": "elecsto_persele", "chance": 10, "repeat": [ 1, 3 ] }, + "x": { "item": "consumer_electronics", "chance": 10, "repeat": [ 1, 3 ] }, "B": { "item": "shower", "chance": 10, "repeat": [ 1, 2 ] }, "D": [ { "item": "SUS_wardrobe_mens", "chance": 50, "repeat": [ 1, 2 ] }, @@ -173,7 +173,7 @@ "4": { "item": "SUS_junk_drawer", "chance": 100 }, "5": { "item": "SUS_kitchen_sink", "chance": 100 }, "6": { "item": "SUS_pantry", "chance": 25, "repeat": [ 1, 2 ] }, - "7": [ { "item": "SUS_breakfast_cupboard", "chance": 60 }, { "item": "SUS_coffee_cupboard", "chance": 60 } ], + "7": [ { "item": "SUS_breakfast_cupboard", "chance": 100 }, { "item": "SUS_coffee_cupboard", "chance": 100 } ], "8": [ { "item": "SUS_hair_drawer", "chance": 50 }, { "item": "SUS_bathroom_cabinet", "chance": 50 }, @@ -181,7 +181,9 @@ { "item": "harddrugs", "chance": 2 } ], "9": { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] }, - "@": { "item": "bed", "chance": 50 } + "@": { "item": "bed", "chance": 50 }, + "Z": { "item": "laundry", "chance": 50 }, + "W": { "item": "laundry", "chance": 50 } } } ] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index fe39c37f4d4e6..59a1702c71d2a 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -46,6 +46,56 @@ { "point": [ 0, 0, -1 ], "overmap": "basement" } ] }, + { + "type": "city_building", + "id": "house_06", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "house_06_north" }, + { "point": [ 0, 0, 1 ], "overmap": "house_04_roof_north" }, + { "point": [ 0, 0, -1 ], "overmap": "basement" } + ] + }, + { + "type": "city_building", + "id": "house_07", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "house_07_north" }, + { "point": [ 0, 0, 1 ], "overmap": "house_04_roof_north" }, + { "point": [ 0, 0, -1 ], "overmap": "basement" } + ] + }, + { + "type": "city_building", + "id": "house_08", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "house_08_north" }, + { "point": [ 0, 0, 1 ], "overmap": "house_08_roof_north" }, + { "point": [ 0, 0, -1 ], "overmap": "basement" } + ] + }, + { + "type": "city_building", + "id": "house_09", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "house_09_north" }, + { "point": [ 0, 0, 1 ], "overmap": "house_09_roof_north" }, + { "point": [ 0, 0, -1 ], "overmap": "basement" } + ] + }, + { + "type": "city_building", + "id": "house_10", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "house_10_north" }, + { "point": [ 0, 0, 1 ], "overmap": "house_10_roof_north" }, + { "point": [ 0, 0, -1 ], "overmap": "basement" } + ] + }, { "type": "city_building", "id": "house_w_1", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index 6c66eb454fd06..c6e21a8e0f41a 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -355,6 +355,75 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_06", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_07", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_08", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_08_roof", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2 + }, + { + "type": "overmap_terrain", + "id": "house_09", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_09_roof", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2 + }, + { + "type": "overmap_terrain", + "id": "house_10", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_10_roof", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2 + }, { "type": "overmap_terrain", "id": "house_w_2", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 8233cafa36c5a..afcbb7523705f 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -547,6 +547,11 @@ "house_w_5": 50, "house_w_6": 50, "house_04": 50, + "house_06": 50, + "house_07": 50, + "house_08": 50, + "house_09": 50, + "house_10": 50, "house_inner_garden": 40, "emptyresidentiallot": 20, "apartments_con_new": 10,