[MoM] Fix Research Facility having an oldlab underneath (#79191)

* Initial commit * Implement suggestions from code review
CleverRaven · Jan 17, 2025 · 9a3043e · 9a3043e
1 parent f246f9c
commit 9a3043e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ [ "psi_phavian_lab_basementD1_hidden_lab_stairs", "psi_phavian_lab_basementE1" ] ],
+    "om_terrain": [ [ "psi_phavian_lab_basementD1_hidden_psi_lab_stairs", "psi_phavian_lab_basementE1" ] ],
     "object": {
       "fill_ter": "t_strconc_floor",
       "rows": [

diff --git a/data/mods/MindOverMatter/obsolete/overmap.json b/data/mods/MindOverMatter/obsolete/overmap.json
@@ -0,0 +1,12 @@
+[
+  {
+    "type": "oter_id_migration",
+    "//": "Migrated in 0.I, remove after 0.I stable",
+    "oter_ids": {
+      "psi_phavian_lab_basementD1_hidden_lab_stairs_north": "psi_phavian_lab_basementD1_hidden_psi_lab_stairs_north",
+      "psi_phavian_lab_basementD1_hidden_lab_stairs_east": "psi_phavian_lab_basementD1_hidden_psi_lab_stairs_east",
+      "psi_phavian_lab_basementD1_hidden_lab_stairs_south": "psi_phavian_lab_basementD1_hidden_psi_lab_stairs_south",
+      "psi_phavian_lab_basementD1_hidden_lab_stairs_west": "psi_phavian_lab_basementD1_hidden_psi_lab_stairs_west"
+    }
+  }
+]
diff --git a/data/mods/MindOverMatter/overmap/overmap_specials.json b/data/mods/MindOverMatter/overmap/overmap_specials.json
@@ -21,7 +21,7 @@
       { "point": [ 0, 1, -1 ], "overmap": "special_earth" },
       { "point": [ 1, 1, -1 ], "overmap": "special_earth" },
       { "point": [ 2, 1, -1 ], "overmap": "special_earth" },
-      { "point": [ 3, 1, -1 ], "overmap": "psi_phavian_lab_basementD1_hidden_lab_stairs_north" },
+      { "point": [ 3, 1, -1 ], "overmap": "psi_phavian_lab_basementD1_hidden_psi_lab_stairs_north" },
       { "point": [ 4, 1, -1 ], "overmap": "psi_phavian_lab_basementE1_north" },
       { "point": [ 0, 2, -1 ], "overmap": "special_earth" },
       { "point": [ 1, 2, -1 ], "overmap": "special_earth" },

diff --git a/data/mods/MindOverMatter/overmap/overmap_terrain.json b/data/mods/MindOverMatter/overmap/overmap_terrain.json
@@ -46,7 +46,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": [ "psi_phavian_lab_basementD1_hidden_lab_stairs", "psi_phavian_lab_basementE1" ],
+    "id": [ "psi_phavian_lab_basementD1_hidden_psi_lab_stairs", "psi_phavian_lab_basementE1" ],
     "name": "lab basement",
     "sym": "L",
     "looks_like": "lab_surface_brick_basementD1_hidden_lab_stairs",