fix high tech low life start

CleverRaven · Jan 28, 2020 · afdea39 · afdea39
1 parent 3da5eb4
commit afdea39
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 25 deletions.
diff --git a/data/json/mapgen/basement/basement_bionic.json b/data/json/mapgen/basement/basement_bionic.json
@@ -5,9 +5,14 @@
     "om_terrain": [ "basement_bionic" ],
     "weight": 100,
     "object": {
-      "rotation": [ 0, 3 ],
       "fill_ter": "t_rock_floor",
       "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
         "     |----------        ",
         "     |?..i|..LL|        ",
         "     |/...+L...|        ",
@@ -23,14 +28,8 @@
         "|................|-----|",
         "|......|+-|++|...|&...i|",
         "|......|.W|..|...+....C|",
-        "|..}...|.F|<<|...|.cc.*|",
+        "|..}...|.F|.<|...|.cc.*|",
         "------------------------",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
         "                        "
       ],
       "palettes": [ "basement_game" ],
@@ -79,11 +78,17 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement" ],
-    "weight": 500,
+    "weight": 100,
     "object": {
       "rotation": [ 0, 3 ],
       "fill_ter": "t_rock_floor",
       "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
         "          ------        ",
         "          |..LL|        ",
         "          |L...|        ",
@@ -101,12 +106,6 @@
         "|......|.W|..|...+....C|",
         "|..}...|.F|<<|...|.cc.*|",
         "------------------------",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
         "                        "
       ],
       "palettes": [ "basement_game" ],

diff --git a/data/json/mapgen/house/house09.json b/data/json/mapgen/house/house09.json
@@ -26,10 +26,10 @@
         ".#|||||||||| |||||+|||#.",
         ".#d     IID|         so.",
         ".#@@    h  +   y     so.",
-        ".#@@       |y |||+||||#.",
-        ".#d       E||+|Q      #.",
-        ".#     R  T|>>|UUdA ZW#.",
-        ".####oo#####o##########.",
+        ".#@@       | y|||+||||#.",
+        ".#d       E|+||Q      #.",
+        ".#     R  T|>q|UUdA ZW#.",
+        ".####oo################.",
         "...................^...."
       ],
       "palettes": [ "standard_domestic_palette" ],

diff --git a/data/json/mapgen_palettes/basement.json b/data/json/mapgen_palettes/basement.json
@@ -61,9 +61,9 @@
     "terrain": {
       " ": "t_rock",
       "+": "t_door_c",
-      "-": "t_wall",
+      "-": "t_wall_w",
       ".": "t_rock_floor",
-      "<": "t_stairs_up",
+      "<": "t_wood_stairs_up",
       "&": "t_rock_floor",
       "*": "t_rock_floor",
       "%": "t_rock_floor",
@@ -98,7 +98,7 @@
       "l": "t_floor",
       "B": "t_floor",
       "M": "t_floor",
-      "|": "t_wall",
+      "|": "t_wall_w",
       "1": "t_wall_log"
     },
     "furniture": {

diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -319,7 +319,7 @@
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "house_09_north" },
       { "point": [ 0, 0, 1 ], "overmap": "house_09_roof_north" },
-      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+      { "point": [ 0, 0, -1 ], "overmap": "basement_bionic_north" }
     ]
   },
   {

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
@@ -17,8 +17,7 @@
   {
     "type": "overmap_terrain",
     "id": "basement_bionic",
-    "copy-from": "generic_city_house_basement",
-    "extend": { "flags": [ "NO_ROTATE" ] }
+    "copy-from": "generic_city_house_basement"
   },
   {
     "type": "overmap_terrain",