Ratkin lab fixes (CleverRaven#70520)

* Swap microlab_rock_border for relevant special terrains * Slightly less sticky out ratkin lab * Linted * Realised the extra conditionals are no longer necessary * DinoMod * DinoMod * Isolation Protocol
Procyonae · Dec 31, 2023 · 180845b · 180845b
1 parent e00c129
commit 180845b
Show file tree

Hide file tree

Showing 13 changed files with 276 additions and 277 deletions.
diff --git a/data/json/mapgen/microlab/microlab_connector.json b/data/json/mapgen/microlab/microlab_connector.json
@@ -38,44 +38,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "microlab_rock_border" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_concrete",
-      "rows": [
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################"
-      ],
-      "palettes": [ "microlab" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "microlab_sub_station", "microlab_sub_station_ratkin" ],
-    "weight": 1000,
+    "om_terrain": [ "microlab_sub_station" ],
     "object": {
       "fill_ter": "t_strconc_floor",
       "rows": [
@@ -116,6 +79,70 @@
       }
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "microlab_sub_station_ratkin" ],
+    "object": {
+      "fill_ter": "t_strconc_floor",
+      "rows": [
+        "########        ########",
+        "########        ########",
+        "########        ########",
+        "########        ########",
+        "########        ########",
+        "########        ########",
+        "########        ########",
+        "###|||||        ########",
+        "###|l h  (    |#########",
+        "###|l    ( YY |#########",
+        "###|l    ( YY |#########",
+        "###||2||||    |#########",
+        "###|     |    |#########",
+        "###|   hd|G55||#########",
+        "###|  ddd|   ^|#########",
+        "###||5(((|   ^|||||||###",
+        "###|B          VV ^^|###",
+        "###|B      YY      ?|###",
+        "###|B dddd YY    t ?|###",
+        "###|B d hd         ?|###",
+        "###|B          t? ^^|###",
+        "###||||||||  ||||||||###",
+        "##########|22|##########",
+        "##########|  |##########"
+      ],
+      "place_nested": [
+        { "chunks": [ "ratkin_sewer_entrance" ], "x": 8, "y": 0 },
+        { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
+        { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } }
+      ],
+      "palettes": [ "microlab_generic" ],
+      "terrain": { "#": "t_soil", "G": "t_card_science" },
+      "items": {
+        "l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
+        "t": { "item": "magazines", "chance": 90 }
+      }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "ratkin_sewer_entrance",
+    "object": {
+      "mapgensize": [ 8, 8 ],
+      "rows": [
+        "|o-~~-o|",
+        "|o-~~-o|",
+        "|o-~~-o|",
+        "|o-~~-o|",
+        "|o-~~-o|",
+        "|o-~~-o|",
+        "|p-~~-p|",
+        "||----||"
+      ],
+      "palettes": [ "sewers" ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",

diff --git a/data/json/mapgen/microlab/microlab_distorted/microlab_distorted.json b/data/json/mapgen/microlab/microlab_distorted/microlab_distorted.json
@@ -26,10 +26,6 @@
         { "chunks": [ "microlab_distorted_chunk" ], "x": 12, "y": 0 },
         { "chunks": [ "microlab_distorted_chunk" ], "x": 0, "y": 12 },
         { "chunks": [ "microlab_distorted_chunk" ], "x": 12, "y": 12 },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
         { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },

diff --git a/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json b/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json
@@ -11,10 +11,6 @@
         { "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 12, "y": 0 },
         { "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 0, "y": 12 },
         { "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 12, "y": 12 },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
         { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },

diff --git a/data/json/mapgen/microlab/microlab_generic_edge.json b/data/json/mapgen/microlab/microlab_generic_edge.json
@@ -41,10 +41,6 @@
           "x": 0,
           "y": 0
         },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
         { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },

diff --git a/data/json/mapgen/microlab/microlab_hallway_start.json b/data/json/mapgen/microlab/microlab_hallway_start.json
@@ -7,10 +7,6 @@
       "fill_ter": "t_strconc_floor",
       "place_nested": [
         { "chunks": [ "microlab_generic_end_tile" ], "x": 0, "y": 0 },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
         { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
@@ -207,8 +203,6 @@
         "||||||||||||||||||||||||"
       ],
       "place_nested": [
-        { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
         { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
         { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } },
         { "else_chunks": [ "concrete_corner" ], "x": 0, "y": 0, "neighbors": { "north_west": "microlab" } },

diff --git a/data/json/mapgen/microlab/microlab_ratkin/microlab_ratkin_generic.json b/data/json/mapgen/microlab/microlab_ratkin/microlab_ratkin_generic.json
@@ -22,10 +22,6 @@
       "fill_ter": "t_strconc_floor",
       "place_nested": [
         { "chunks": [ "microlab_generic_edge_tile" ], "x": 0, "y": 0 },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
-        { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
         { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },

diff --git a/data/json/obsoletion/migration_oter_ids.json b/data/json/obsoletion/migration_oter_ids.json
@@ -6458,5 +6458,10 @@
       "lab_surface_brick_basementD4_west": "special_earth",
       "lab_surface_brick_basementE4_west": "special_earth"
     }
+  },
+  {
+    "type": "oter_id_migration",
+    "//": "migrated in 0.H",
+    "oter_ids": { "microlab_rock_border": "special_rock" }
   }
 ]
diff --git a/data/json/overmap/overmap_mutable/microlab_mutable.json b/data/json/overmap/overmap_mutable/microlab_mutable.json
@@ -55,7 +55,7 @@
         "south": "microlab_to_microlab",
         "west": "microlab_to_microlab"
       },
-      "microlab_rock_border": { "overmap": "microlab_rock_border" },
+      "special_rock": { "overmap": "special_rock" },
       "microlab": {
         "overmap": "microlab_generic",
         "north": { "id": "microlab_to_microlab", "alternatives": [ "microlab_to_hallway" ] },
@@ -193,7 +193,7 @@
         "north": { "id": "hallway_to_hallway", "alternatives": [ "dhallway_to_dhallway" ] }
       },
       "rock_divisor": {
-        "overmap": "microlab_rock_border",
+        "overmap": "special_rock",
         "north": "microlab_to_microlab",
         "south": "dmicrolab_to_dmicrolab",
         "east": { "id": "dmicrolab_to_dmicrolab", "type": "available", "alternatives": [ "microlab_to_microlab" ] },
@@ -238,10 +238,10 @@
           "//": "This is the main elevator and core mapgen piece for the portal lab, goes all the way down to hell.",
           "chunk": [
             { "overmap": "microlab_portal_dressroom", "pos": [ 0, 0, 0 ] },
-            { "overmap": "microlab_rock_border", "pos": [ 1, 0, 0 ] },
-            { "overmap": "microlab_rock_border", "pos": [ 2, 0, 0 ] },
-            { "overmap": "microlab_rock_border", "pos": [ -1, 0, 0 ] },
-            { "overmap": "microlab_rock_border", "pos": [ -2, 0, 0 ] },
+            { "overmap": "special_rock", "pos": [ 1, 0, 0 ] },
+            { "overmap": "special_rock", "pos": [ 2, 0, 0 ] },
+            { "overmap": "special_rock", "pos": [ -1, 0, 0 ] },
+            { "overmap": "special_rock", "pos": [ -2, 0, 0 ] },
             { "overmap": "firebreak", "pos": [ 0, 1, 0 ] },
             { "overmap": "portal_elevator", "pos": [ 0, 2, 0 ] },
             { "overmap": "portal_elevator", "pos": [ 0, 2, -2 ] },
@@ -268,10 +268,10 @@
             { "overmap": "nether", "pos": [ -1, 0, -8 ] },
             { "overmap": "nether", "pos": [ 0, 0, -8 ] },
             { "overmap": "nether", "pos": [ 1, 0, -8 ] },
-            { "overmap": "microlab_rock_border", "pos": [ 1, 1, 0 ] },
-            { "overmap": "microlab_rock_border", "pos": [ 2, 1, 0 ] },
-            { "overmap": "microlab_rock_border", "pos": [ -1, 1, 0 ] },
-            { "overmap": "microlab_rock_border", "pos": [ -2, 1, 0 ] }
+            { "overmap": "special_rock", "pos": [ 1, 1, 0 ] },
+            { "overmap": "special_rock", "pos": [ 2, 1, 0 ] },
+            { "overmap": "special_rock", "pos": [ -1, 1, 0 ] },
+            { "overmap": "special_rock", "pos": [ -2, 1, 0 ] }
           ],
           "max": 1
         }