Remove extraneous lake_cabin_water terrain (#76104)

CleverRaven · Sep 1, 2024 · 418431b · 418431b
1 parent 7f37775
commit 418431b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 42 deletions.
diff --git a/data/json/mapgen/lake_buildings/lighthouse.json b/data/json/mapgen/lake_buildings/lighthouse.json
@@ -427,45 +427,5 @@
       ],
       "palettes": [ "roof_palette" ]
     }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "lake_cabin_water",
-    "object": {
-      "fill_ter": "t_grass",
-      "rows": [
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~~~~~~~~"
-      ],
-      "place_vehicles": [
-        { "vehicle": "lake", "x": 17, "y": 5, "rotation": 180, "chance": 20, "status": 3 },
-        { "vehicle": "lake", "x": 2, "y": 18, "rotation": 270, "chance": 20, "status": 3 },
-        { "vehicle": "lake", "x": 18, "y": 18, "rotation": 270, "chance": 20, "status": 3 }
-      ],
-      "terrain": { " ": "t_floor", "~": "t_water_dp", "-": "t_water_sh" }
-    }
   }
 ]
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -5231,7 +5231,7 @@
     "id": "Lighthouse Island",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "lake_surface" },
-      { "point": [ 1, 0, 0 ], "overmap": "lake_cabin_water_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "lake_surface" },
       { "point": [ 2, 0, 0 ], "overmap": "lake_surface" },
       { "point": [ 0, 1, 0 ], "overmap": "lake_surface" },
       { "point": [ 1, 1, 0 ], "overmap": "lighthouse_ground_north" },
@@ -5242,7 +5242,7 @@
       { "point": [ 1, 1, 5 ], "overmap": "lighthouse_z5_north" },
       { "point": [ 1, 1, 6 ], "overmap": "lighthouse_roof_north" },
       { "point": [ 2, 1, 0 ], "overmap": "lake_surface" },
-      { "point": [ 0, 2, 0 ], "overmap": "lake_cabin_water_north" },
+      { "point": [ 0, 2, 0 ], "overmap": "lake_surface" },
       { "point": [ 1, 2, 0 ], "overmap": "lake_surface" },
       { "point": [ 2, 2, 0 ], "overmap": "lake_surface" },
       { "point": [ 1, 0, -1 ], "overmap": "solid_earth", "locations": [ "lake_water_cube" ] },