Merge pull request #39483 from curstwist/basement-variety-1

add nested basement maps
CleverRaven · Apr 13, 2020 · c6dd457 · c6dd457
2 parents 7bd2498 + 6120e9f
commit c6dd457
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 27 deletions.
diff --git a/data/json/mapgen/house/house14.json b/data/json/mapgen/house/house14.json
@@ -101,23 +101,24 @@
         " |..+....|              ",
         " |S8%.%WZ|              ",
         " |%%%.%%%|||||||||||||  ",
-        " |.................F.|  ",
-        " |...............z...|  ",
-        " |............z......|  ",
-        " |...................|  ",
-        " |.....|.......|.....|  ",
+        " |zzz....1...........|  ",
+        " |zz.................|  ",
+        " |.z.................|  ",
         " |...................|  ",
+        " |g....|.......|.....|  ",
         " |...................|  ",
+        " |F..................|  ",
         " |...................|  ",
         " |<..................|  ",
-        " ||||||||......z.....|  ",
-        "        |.........z..|  ",
-        "        |........zz..|  ",
+        " ||||||||............|  ",
+        "        |............|  ",
+        "        |............|  ",
         "        ||||||||||||||  ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "basement_empty" ]
+      "palettes": [ "basement_empty" ],
+      "nested": { "1": { "chunks": [ [ "recroom_12x12", 33 ], [ "tvroom_12x12", 33 ], [ "workoutroom_12x12", 33 ] ] } }
     }
   }
 ]
diff --git a/data/json/mapgen/house/house16.json b/data/json/mapgen/house/house16.json
@@ -86,8 +86,8 @@
         "                        ",
         "                        ",
         "  ||||||||||||||||||||  ",
-        "  |..................|  ",
-        "  |..................|  ",
+        "  |.............2....|  ",
+        "  |1.................|  ",
         "  |..................|  ",
         "  |..................|  ",
         "  |..................|  ",
@@ -105,7 +105,25 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "basement_empty" ]
+      "palettes": [ "basement_empty" ],
+      "nested": {
+        "1": { "chunks": [ [ "null", 25 ], [ "recroom_12x12", 25 ], [ "tvroom_12x12", 25 ], [ "workoutroom_12x12", 25 ] ] },
+        "2": {
+          "chunks": [
+            [ "null", 40 ],
+            [ "livingroom_5x5_S_1", 10 ],
+            [ "livingroom_5x5_E_1", 10 ],
+            [ "livingroom_5x5_N_1", 10 ],
+            [ "livingroom_5x5_W_1", 10 ],
+            [ "livingroom_5x5_S_2", 10 ],
+            [ "livingroom_5x5_E_2", 10 ],
+            [ "livingroom_5x5_N_2", 10 ],
+            [ "livingroom_5x5_W_2", 10 ],
+            [ "home_office_4x4_N", 10 ],
+            [ "home_office_4x4_S", 10 ]
+          ]
+        }
+      }
     }
   }
 ]
diff --git a/data/json/mapgen/house/house22.json b/data/json/mapgen/house/house22.json
@@ -227,11 +227,12 @@
         "                        ",
         "                        ",
         " ||||||       ||||||||  ",
-        " |.U..|       |......|  ",
+        " |.U..|       |2.....|  ",
         " |F..g|       |......|  ",
         " |....|       |......|  ",
         " |%%+%|||||||||......|  ",
         " |...................|  ",
+        " |1..................|  ",
         " |...................|  ",
         " |...................|  ",
         " |...................|  ",
@@ -240,15 +241,34 @@
         " |...................|  ",
         " |...................|  ",
         " |...................|  ",
-        " |...................|  ",
-        " |..................U|  ",
-        " |..................Z|  ",
-        " |.............<..WJJ|  ",
+        " |............%.....U|  ",
+        " |............%.....Z|  ",
+        " |............%<..WJJ|  ",
         " |||||||||||||||||||||  ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "basement_empty" ]
+      "palettes": [ "basement_empty" ],
+      "nested": {
+        "1": { "chunks": [ [ "null", 25 ], [ "recroom_12x12", 25 ], [ "tvroom_12x12", 25 ], [ "workoutroom_12x12", 25 ] ] },
+        "2": {
+          "chunks": [
+            [ "null", 40 ],
+            [ "room_6x6_woodworker", 20 ],
+            [ "room_6x6_bike", 20 ],
+            [ "livingroom_5x5_S_1", 10 ],
+            [ "livingroom_5x5_E_1", 10 ],
+            [ "livingroom_5x5_N_1", 10 ],
+            [ "livingroom_5x5_W_1", 10 ],
+            [ "livingroom_5x5_S_2", 10 ],
+            [ "livingroom_5x5_E_2", 10 ],
+            [ "livingroom_5x5_N_2", 10 ],
+            [ "livingroom_5x5_W_2", 10 ],
+            [ "home_office_4x4_N", 10 ],
+            [ "home_office_4x4_S", 10 ]
+          ]
+        }
+      }
     }
   }
 ]
diff --git a/data/json/mapgen/house/house_2story.json b/data/json/mapgen/house/house_2story.json
@@ -149,16 +149,16 @@
         "                        ",
         "                        ",
         "  ||||||||||||||||||||  ",
