Merge pull request #39641 from curstwist/basement-variety-4

basement variety 4
CleverRaven · Apr 18, 2020 · 5be47a0 · 5be47a0
2 parents ceb2fd6 + 69baa2d
commit 5be47a0
Show file tree

Hide file tree

Showing 5 changed files with 684 additions and 35 deletions.
diff --git a/data/json/mapgen/house/house12.json b/data/json/mapgen/house/house12.json
@@ -87,16 +87,16 @@
         "                        ",
         "                        ",
         "            |||||||||   ",
-        "            |.......|   ",
+        "            |2......|   ",
         "            |.......|   ",
         "            |.......|   ",
         "            |.......|   ",
         "          |||.......|   ",
         "          |F........|   ",
-        "  |||||||||g........|   ",
-        "  |................||   ",
-        "  |................|    ",
+        "  |||||||||.........|   ",
+        "  |1...............||   ",
         "  |................|    ",
+        "  |...............g|    ",
         "  |................|    ",
         "  |...........z...U|    ",
         "  |.............z.z|    ",
@@ -106,7 +106,11 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "basement_empty" ]
+      "palettes": [ "basement_empty" ],
+      "nested": {
+        "1": { "chunks": [ [ "null", 70 ], [ "7x7_tent_indoors", 10 ], [ "7x7_band_practice_open", 30 ] ] },
+        "2": { "chunks": [ [ "null", 70 ], [ "room_7x7_recroom_S", 30 ], [ "room_7x7_wine_cellar_S", 30 ] ] }
+      }
     }
   }
 ]
diff --git a/data/json/mapgen/house/house_detatched2.json b/data/json/mapgen/house/house_detatched2.json
@@ -117,7 +117,7 @@
         "                        ",
         "                        ",
         "      ||||||||||||||||  ",
-        "      |..........<%ZJ|  ",
+        "      |1.........<%ZJ|  ",
         "      |...........+.W|  ",
         "      |...........%%%|  ",
         "      |...........U.g|  ",
@@ -139,7 +139,8 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "basement_empty" ]
+      "palettes": [ "basement_empty" ],
+      "nested": { "1": { "chunks": [ [ "null", 60 ], [ "8x8_gym_E", 10 ], [ "room_8x8_hobby_E", 30 ] ] } }
     }
   }
 ]
diff --git a/data/json/mapgen/house/house_porch.json b/data/json/mapgen/house/house_porch.json
@@ -111,22 +111,34 @@
         "                        ",
         "                        ",
         " ||||||||||||           ",
-        " |....F..g..|           ",
-        " |..........|           ",
-        " |..........||||||||||| ",
-        " |....................| ",
+        " |1......%St|           ",
+        " |.......%..|           ",
+        " |.......%+%||||||||||| ",
+        " |...........2........| ",
         " |....................| ",
         " |....................| ",
         " |....................| ",
         " ||||||...............| ",
-        "      |...............| ",
-        "      |...............| ",
-        "      |...............| ",
-        "      |<...JJZJW......| ",
+        "      |Z..............| ",
+        "      |W..............| ",
+        "      |J..............| ",
+        "      |<.F.g..........| ",
         "      ||||||||||||||||| ",
         "                        "
       ],
-      "palettes": [ "basement_empty" ]
+      "palettes": [ "basement_empty" ],
+      "nested": {
+        "1": {
+          "chunks": [
+            [ "null", 70 ],
+            [ "room_7x7_recroom_E", 30 ],
+            [ "room_7x7_wine_cellar_E", 30 ],
+            [ "7x7_tent_indoors", 10 ],
+            [ "7x7_band_practice_open", 30 ]
+          ]
+        },
+        "2": { "chunks": [ [ "null", 75 ], [ "room_9x9_cellar_W", 20 ], [ "room_9x9_weed_W", 5 ] ] }
+      }
     }
   }
 ]
diff --git a/data/json/mapgen/house/house_rv.json b/data/json/mapgen/house/house_rv.json
@@ -93,7 +93,7 @@
       "rows": [
         "                        ",
         "           |||||||||||| ",
-        "           |..........| ",
+        "           |1.........| ",
         "           |..........| ",
         "           |..........| ",
         "           |..........| ",
@@ -104,19 +104,30 @@
         "           |..........| ",
         "           |..........| ",
         " |||||||||||..........| ",
-        " |.F.g................| ",
-        " |....................| ",
-        " |....................| ",
+        " |2...................| ",
         " |....................| ",
+        " |...................F| ",
         " |....................| ",
+        " |...................g| ",
         " |....................| ",
         " |................A...| ",
         " |...................U| ",
         " |..........<...WJJZ.U| ",
         " |||||||||||||||||||||| ",
         "                        "
       ],
-      "palettes": [ "basement_empty" ]
+      "palettes": [ "basement_empty" ],
+      "nested": {
+        "1": {
+          "chunks": [
+            [ "null", 70 ],
+            [ "room_10x10_pool_S", 10 ],
+            [ "room_10x10_recording_studio_S", 30 ],
+            [ "room_10x10_woodworker_S", 30 ]
+          ]
+        },
+        "2": { "chunks": [ [ "null", 75 ], [ "room_9x9_cellar_E", 20 ], [ "room_9x9_weed_E", 5 ], [ "room_9x9_recroom_E", 30 ] ] }
+      }
     }
   }
 ]