From 07f7a183371a21ab2fa89c629cdb04a416fec5c9 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Fri, 7 Feb 2020 20:10:20 -0500 Subject: [PATCH] Mapgen fixes for curstwist maps --- data/json/mapgen/animalshelter.json | 2 +- data/json/mapgen/dispensary.json | 4 ++-- data/json/mapgen/dollar_store.json | 3 ++- data/json/mapgen/farm_horse.json | 2 +- data/json/mapgen/house/house03.json | 1 + data/json/mapgen/house/house_detatched4.json | 2 +- data/json/mapgen/house/house_duplex4.json | 2 +- data/json/mapgen/house/house_w_6.json | 2 +- .../isherwood_farms/farm_horse_isherwood.json | 4 ++-- data/json/mapgen/library.json | 2 +- data/json/mapgen/mall.json | 5 +++-- .../mapgen/nested/city_npc_nested_spawns.json | 2 +- data/json/mapgen/nested/house_nested.json | 16 ++++++++-------- data/json/mapgen/roadstop.json | 2 +- data/json/mapgen/s_coffee.json | 2 +- data/json/mapgen/s_liquor.json | 2 +- .../mapgen_palettes/hotel_tower_palette.json | 1 + data/json/mapgen_palettes/house_w_palette.json | 1 + data/json/mapgen_palettes/junkyard_palette.json | 1 + .../mapgen_palettes/movie_theater_palette.json | 1 + 20 files changed, 32 insertions(+), 25 deletions(-) diff --git a/data/json/mapgen/animalshelter.json b/data/json/mapgen/animalshelter.json index 893bf99886489..c3b85fa9e0a39 100644 --- a/data/json/mapgen/animalshelter.json +++ b/data/json/mapgen/animalshelter.json @@ -278,7 +278,7 @@ " |..................3 ", " |..................3 ", " |..................3 ", - " |.......X..........3 ", + " |..................3 ", " |..................3 ", " |..................3 ", " |..................3 ", diff --git a/data/json/mapgen/dispensary.json b/data/json/mapgen/dispensary.json index 1703195afe00f..b60b886f22b75 100644 --- a/data/json/mapgen/dispensary.json +++ b/data/json/mapgen/dispensary.json @@ -467,13 +467,13 @@ " |..................3 ", " |..................3 ", " |..................3 ", - " |.....x............3 ", + " |..................3 ", " |..................3 ", " |..................3 ", " |..................3 ", " |..................3 ", " 5..................3 ", - " |.....x............3 ", + " |..................3 ", " |................&.3 ", " |..................3 ", " |2222222222...222223 ", diff --git a/data/json/mapgen/dollar_store.json b/data/json/mapgen/dollar_store.json index ba1378d2f8620..7a82b5db2a19e 100644 --- a/data/json/mapgen/dollar_store.json +++ b/data/json/mapgen/dollar_store.json @@ -231,6 +231,7 @@ "U": "f_dumpster", "L": "f_locker", "h": "f_chair", + "y": "f_indoor_plant", "p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ] }, "toilets": { "T": { } }, @@ -284,7 +285,7 @@ " |..................3 ", " |..................3 ", " |..................3 ", - " |..........x.......3 ", + " |..................3 ", " |..................3 ", " |..................3 ", " |..................3 ", diff --git a/data/json/mapgen/farm_horse.json b/data/json/mapgen/farm_horse.json index 8e0f767864d3d..f9b129d7c73f7 100644 --- a/data/json/mapgen/farm_horse.json +++ b/data/json/mapgen/farm_horse.json @@ -209,7 +209,7 @@ " wwwwwww.....wwwwwww ", " w..6..>.........6.w ", " w...6.........6...w ", - " w......*****`.....w ", + " w......*****......w ", " wwww...*****...wwww ", " w......*****....66w ", " w.6.6..*****....66w ", diff --git a/data/json/mapgen/house/house03.json b/data/json/mapgen/house/house03.json index 748f2f3960941..3ef9e7d674aa0 100644 --- a/data/json/mapgen/house/house03.json +++ b/data/json/mapgen/house/house03.json @@ -206,6 +206,7 @@ "|": "t_brick_wall" }, "furniture": { + "&": "f_sink", "#": "f_counter", "C": "f_cupboard", "F": "f_fridge", diff --git a/data/json/mapgen/house/house_detatched4.json b/data/json/mapgen/house/house_detatched4.json index 7f8b992f52ad4..482ae6416eb3b 100644 --- a/data/json/mapgen/house/house_detatched4.json +++ b/data/json/mapgen/house/house_detatched4.json @@ -170,7 +170,7 @@ " |..........X......3 ", " |.................3 ", " |.................3 ", - " 6....=...........~3 ", + " 5....=...........~3 ", " |..........N......3 ", " |.................3 ", " |.................3 ", diff --git a/data/json/mapgen/house/house_duplex4.json b/data/json/mapgen/house/house_duplex4.json index 2994a138a4bda..07132bb93207a 100644 --- a/data/json/mapgen/house/house_duplex4.json +++ b/data/json/mapgen/house/house_duplex4.json @@ -20,7 +20,7 @@ "..o@@ | hfh||hfh | @@o..", "..o | T| | @@o..", "..# + HH |x H + #..", - ".^#Ddb| E x|x H |Db{#^.", + ".^#Ddb| E x|x H |Dbd#^.", "..#|||| s x|x H ||||#..", "..#d + E R|R + II#..", "..o@@ | RR| | ho..", diff --git a/data/json/mapgen/house/house_w_6.json b/data/json/mapgen/house/house_w_6.json index 6ff717ee0d8d2..608574e4acaef 100644 --- a/data/json/mapgen/house/house_w_6.json +++ b/data/json/mapgen/house/house_w_6.json @@ -164,7 +164,7 @@ " |..............3 ", " |..............3 ", " |..............3 ", - " |.............Z3 ", + " |..............3 ", " ||..............3 ", " |...............3 ", " |...............3 ", diff --git a/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json b/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json index a1c140074f138..5cc74f1ad32ed 100644 --- a/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json +++ b/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json @@ -116,7 +116,7 @@ "..%....-vvv-...p.p..........,,..,,.......................9...9..9..////...9...///..9....9..9.%..", "..%..9................9...9.,,..,,.9..9..9...9..99...9..9....9...9..9///9...///.......9......%..", "..%.9...0.....9...9..9.9...9,,..,,...9..99...9..9..........9...9..9....//////...9....9..9....%..", - "..%...9....9.......9...9..9.,,..,,.9..9...9..99...9..9.9...9..9.9...9..9..9..x.9..99...9..9...%..", + "..%...9....9.......9...9..9.,,..,,.9..9...9..99...9..9.9...9..9.9...9..9..9...9..99...9..9...%..", "..%%%%%%%%%%%%%%%%%%%%%%%%%%,,..,,%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%..", "..%.........................,,..,,...........................................................%.." ], @@ -242,7 +242,7 @@ " wwwwwww.....wwwwwww ", " w..6..>.........6.w ", " w...6.........6...w ", - " w......*****`.....w ", + " w......*****......w ", " wwww...*****...wwww ", " w......*****....66w ", " w.6.6..*****....66w ", diff --git a/data/json/mapgen/library.json b/data/json/mapgen/library.json index f6bd0c28a718a..f67cbe45aef1c 100644 --- a/data/json/mapgen/library.json +++ b/data/json/mapgen/library.json @@ -143,7 +143,7 @@ " |....................3 ", " |....................3 ", " |....................3 ", - " |.....x..............3 ", + " |....................3 ", " |....................3 ", " |....................3 ", " |....................3 ", diff --git a/data/json/mapgen/mall.json b/data/json/mapgen/mall.json index 0416aa3025705..c232134a11f14 100644 --- a/data/json/mapgen/mall.json +++ b/data/json/mapgen/mall.json @@ -4052,6 +4052,7 @@ ">": "t_stairs_down", "|": "t_wall_w", "E": "t_elevator", + "=": "t_door_c", "_": "t_thconc_floor" }, "place_items": [ { "item": "roof_trash", "x": [ 0, 8 ], "y": [ 0, 23 ], "chance": 50, "repeat": [ 1, 3 ] } ] @@ -6511,7 +6512,7 @@ "..........3 ", "..........3 " ], - "terrain": { ".": "t_flat_roof", " ": "t_open_air", "3": "t_gutter_east" }, + "terrain": { ".": "t_flat_roof", " ": "t_open_air", "3": "t_gutter_east", "o": "t_glass_roof" }, "place_items": [ { "item": "roof_trash", "x": [ 0, 8 ], "y": [ 0, 23 ], "chance": 50, "repeat": [ 1, 3 ] } ] } }, @@ -7350,7 +7351,7 @@ "........................", "........................", "........................", - ".......................-", + "........................", "........................", "........................", "........................", diff --git a/data/json/mapgen/nested/city_npc_nested_spawns.json b/data/json/mapgen/nested/city_npc_nested_spawns.json index b0f1290eb3fd3..ffcdf42162586 100644 --- a/data/json/mapgen/nested/city_npc_nested_spawns.json +++ b/data/json/mapgen/nested/city_npc_nested_spawns.json @@ -52,7 +52,7 @@ "_L.7____________________", "_L.7____________________", "_L.7____________________", - "_L.2mtb.________________", + "_L..mtb.________________", "_L....._________________", "_LLLLLL.________________" ], diff --git a/data/json/mapgen/nested/house_nested.json b/data/json/mapgen/nested/house_nested.json index 58bbbd13736b8..ffd95d71e5cbb 100644 --- a/data/json/mapgen/nested/house_nested.json +++ b/data/json/mapgen/nested/house_nested.json @@ -218,7 +218,7 @@ " O", "66EE", "66EE", - " 0" + " O" ], "palettes": [ "house_w_nest_palette" ], "items": { @@ -241,7 +241,7 @@ " O", "I EE", "h EE", - " 0" + " O" ], "palettes": [ "house_w_nest_palette" ], "items": { @@ -264,7 +264,7 @@ " O", "b EE", "H EE", - " 0" + " O" ], "palettes": [ "house_w_nest_palette" ], "items": { @@ -306,7 +306,7 @@ "mapgensize": [ 4, 4 ], "rotation": [ 0, 3 ], "rows": [ - "0 ", + "O ", "EE66", "EE66", "O " @@ -329,7 +329,7 @@ "mapgensize": [ 4, 4 ], "rotation": [ 0, 3 ], "rows": [ - "0 ", + "O ", "EE h", "EE I", "O " @@ -352,7 +352,7 @@ "mapgensize": [ 4, 4 ], "rotation": [ 0, 3 ], "rows": [ - "0 ", + "O ", "EE H", "EE b", "O " @@ -1332,8 +1332,8 @@ "mapgensize": [ 3, 3 ], "rotation": [ 0, 3 ], "rows": [ - "T @", - "T @", + "L @", + "L @", "C @" ], "palettes": [ "house_w_nest_palette" ], diff --git a/data/json/mapgen/roadstop.json b/data/json/mapgen/roadstop.json index 64655e37e63ef..5cf1c4fffd72b 100644 --- a/data/json/mapgen/roadstop.json +++ b/data/json/mapgen/roadstop.json @@ -72,7 +72,7 @@ "...... .. ......", "...... .. ......", ".A.... ...A..", - ".+.&.. .. ...=..", + ".=.&.. .. ...=..", "...... .. ......", "...... .. ...&..", "...... .. ......", diff --git a/data/json/mapgen/s_coffee.json b/data/json/mapgen/s_coffee.json index f7423cec4e08c..6b005ff91ba5b 100644 --- a/data/json/mapgen/s_coffee.json +++ b/data/json/mapgen/s_coffee.json @@ -462,7 +462,7 @@ "__|..................3__", "__|..................3__", "__|..................3__", - "__|......>.........:.3__", + "__|......>...........3__", "__|.......311111151113__", "__|.......3_____________", "__|.......3_____________", diff --git a/data/json/mapgen/s_liquor.json b/data/json/mapgen/s_liquor.json index 8641eb5bd31e5..c3b46ee2a130c 100644 --- a/data/json/mapgen/s_liquor.json +++ b/data/json/mapgen/s_liquor.json @@ -96,7 +96,7 @@ " |................3 ", " |................3 ", " |.&..............3 ", - " |.+..............3 ", + " |.=..............3 ", " -5----...........3 ", " |......>....3 ", " |...........3 ", diff --git a/data/json/mapgen_palettes/hotel_tower_palette.json b/data/json/mapgen_palettes/hotel_tower_palette.json index 7be076aff6d74..6a0b5d0f93b39 100644 --- a/data/json/mapgen_palettes/hotel_tower_palette.json +++ b/data/json/mapgen_palettes/hotel_tower_palette.json @@ -9,6 +9,7 @@ "d": "f_dresser", "o": "f_counter", "D": "f_dryer", + "Y": "f_rack_coat", "^": [ "f_indoor_plant_y", "f_indoor_plant" ], "h": "f_chair", "r": "f_rack", diff --git a/data/json/mapgen_palettes/house_w_palette.json b/data/json/mapgen_palettes/house_w_palette.json index b4844b361a8c2..7d83fa5b9f07c 100644 --- a/data/json/mapgen_palettes/house_w_palette.json +++ b/data/json/mapgen_palettes/house_w_palette.json @@ -101,6 +101,7 @@ "X": "f_birdbath", "Y": "f_trashcan", "Z": "f_dryer", + "a": [ "f_floor_lamp", "f_rack_coat" ], "d": "f_shower", "g": "f_water_heater", "h": "f_fireplace", diff --git a/data/json/mapgen_palettes/junkyard_palette.json b/data/json/mapgen_palettes/junkyard_palette.json index d1984b32dff3c..77b34233e0952 100644 --- a/data/json/mapgen_palettes/junkyard_palette.json +++ b/data/json/mapgen_palettes/junkyard_palette.json @@ -13,6 +13,7 @@ "D": "t_door_c", "S": "t_sidewalk", "q": "t_door_metal_locked", + "f": "t_floor", "c": "t_carpet_red", "n": "t_carpet_red", "r": "t_reinforced_door_glass_c", diff --git a/data/json/mapgen_palettes/movie_theater_palette.json b/data/json/mapgen_palettes/movie_theater_palette.json index 5c53aa82be8c4..87e6569e2813e 100644 --- a/data/json/mapgen_palettes/movie_theater_palette.json +++ b/data/json/mapgen_palettes/movie_theater_palette.json @@ -39,6 +39,7 @@ "f": "t_carpet_purple", "e": "t_carpet_purple", ".": "t_thconc_floor", + "_": "t_floor", "!": "t_brick_wall", "|": "t_wall_b", "%": "t_wall_glass",