-        "  |U..F.g............|  ",
-        "  |..................|  ",
-        "  |.............z.z.z|  ",
+        "  |U..F.g...WJZ......|  ",
+        "  |...........J......|  ",
+        "  |...........J.z.z.z|  ",
         "  |.......z..z..z..zz|  ",
-        "  |.<...............z|  ",
+        "  |.<....1...........|  ",
+        "  |2.................|  ",
+        "  |..................|  ",
+        "  |..................|  ",
+        "  |..................|  ",
         "  |..................|  ",
-        "  |W.................|  ",
-        "  |J..A..............|  ",
-        "  |Z.................|  ",
-        "  |JJ................|  ",
         "  |..................|  ",
         "  |..................|  ",
         "  |..................|  ",
@@ -170,7 +170,11 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "basement_empty" ]
+      "palettes": [ "basement_empty" ],
+      "nested": {
+        "1": { "chunks": [ [ "null", 25 ], [ "recroom_12x12", 25 ], [ "tvroom_12x12", 25 ], [ "workoutroom_12x12", 25 ] ] },
+        "2": { "chunks": [ [ "null", 25 ], [ "room_6x6_woodworker", 25 ], [ "room_6x6_junk", 25 ], [ "room_6x6_bike", 25 ] ] }
+      }
     }
   }
 ]
diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json
@@ -304,5 +304,111 @@
       "furniture": { "!": "f_fridge", "$": "f_rack_wood" },
       "items": { "!": { "item": "produce", "chance": 80, "repeat": [ 2, 8 ] }, "$": { "item": "a_television", "chance": 100 } }
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "a nested map for basements",
+    "nested_mapgen_id": "room_6x6_woodworker",
+    "object": {
+      "mapgensize": [ 6, 6 ],
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "||||||",
+        "|GEEA|",
+        "|G  C|",
+        "|G FD|",
+        "|GF B|",
+        "|||+||"
+      ],
+      "terrain": {
+        "|": "t_wall_w",
+        "+": "t_door_locked",
+        " ": "t_thconc_floor",
+        "A": "t_thconc_floor",
+        "B": "t_thconc_floor",
+        "C": "t_thconc_floor",
+        "D": "t_thconc_floor",
+        "E": "t_thconc_floor",
+        "F": "t_thconc_floor",
+        "G": "t_thconc_floor"
+      },
+      "furniture": {
+        "A": [ "f_drill_press", "f_planer" ],
+        "B": [ "f_jointer", "f_router", "f_mitresaw" ],
+        "C": "f_tablesaw",
+        "D": "f_bandsaw",
+        "E": "f_workbench",
+        "F": "f_stool",
+        "G": "f_rack_wood"
+      },
+      "place_items": [
+        { "item": "home_hw", "x": [ 1, 3 ], "y": 4, "chance": 50, "repeat": [ 1, 3 ] },
+        { "item": "wood_workshop", "x": 1, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 3 ] }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "a nested map for basements",
+    "nested_mapgen_id": "room_6x6_bike",
+    "object": {
+      "mapgensize": [ 6, 6 ],
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "||||||",
+        "|   T|",
+        "|   B|",
+        "|   B|",
+        "|   S|",
+        "||++||"
+      ],
+      "terrain": {
+        "|": "t_wall_w",
+        "+": "t_door_c",
+        " ": "t_thconc_floor",
+        "T": "t_thconc_floor",
+        "S": "t_thconc_floor",
+        "B": "t_thconc_floor"
+      },
+      "furniture": { "T": "f_trashcan", "S": "f_utility_shelf", "B": "f_workbench" },
+      "place_vehicles": [ { "vehicle": "bikeshop", "x": 1, "y": 2, "rotation": 270, "chance": 50 } ],
+      "place_items": [ { "item": "bikeshop_tools", "x": 4, "y": [ 2, 4 ], "chance": 10, "repeat": [ 1, 3 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "a nested map for basement",
+    "nested_mapgen_id": "room_6x6_junk",
+    "object": {
+      "mapgensize": [ 6, 6 ],
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "||++||",
+        "|O  Q|",
+        "|z  Q|",
+        "|zzSQ|",
+        "|SzzQ|",
+        "||||||"
+      ],
+      "palettes": [ "house_w_nest_palette" ],
+      "terrain": {
+        "|": "t_wall_w",
+        "+": "t_door_c",
+        " ": "t_thconc_floor",
+        "S": "t_thconc_floor",
+        "z": "t_thconc_floor",
+        "Q": "t_thconc_floor",
+        "O": "t_thconc_floor"
+      },
+      "place_items": [
+        { "item": "home_hw", "x": 4, "y": [ 1, 4 ], "chance": 25, "repeat": [ 1, 3 ] },
+        { "item": "allclothes", "x": 1, "y": 1, "chance": 25, "repeat": [ 1, 3 ] },
+        { "item": "livingroom", "x": 1, "y": [ 2, 3 ], "chance": 55, "repeat": [ 1, 4 ] },
+        { "item": "bedroom", "x": 2, "y": [ 3, 4 ], "chance": 55, "repeat": [ 1, 4 ] }
+      ]
+    }
   }
 ]