diff --git a/data/json/mapgen/basement/basement_messed.json b/data/json/mapgen/basement/basement_messed.json index 4372b320c3dae..94bd53953ea19 100644 --- a/data/json/mapgen/basement/basement_messed.json +++ b/data/json/mapgen/basement/basement_messed.json @@ -2,32 +2,32 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "basement" ], + "om_terrain": "basement_messed", + "//": "used for house_crack1, house_crack2", "weight": 250, "object": { - "rotation": [ 0, 3 ], "fill_ter": "t_rock", "rows": [ " ", " ", " ", + " |||||||||||| ", + " |a.aaHHbbbr| ", + " |a.......ar| ", + " |a..a||||||| ", + " |a..aaaarrr| ", + " |a.a.aaaaaa| ", + " |aa....arrr| ", + " |||..|++|||| ", + " |E..a|.<| ", + " |W..r|||| ", + " |||||| ", " ", " ", " ", " ", " ", " ", - " |||||||||||| ", - " |a.aaHHbbbr| ", - " |a.......ar| ", - " |a..a||||||| ", - " |a..aaaarrr| ", - " |a.a.aaaaaa| ", - " |aa....arrr| ", - " |||..|++|||| ", - " |E..a|..| ", - " |W..r|<<| ", - " ||||||||| ", " ", " ", " ", @@ -84,7 +84,7 @@ ], "b": [ { "item": "home_hw", "chance": 60 }, { "item": "mechanics", "chance": 30 } ] }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 12, 16 ] } ] + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 4, 13 ], "y": [ 4, 9 ] } ] } } ] diff --git a/data/json/mapgen/house/crack_house.json b/data/json/mapgen/house/crack_house.json index 830097b934a0f..e68ebdc45a20f 100644 --- a/data/json/mapgen/house/crack_house.json +++ b/data/json/mapgen/house/crack_house.json @@ -315,5 +315,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_crack3_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " |||||||||||||| ", + " |............| ", + " |............| ", + " ||||............| ", + " |F.g............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |J..............| ", + " |W.A.......z....| ", + " |JZJ..<...zz...z| ", + " ||||||||||||||||| ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house18.json b/data/json/mapgen/house/house18.json index 7fd9de898d40c..063337bf9bdfd 100644 --- a/data/json/mapgen/house/house18.json +++ b/data/json/mapgen/house/house18.json @@ -24,7 +24,7 @@ ".#312FY |+|+| 6612#..", ".#|||||| | ||||||#..", ".#TRIR | ||||| |RRb #..", - ".#E + +>|>+ + d#..", + ".#E + +U|U+ + d#..", ".oy E|+|||||+| @@o..", ".od b|S$B|B$S|E @@o..", ".# s|t$B|B$t|T d#..", diff --git a/data/json/mapgen/house/house23.json b/data/json/mapgen/house/house23.json index 30c42ee35495b..c11b88794cb86 100644 --- a/data/json/mapgen/house/house23.json +++ b/data/json/mapgen/house/house23.json @@ -20,8 +20,8 @@ "`.# E| |J no..", "`.#yxxx 7#..", "`.#|||| hhh Y#..", - "`.#S--+ fff y 6#..", - "`.#98t| hhh|>| RR Y6#..", + "`.#S--+ fff 6#..", + "`.#98t| hhh Ty RR Y6#..", "`.#####*###|||+||+|||#..", "`......``^#db T| dD#^.", "`````````!o I| o..", diff --git a/data/json/mapgen/house/house_fortified.json b/data/json/mapgen/house/house_fortified.json index e428a1f242905..fb072aac848a5 100644 --- a/data/json/mapgen/house/house_fortified.json +++ b/data/json/mapgen/house/house_fortified.json @@ -104,5 +104,40 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_fortified_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " |||||||||||||| ", + " |............| ", + " |............| ", + " |............| ", + " |............| ", + " |............| ", + " |............| ", + " |............| ", + " |............| ", + " |............| ", + " |||||||||............| ", + " |....................| ", + " |....................| ", + " |...................<| ", + " |....................| ", + " |...................W| ", + " |...................Z| ", + " |||||||||||..........| ", + " |..........| ", + " |..........| ", + " |........gF| ", + " |||||||||||| ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house_garage_prepper.json b/data/json/mapgen/house/house_garage_prepper.json index 890f2f19b4a89..bed34f5a3a221 100644 --- a/data/json/mapgen/house/house_garage_prepper.json +++ b/data/json/mapgen/house/house_garage_prepper.json @@ -154,5 +154,40 @@ } ] } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_prepper2_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " |||||||||||||||||||||| ", + " |....................| ", + " |....................| ", + " |..............zz...g| ", + " |..............z.....| ", + " |................z..F| ", + " |....................| ", + " |....................| ", + " |...................Z| ", + " |...................J| ", + " |...................W| ", + " |....................| ", + " |...................<| ", + " |....................| ", + " |....................| ", + " |....................| ", + " ||||||...............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " |...............| ", + " ||||||||||||||||| ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/mapgen/house/house_prepper.json b/data/json/mapgen/house/house_prepper.json index 34a1dfc26a6a5..bc436d0775bb0 100644 --- a/data/json/mapgen/house/house_prepper.json +++ b/data/json/mapgen/house/house_prepper.json @@ -68,5 +68,40 @@ { "monster": "GROUP_PEST", "x": [ 2, 21 ], "y": [ 13, 21 ], "chance": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_prepper_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " |||||||||||||||||||||| ", + " |...............g.F..| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |.........%.<...WJJZU| ", + " |.........%%%%%%%%%%%| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |....................| ", + " |||||||||||||||||||||| ", + " " + ], + "palettes": [ "basement_empty" ] + } } ] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 79192fd599204..0ed8e23347f02 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -246,11 +246,7 @@ "type": "city_building", "id": "house_18", "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "house_18_north" }, - { "point": [ 0, 0, 1 ], "overmap": "house_18_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } - ] + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_18_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_18_roof_north" } ] }, { "type": "city_building", @@ -3194,7 +3190,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_prepper_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_04_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_prepper_basement_north" } ] }, { @@ -3204,7 +3200,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_prepper2_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_prepper2_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_prepper2_basement_north" } ] }, { @@ -3214,7 +3210,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_fortified_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_fortified_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_fortified_basement_north" } ] }, { @@ -3224,7 +3220,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_crack1_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_crack1_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "basement_messed_north" } ] }, { @@ -3234,7 +3230,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_crack2_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_crack1_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "basement_messed_north" } ] }, { @@ -3244,7 +3240,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_crack3_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_crack3_roof_north" }, - { "point": [ 0, 0, -1 ], "overmap": "basement" } + { "point": [ 0, 0, -1 ], "overmap": "house_crack3_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 2f15971ba4b2a..4e0a9394b9541 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -63,6 +63,11 @@ "see_cost": 2, "flags": [ "SIDEWALK", "GENERIC_LOOT" ] }, + { + "type": "overmap_terrain", + "id": "house_prepper_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_prepper2", @@ -80,6 +85,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_prepper2_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_fortified", @@ -97,6 +107,11 @@ "color": "light_green", "see_cost": 2 }, + { + "type": "overmap_terrain", + "id": "house_fortified_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "duplex", @@ -1789,6 +1804,11 @@ "see_cost": 2, "flags": [ "SIDEWALK", "GENERIC_LOOT" ] }, + { + "type": "overmap_terrain", + "id": "basement_messed", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_crack1_roof", @@ -1815,6 +1835,11 @@ "see_cost": 2, "flags": [ "SIDEWALK", "GENERIC_LOOT" ] }, + { + "type": "overmap_terrain", + "id": "house_crack3_basement", + "copy-from": "generic_city_house_basement" + }, { "type": "overmap_terrain", "id": "house_crack3_roof",