From 8a9cdcdb4e7fd41a5f91981c12d759584114cf3f Mon Sep 17 00:00:00 2001
From: Fris0uman <sthapplz@gmail.com>
Date: Sun, 15 Oct 2023 15:58:23 +0200
Subject: [PATCH] keep bionic_basement in Aftershock and No Hope

---
 data/mods/Aftershock/maps/city_buildings.json        | 10 ++++++++++
 data/mods/Aftershock/maps/overmap_terrain.json       |  6 ++++++
 .../No_Hope/Mapgen/multitile_city_buildings.json     | 12 ++++++++++++
 data/mods/No_Hope/overmap_terrain.json               |  6 ++++++
 .../multitile_city_buildings.json                    | 11 -----------
 5 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 data/mods/No_Hope/Mapgen/multitile_city_buildings.json

diff --git a/data/mods/Aftershock/maps/city_buildings.json b/data/mods/Aftershock/maps/city_buildings.json
index 433d78bd2a18c..8446ece5b311c 100644
--- a/data/mods/Aftershock/maps/city_buildings.json
+++ b/data/mods/Aftershock/maps/city_buildings.json
@@ -1,4 +1,14 @@
 [
+  {
+    "type": "city_building",
+    "id": "house_09",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_09_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_09_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement_bionic_north" }
+    ]
+  },
   {
     "type": "city_building",
     "id": "afs_augmentation_clinic_1",
diff --git a/data/mods/Aftershock/maps/overmap_terrain.json b/data/mods/Aftershock/maps/overmap_terrain.json
index c7962e0b91f83..158b82b06edc7 100644
--- a/data/mods/Aftershock/maps/overmap_terrain.json
+++ b/data/mods/Aftershock/maps/overmap_terrain.json
@@ -1,4 +1,10 @@
 [
+  {
+    "type": "overmap_terrain",
+    "id": [ "basement_bionic" ],
+    "copy-from": "generic_city_house_basement",
+    "spawns": { "group": "GROUP_BASEMENT_HOUSE", "population": [ 1, 1 ], "chance": 80 }
+  },
   {
     "id": "municipal_reactor",
     "type": "overmap_terrain",
diff --git a/data/mods/No_Hope/Mapgen/multitile_city_buildings.json b/data/mods/No_Hope/Mapgen/multitile_city_buildings.json
new file mode 100644
index 0000000000000..e832388f9b23d
--- /dev/null
+++ b/data/mods/No_Hope/Mapgen/multitile_city_buildings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "type": "city_building",
+    "id": "house_09",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_09_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_09_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement_bionic_north" }
+    ]
+  }
+]
diff --git a/data/mods/No_Hope/overmap_terrain.json b/data/mods/No_Hope/overmap_terrain.json
index 5e9300a9890f9..f2d9be9e4a30e 100644
--- a/data/mods/No_Hope/overmap_terrain.json
+++ b/data/mods/No_Hope/overmap_terrain.json
@@ -1,4 +1,10 @@
 [
+  {
+    "type": "overmap_terrain",
+    "id": [ "basement_bionic" ],
+    "copy-from": "generic_city_house_basement",
+    "spawns": { "group": "GROUP_BASEMENT_HOUSE", "population": [ 1, 1 ], "chance": 80 }
+  },
   {
     "type": "overmap_terrain",
     "id": "lmoe_under_full",
diff --git a/data/mods/package_bionic_professions/multitile_city_buildings.json b/data/mods/package_bionic_professions/multitile_city_buildings.json
index 53f3eeb864d02..e832388f9b23d 100644
--- a/data/mods/package_bionic_professions/multitile_city_buildings.json
+++ b/data/mods/package_bionic_professions/multitile_city_buildings.json
@@ -8,16 +8,5 @@
       { "point": [ 0, 0, 1 ], "overmap": "house_09_roof_north" },
       { "point": [ 0, 0, -1 ], "overmap": "basement_bionic_north" }
     ]
-  },
-  {
-    "type": "city_building",
-    "id": "house_09b",
-    "copy-from": "house_09b",
-    "locations": [ "land" ],
-    "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "house_09_north" },
-      { "point": [ 0, 0, 1 ], "overmap": "house_09_roof_north" },
-      { "point": [ 0, 0, -1 ], "overmap": "basement_bionic_decoy_north" }
-    ]
   }
 ]