Retire procedurally generated houses and basements (#36075)

CleverRaven · Dec 17, 2019 · 936a155 · 936a155
1 parent 01965b9
commit 936a155
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 979 deletions.
diff --git a/data/json/obsolete_terrains.json b/data/json/obsolete_terrains.json
@@ -269,7 +269,11 @@
       "dairy_farm_SW",
       "dairy_farm_SE",
       "megastore",
-      "megastore_entrance"
+      "megastore_entrance",
+      "house_base_north",
+      "house_base_south",
+      "house_base_east",
+      "house_base_west"
     ]
   }
 ]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -3,7 +3,7 @@
     "type": "city_building",
     "id": "house_base",
     "locations": [ "land", "swamp" ],
-    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_base_north" }, { "point": [ 0, 0, -1 ], "overmap": "basement" } ]
+    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_north" }, { "point": [ 0, 0, -1 ], "overmap": "basement" } ]
   },
   {
     "type": "city_building",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
@@ -11,8 +11,7 @@
   {
     "type": "overmap_terrain",
     "id": "basement",
-    "copy-from": "generic_city_house_basement",
-    "mapgen": [ { "method": "builtin", "name": "basement_junk" }, { "method": "builtin", "name": "basement_spiders" } ]
+    "copy-from": "generic_city_house_basement"
   },
   {
     "type": "overmap_terrain",
@@ -34,11 +33,6 @@
     "see_cost": 2,
     "extras": "build",
     "mondensity": 2,
-    "mapgen": [
-      { "method": "builtin", "name": "house_generic_boxy" },
-      { "method": "builtin", "name": "house_generic_big_livingroom" },
-      { "method": "builtin", "name": "house_generic_center_hallway" }
-    ],
     "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
   },
   {
@@ -50,16 +44,6 @@
     "see_cost": 2,
     "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
   },
-  {
-    "type": "overmap_terrain",
-    "id": "house_base",
-    "copy-from": "house",
-    "mapgen": [
-      { "method": "builtin", "name": "house_generic_boxy" },
-      { "method": "builtin", "name": "house_generic_big_livingroom" },
-      { "method": "builtin", "name": "house_generic_center_hallway" }
-    ]
-  },
   {
     "type": "overmap_terrain",
     "id": "duplex",