map fixes (#40113)

CleverRaven · May 4, 2020 · 6b7fa02 · 6b7fa02
1 parent 0c4d9b2
commit 6b7fa02
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 43 deletions.
diff --git a/data/json/mapgen/campus/buildings/admin_f0.json b/data/json/mapgen/campus/buildings/admin_f0.json
@@ -39,22 +39,22 @@
         "__|,,,,,,,,,,,,|________",
         "__|,,,,,,,,,,,,|________",
         "__|,,,,,,,,,,,,|________",
-        "bb|,,,,,,,,,,,,||||||||||",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,,,,,,,,|",
-        "..|,,,,,,,,,,,,,,||||||||",
+        "bb|,,,,,,,,,,,,|||||||||",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,,,,,,,|",
+        "..|,,,,,,,,,,,,,,|||||||",
         ".||,,,,,,,,,,,,,,|.....b",
         ".|,,,,,,,,,,,,,,,|.....b",
         ".|,,,,,,,,,,,,,,,|.....b",

diff --git a/data/json/mapgen/campus/buildings/admin_f1.json b/data/json/mapgen/campus/buildings/admin_f1.json
@@ -39,22 +39,22 @@
         "  |,,,,,,,,,,,,|        ",
         "  |,,,,,,,,,,,,|        ",
         "  |,,,,,,,,,,,,|        ",
-        "  |,,,,,,,,,,,,||||||||||",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,,,,,,,,|",
-        "  |,,,,,,,,,,,,,,||||||||",
+        "  |,,,,,,,,,,,,|||||||||",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,,,,,,,|",
+        "  |,,,,,,,,,,,,,,|||||||",
         " ||,,,,,,,,,,,,,,|      ",
         " |,,,,,,,,,,,,,,,|      ",
         " |,,,,,,,,,,,,,,,|      ",

diff --git a/data/json/mapgen/dumpsite.json b/data/json/mapgen/dumpsite.json
@@ -49,7 +49,7 @@
         "........................",
         "........................",
         "..........^^^^.^........",
-        ".......q^^__^_^_qq.......",
+        ".......q^^__^_^_qq......",
         ".......q.________^q.....",
         ".....q^qq^______^^.q....",
         "....q^^qq_______^^q.....",

diff --git a/data/json/mapgen/hotel_tower.json b/data/json/mapgen/hotel_tower.json
@@ -364,7 +364,7 @@
         "******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****",
         "******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****",
         "******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****",
-        "*************************************************************************"
+        "************************************************************************"
       ],
       "palettes": [ "hotel_tower_palette.json" ],
       "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" },

diff --git a/data/json/mapgen/house/house05_ab.json b/data/json/mapgen/house/house05_ab.json
@@ -30,7 +30,7 @@
         ".#         |          #.",
         ".#         |          #.",
         ".####oo#########oo#####.",
-        "............^............"
+        "............^..........."
       ],
       "set": [
         { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },

diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json
@@ -2194,7 +2194,7 @@
         "########################",
         "########################",
         "####----------------####",
-        "####|              | ####",
+        "####|              | ###",
         "####|              -----",
         "####|I            I     ",
         "####|                   ",

diff --git a/data/json/mapgen/steel_mill/steel_mill_z1.json b/data/json/mapgen/steel_mill/steel_mill_z1.json
@@ -13,7 +13,7 @@
       "fill_ter": "t_thconc_floor",
       "rows": [
         "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv._______,,_______.vvvvvvvvvvvvvvvvvvvvvvvvvvv",
-        "v..................................................._______,,_______............................v",
+        "v..................................................._______,,_______...........................v",
         "v..................................................___________________________________,,,,,,,,.v",
         "v....]]]]]]]]]]]]**]]]**]]**]]**].................____________________________________________.v",
         "v....]ee]ee]<< #ch  #ch  #Sch  S]-------------..._____________________________________________.v",

diff --git a/data/json/mapgen/steel_mill/steel_mill_z2.json b/data/json/mapgen/steel_mill/steel_mill_z2.json
@@ -12,7 +12,7 @@
     "object": {
       "fill_ter": "t_carpet_concrete",
       "rows": [
-        ":::::::::::::::::::::::::::::::1:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
+        ":::::::::::::::::::::::::::::::1::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
         "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
         "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
         ":::::]]]]]]]]]]]]**]]]**]]**]]**]:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",

diff --git a/data/json/mapgen/trailhead.json b/data/json/mapgen/trailhead.json
@@ -101,7 +101,7 @@
         ";;;...................;;",
         ";;;...................;;",
         ";;...              ..;;;",
-        ";;...  .     .   .  .;;;;",
+        ";;...  .     .   .  .;;;",
         ";;;.. .            ;;;;;",
         ";;;;.   .      . . ;;;;;",
         ";;;;;              ;;;;;",

diff --git a/data/mods/Magiclysm/worldgen/black_dragon_lair.json b/data/mods/Magiclysm/worldgen/black_dragon_lair.json
@@ -437,7 +437,7 @@
         "X    XXXXX XXX  XXXXXX <<       XXXXXXX <<  XXXX",
         "X   XXXXX  XXX  XXXXXXXXXXXXXX  XX  XXX <<  XXXX",
         "X  XXXX     XX  XXX XXXXXXXXX   XX   XXXXX   XXX",
-        "X  XXX  <<  XX  XXX                  XXXXXX  XXXX",
+        "X  XXX  <<  XX  XXX                  XXXXXX  XXX",
         "X  XXX  <<  XX  XX               XX  XXXX    XXX",
         "X   XXX    XXX  XX   XX    XXX  XXXXXXX       XX",
         "X    XXXX  XXX   X  XXXX  XXX   XXXXXX   XXX   X",

diff --git a/data/mods/mapspecials_demo/megastore/mega_2brc_01.json b/data/mods/mapspecials_demo/megastore/mega_2brc_01.json
@@ -11,7 +11,7 @@
         "########################",
         "########################",
         "####----------------####",
-        "####|              | ####",
+        "####|              | ###",
         "####|              -----",
         "####|I            I     ",
         "####|                   ",

diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlca_01.json b/data/mods/mapspecials_demo/missile_silo/silo_utlca_01.json
@@ -22,7 +22,7 @@
         "##............x.########",
         "##..............X##..###",
         "##.x.X..X............---",
-        "####...##................",
+        "####...##...............",
         "#############...........",
         "############.........~~~",
         "##-----#########...~~~~~",

diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlca_02.json b/data/mods/mapspecials_demo/missile_silo/silo_utlca_02.json
@@ -13,7 +13,7 @@
         "#################-------",
         "################-|....D.",
         "###############-|....c6.",
-        "###############|6..D...D.",
+        "###############|6..D..D.",
         "##---------####|4.c6....",
         "##|...|eee|####|6..D..D.",
         "##|.<.|eee|####-|....c6.",