add more basements (#37931)

* add more basements * Update regional_map_settings.json
CleverRaven · Feb 11, 2020 · 9b081aa · 9b081aa
1 parent 07d5448
commit 9b081aa
Show file tree

Hide file tree

Showing 13 changed files with 307 additions and 127 deletions.
diff --git a/data/json/mapgen/basement/basement_bionic.json b/data/json/mapgen/basement/basement_bionic.json
@@ -8,31 +8,32 @@
       "fill_ter": "t_rock_floor",
       "rows": [
         "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "     |----------        ",
-        "     |?..i|..LL|        ",
-        "     |/...+L...|        ",
-        "     |.ccc|L...|        ",
-        "|-------------+---------",
-        "|{{{{{|bbbbbb|...rrccrr|",
-        "|.....|s....b|ff.......|",
-        "|___..|s.t..b|...cccccc|",
-        "|.....|a....b|.........|",
-        "|^..!.............s.t..|",
-        "|.................s.t..|",
-        "|%..@.............s.t..|",
-        "|................|-----|",
-        "|......|+-|++|...|&...i|",
-        "|......|.W|..|...+....C|",
-        "|..}...|.F|.<|...|.cc.*|",
-        "------------------------",
+        "           |----------| ",
+        "           |...___....| ",
+        "           |..........| ",
+        "           |..~~~~~~..| ",
+        " |---------|..~~~~~~..| ",
+        " |...__..i|L..~~~~~~..| ",
+        " |?.......|...~~~~~~..| ",
+        " |/.......+L..........| ",
+        " |.ccc.ccc|LL...___...| ",
+        " |------------+-------| ",
+        " |{{{{|bbbbbb|...rrccr| ",
+        " |....|s....b|ff......| ",
+        " |__..|s.t..b|...ccccc| ",
+        " |....|a....b|........| ",
+        " |^.!.............s..t| ",
+        " |................s..t| ",
+        " |%.@.............s..t| ",
+        " |...............|----| ",
+        " |.....|+-|++|...|&..i| ",
+        " |.....|.W|..|...+...C| ",
+        " |.}...|.F|.<|...|.cc*| ",
+        " ---------------------- ",
         "                        "
       ],
       "palettes": [ "basement_game" ],
+      "terrain": { "~": "t_water_pool" },
       "furniture": {
         "}": "f_pinball_machine",
         "*": "f_shower",
@@ -51,64 +52,64 @@
       },
       "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
       "place_loot": [
-        { "group": "alcohol", "x": [ 14, 15 ], "y": 6, "chance": 96, "repeat": [ 1, 2 ] },
-        { "group": "fridgesnacks", "x": [ 14, 15 ], "y": 6, "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": [ 7, 12 ], "y": 5, "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": 12, "y": [ 6, 8 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "magazines", "x": 20, "y": [ 10, 12 ], "chance": 30 },
-        { "group": "magazines", "x": 9, "y": 7, "chance": 30 },
-        { "group": "snacks", "x": [ 17, 22 ], "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "snacks", "x": [ 17, 22 ], "y": 7, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "softdrugs", "x": 22, "y": 14, "chance": 75, "repeat": [ 1, 2 ] },
-        { "group": "cleaning", "x": 11, "y": [ 2, 3 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "cleaning", "x": [ 13, 14 ], "y": 1, "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "surgery", "x": [ 8, 9 ], "y": 3, "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "bionics_common", "x": 7, "y": 3 },
-        { "item": "anesthetic_kit", "x": 7, "y": 3 },
-        { "item": "television", "x": 22, "y": 10, "chance": 95 },
-        { "item": "soap", "x": 19, "y": 15, "chance": 80 },
-        { "item": "towel", "x": 20, "y": 15, "chance": 80 },
-        { "item": "towel", "x": 2, "y": 7, "chance": 60 },
-        { "item": "stereo", "x": 1, "y": 7, "chance": 50 }
+        { "group": "alcohol", "x": [ 14, 15 ], "y": 12, "chance": 96, "repeat": [ 1, 2 ] },
+        { "group": "fridgesnacks", "x": [ 14, 15 ], "y": 12, "chance": 80, "repeat": [ 1, 2 ] },
+        { "group": "homebooks", "x": [ 7, 12 ], "y": 11, "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "homebooks", "x": 12, "y": [ 12, 14 ], "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "magazines", "x": 21, "y": [ 15, 17 ], "chance": 30 },
+        { "group": "magazines", "x": 9, "y": 12, "chance": 30 },
+        { "group": "snacks", "x": [ 16, 21 ], "y": 11, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "snacks", "x": [ 16, 21 ], "y": 13, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "softdrugs", "x": 21, "y": 20, "chance": 75, "repeat": [ 1, 2 ] },
+        { "group": "cleaning", "x": 11, "y": 5, "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "cleaning", "x": [ 11, 12 ], "y": 8, "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "surgery", "x": [ 8, 9 ], "y": 9, "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "bionics_common", "x": 7, "y": 9 },
+        { "item": "anesthetic_kit", "x": 7, "y": 9 },
+        { "item": "television", "x": 21, "y": 16, "chance": 95 },
+        { "item": "soap", "x": 19, "y": 21, "chance": 80 },
+        { "item": "towel", "x": 20, "y": 21, "chance": 80 },
+        { "item": "towel", "x": 3, "y": 13, "chance": 60 },
+        { "item": "stereo", "x": 2, "y": 13, "chance": 50 }
       ],
       "place_monster": [ { "monster": "mon_broken_cyborg", "x": 14, "y": 3, "chance": 100 } ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "basement" ],
+    "om_terrain": [ "basement_bionic_decoy" ],
     "weight": 100,
     "object": {
-      "rotation": [ 0, 3 ],
       "fill_ter": "t_rock_floor",
       "rows": [
         "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "          ------        ",
-        "          |..LL|        ",
-        "          |L...|        ",
-        "          |L...|        ",
-        "|-------------+---------",
-        "|{{{{{|bbbbbb|...rrccrr|",
-        "|.....|s....b|ff.......|",
-        "|___..|s.t..b|...cccccc|",
-        "|.....|a....b|.........|",
-        "|^..!.............s.t..|",
-        "|.................s.t..|",
-        "|%..@.............s.t..|",
-        "|................|-----|",
-        "|......|+-|++|...|&...i|",
-        "|......|.W|..|...+....C|",
-        "|..}...|.F|<<|...|.cc.*|",
-        "------------------------",
+        "           |----------| ",
+        "           |...___....| ",
+        "           |..........| ",
+        "           |..~~~~~~..| ",
+        " |---------|..~~~~~~..| ",
+        " |*|*|*|cc|L..~~~~~~..| ",
+        " |+|+|+|..|L..~~~~~~..| ",
+        " |........+...........| ",
+        " |cc&c&c&c|LL...___...| ",
+        " |------------+-------| ",
+        " |{{{{|bbbbbb|...rrccr| ",
+        " |....|s....b|ff......| ",
+        " |__..|s.t..b|...ccccc| ",
+        " |....|a....b|........| ",
+        " |^.!.............s..t| ",
+        " |................s..t| ",
+        " |%.@.............s..t| ",
+        " |...............|----| ",
+        " |.....|+-|++|...|&..i| ",
+        " |.....|.W|..|...+...C| ",
+        " |.}...|.F|.<|...|.cc*| ",
+        " ---------------------- ",
         "                        "
       ],
       "palettes": [ "basement_game" ],
+      "terrain": { "~": "t_water_pool" },
       "furniture": {
         "}": "f_pinball_machine",
         "*": "f_shower",
@@ -125,22 +126,22 @@
       },
       "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
       "place_loot": [
-        { "group": "alcohol", "x": [ 14, 15 ], "y": 6, "chance": 96, "repeat": [ 1, 2 ] },
-        { "group": "fridgesnacks", "x": [ 14, 15 ], "y": 6, "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": [ 7, 12 ], "y": 5, "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": 12, "y": [ 6, 8 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "magazines", "x": 20, "y": [ 10, 12 ], "chance": 30 },
-        { "group": "magazines", "x": 9, "y": 7, "chance": 30 },
-        { "group": "snacks", "x": [ 17, 22 ], "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "snacks", "x": [ 17, 22 ], "y": 7, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "softdrugs", "x": 22, "y": 14, "chance": 75, "repeat": [ 1, 2 ] },
-        { "group": "cleaning", "x": 11, "y": [ 2, 3 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "cleaning", "x": [ 13, 14 ], "y": 1, "chance": 70, "repeat": [ 1, 2 ] },
-        { "item": "television", "x": 22, "y": 10, "chance": 95 },
-        { "item": "soap", "x": 19, "y": 15, "chance": 80 },
-        { "item": "towel", "x": 20, "y": 15, "chance": 80 },
-        { "item": "towel", "x": 2, "y": 7, "chance": 60 },
-        { "item": "stereo", "x": 1, "y": 7, "chance": 50 }
+        { "group": "alcohol", "x": [ 14, 15 ], "y": 12, "chance": 96, "repeat": [ 1, 2 ] },
+        { "group": "fridgesnacks", "x": [ 14, 15 ], "y": 12, "chance": 80, "repeat": [ 1, 2 ] },
+        { "group": "homebooks", "x": [ 7, 12 ], "y": 11, "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "homebooks", "x": 12, "y": [ 12, 14 ], "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "magazines", "x": 21, "y": [ 15, 17 ], "chance": 30 },
+        { "group": "magazines", "x": 9, "y": 12, "chance": 30 },
+        { "group": "snacks", "x": [ 16, 21 ], "y": 11, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "snacks", "x": [ 16, 21 ], "y": 13, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "softdrugs", "x": 21, "y": 20, "chance": 75, "repeat": [ 1, 2 ] },
+        { "group": "cleaning", "x": 11, "y": 5, "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "cleaning", "x": [ 11, 12 ], "y": 8, "chance": 70, "repeat": [ 1, 2 ] },
+        { "item": "television", "x": 21, "y": 16, "chance": 95 },
+        { "item": "soap", "x": 19, "y": 21, "chance": 80 },
+        { "item": "towel", "x": 20, "y": 21, "chance": 80 },
+        { "item": "towel", "x": 3, "y": 13, "chance": 60 },
+        { "item": "stereo", "x": 2, "y": 13, "chance": 50 }
       ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 5, 17 ], "y": [ 9, 11 ], "chance": 2 } ]
     }

diff --git a/data/json/mapgen/basement/basements.json b/data/json/mapgen/basement/basements.json
@@ -142,43 +142,5 @@
         { "chunks": [ [ "recroom_12x12", 5 ], [ "tvroom_12x12", 15 ], [ "workoutroom_12x12", 5 ] ], "x": 9, "y": 9 }
       ]
     }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "house_05ab_basement",
-    "//": "mostly empty basement.",
-    "object": {
-      "fill_ter": "t_thconc_floor",
-      "rows": [
-        "^^^^^^^^^^^^^^^^^^^^^^^^",
-        "^######################^",
-        "^#||||||||||||||||||||#^",
-        "^#|9..|..............|#^",
-        "^#|...+..............|#^",
-        "^#|tCS|..............|#^",
-        "^#||||||.............|#^",
-        "^#|    ||+|####|||||||#^",
-        "^#|    |             |#^",
-        "^#|    +             |#^",
-        "^#|    |<            |#^",
-        "^#||||||  !          |#^",
-        "^#|    |             |#^",
-        "^#|    +             |#^",
-        "^#|    |  !          |#^",
-        "^#|    |             |#^",
-        "^#||||||  !          |#^",
-        "^#|    |             |#^",
-        "^#|    +             |#^",
-        "^#|    |             |#^",
-        "^#|    |   !!!!!!    |#^",
-        "^#||||||||||||||||||||#^",
-        "^######################^",
-        "^^^^^^^^^^^^^^^^^^^^^^^^"
-      ],
-      "palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ],
-      "items": { " ": { "item": "trash", "chance": 2 } },
-      "place_nested": [ { "chunks": [ [ "null", 15 ], [ "utility_3x3_N", 10 ], [ "utility_3x3_S", 5 ] ], "x": 7, "y": 3 } ]
-    }
   }
 ]
diff --git a/data/json/mapgen/house/house05_ab.json b/data/json/mapgen/house/house05_ab.json
@@ -67,5 +67,43 @@
       ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_05ab_basement",
+    "//": "mostly empty basement.",
+    "object": {
+      "fill_ter": "t_thconc_floor",
+      "rows": [
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^######################^",
+        "^#||||||||||||||||||||#^",
+        "^#|9..|..............|#^",
+        "^#|...+..............|#^",
+        "^#|tCS|..............|#^",
+        "^#||||||.............|#^",
+        "^#|    ||+|####|||||||#^",
+        "^#|    |             |#^",
+        "^#|    +             |#^",
+        "^#|    |             |#^",
+        "^#||||||  !          |#^",
+        "^#|    |             |#^",
+        "^#|    +             |#^",
+        "^#|    |  !          |#^",
+        "^#|    |             |#^",
+        "^#||||||  !          |#^",
+        "^#|    |  <          |#^",
+        "^#|    +             |#^",
+        "^#|    |             |#^",
+        "^#|    |   !!!!!!    |#^",
+        "^#||||||||||||||||||||#^",
+        "^######################^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^"
+      ],
+      "palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ],
+      "items": { " ": { "item": "trash", "chance": 2 } },
+      "place_nested": [ { "chunks": [ [ "null", 15 ], [ "utility_3x3_N", 10 ], [ "utility_3x3_S", 5 ] ], "x": 7, "y": 3 } ]
+    }
   }
 ]
diff --git a/data/json/mapgen/house/house08.json b/data/json/mapgen/house/house08.json
@@ -15,7 +15,7 @@
         ".##||||+|             o.",
         ".o      |         h   o.",
         ".#E @@  |       A   A #.",
-        ".o d@@s | hfh | ||JJJ||.",
+        ".o d@@s | hfh | ||JJJ|#.",
         ".#|||||+| hfh |  Y   4#.",
         ".#g|d                Oo.",
         ".#>+          |6 31F52#.",
@@ -103,5 +103,40 @@
       "palettes": [ "roof_palette" ],
       "terrain": { ".": "t_shingle_flat_roof" }
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_08_basement",
+    "object": {
+      "fill_ter": "t_thconc_floor",
+      "rows": [
+        "                        ",
+        "  ||||||||||||||||||||| ",
+        "  |zz......g.F........| ",
+        "  |z..................| ",
+        "  |...................| ",
+        " ||.........z...z.....| ",
+        " |....................| ",
+        " |......z.......z.....| ",
+        " |....................| ",
+        " |....................| ",
+        " |..z................z| ",
+        " |<..............zz...| ",
+        " |%%+%||||||||||||||||| ",
+        " |....|                 ",
+        " |JWZJ|                 ",
+        " ||||||                 ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "basement_empty" ]
+    }
   }
 ]
diff --git a/data/json/mapgen/house/house09.json b/data/json/mapgen/house/house09.json
@@ -3,6 +3,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "house_09" ],
+    "//": "uses bionic_basement",
     "weight": 300,
     "object": {
       "fill_ter": "t_floor",

diff --git a/data/json/mapgen/house/house10.json b/data/json/mapgen/house/house10.json
@@ -76,5 +76,40 @@
       "palettes": [ "roof_palette" ],
       "terrain": { ".": "t_shingle_flat_roof" }
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_10_basement",
+    "object": {
+      "fill_ter": "t_thconc_floor",
+      "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "  ||||||||||            ",
+        "  |........|            ",
+        "  |........|            ",
+        "  |........|            ",
+        "  |........|||||||||||  ",
+        "  |J.................|  ",
+        "  |Z.................|  ",
+        "  |J.................|  ",
+        "  |W.................|  ",
+        "  |J.................|  ",
+        "  |.<................|  ",
+        "  ||||.............z.|  ",
+        "     |...............|  ",
+        "     |...............|  ",
+        "     |....z..........|  ",
+        "     |...............|  ",
+        "     |||||||||.......|  ",
+        "             |g.....F|  ",
+        "             |||||||||  ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "basement_empty" ]
+    }
   }
 ]