Cleanup unused stuff in mapgen_functions.cpp (#72954)

* Delete all the things * Make null oter use same as obsolete * Revert "Make null oter use same as obsolete" This reverts commit 759603f. * Appease our clang overlords
CleverRaven · Apr 11, 2024 · a573b71 · a573b71
1 parent e46636b
commit a573b71
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 309 deletions.
diff --git a/data/json/mapgen/earth.json b/data/json/mapgen/earth.json
@@ -1,72 +1,20 @@
 [
   {
+    "type": "mapgen",
     "method": "json",
-    "object": {
-      "rows": [
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................"
-      ],
-      "terrain": { ".": "t_rock" }
-    },
-    "om_terrain": "deep_rock",
+    "om_terrain": "open_air",
+    "object": { "fill_ter": "t_open_air" }
+  },
+  {
     "type": "mapgen",
-    "weight": 100
+    "method": "json",
+    "om_terrain": [ "deep_rock", "empty_rock" ],
+    "object": { "fill_ter": "t_rock" }
   },
   {
+    "type": "mapgen",
     "method": "json",
-    "object": {
-      "rows": [
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................",
-        "........................"
-      ],
-      "terrain": { ".": "t_soil" }
-    },
     "om_terrain": "solid_earth",
-    "type": "mapgen",
-    "weight": 100
+    "object": { "fill_ter": "t_soil" }
   }
 ]
diff --git a/data/json/obsoletion_and_migration_0.I/obsolete_overmap_terrain.json b/data/json/obsoletion_and_migration_0.I/obsolete_overmap_terrain.json
@@ -183,6 +183,11 @@
       "cabin_liam_driveway_north": "rural_road_forest_ns"
     }
   },
+  {
+    "type": "oter_id_migration",
+    "//": "migrated in 0.I, were stopped from spawning in 2019 but never obsoleted/migrated so just adding this to be safe",
+    "oter_ids": { "hellmouth": "empty_rock", "rift": "empty_rock" }
+  },
   {
     "type": "oter_id_migration",
     "//": "migrated in 0.I",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json
@@ -148,7 +148,7 @@
   {
     "type": "overmap_terrain",
     "id": "rock",
-    "//": "This is old rock type, new one (below) will replace it in new overmaps",
+    "//": "This is old rock type replaced by empty_rock/deep_rock, now only used for edges of slimepits",
     "name": "solid rock",
     "looks_like": "empty_rock",
     "sym": "%",
@@ -166,24 +166,6 @@
     "travel_cost_type": "impassable",
     "flags": [ "NO_ROTATE" ]
   },
-  {
-    "type": "overmap_terrain",
-    "id": "rift",
-    "name": "rift",
-    "sym": "^",
-    "color": "red",
-    "see_cost": 2,
-    "flags": [ "NO_ROTATE", "RISK_HIGH", "SHOULD_NOT_SPAWN" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "hellmouth",
-    "name": "hellmouth",
-    "sym": "^",
-    "color": "light_red",
-    "see_cost": 2,
-    "flags": [ "KNOWN_DOWN", "NO_ROTATE", "RISK_HIGH", "SHOULD_NOT_SPAWN" ]
-  },
   {
     "type": "overmap_terrain",
     "id": "tutorial",

diff --git a/data/mods/Graphical_Overmap/go_overmap_terrain_hardcoded.json b/data/mods/Graphical_Overmap/go_overmap_terrain_hardcoded.json
@@ -166,18 +166,6 @@
     "copy-from": "empty_rock",
     "sym": "\u00AE"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "rift",
-    "copy-from": "rift",
-    "sym": "\u00A1"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "hellmouth",
-    "copy-from": "hellmouth",
-    "sym": "\u00A1"
-  },
   {
     "type": "overmap_terrain",
     "id": "ants",

diff --git a/data/mods/alt_map_key/overmap_terrain.json b/data/mods/alt_map_key/overmap_terrain.json
@@ -2113,22 +2113,6 @@
     "sym": "%",
     "color": "dark_gray"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "rift",
-    "copy-from": "rift",
-    "name": "rift",
-    "sym": "^",
-    "color": "red"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "hellmouth",
-    "copy-from": "hellmouth",
-    "name": "hellmouth",
-    "sym": "^",
-    "color": "light_red"
-  },
   {
     "type": "overmap_terrain",
     "id": "sewer_sub_station",