rename houses for save migration

CleverRaven · Feb 25, 2020 · 2e1aa0a · 2e1aa0a
1 parent 6ee8955
commit 2e1aa0a
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 11 deletions.
diff --git a/...i_Structures/worldgen/houses/house_1.json → ...i_Structures/worldgen/houses/house33.json b/...i_Structures/worldgen/houses/house_1.json → ...i_Structures/worldgen/houses/house33.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_33" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/...i_Structures/worldgen/houses/house_2.json → ...i_Structures/worldgen/houses/house34.json b/...i_Structures/worldgen/houses/house_2.json → ...i_Structures/worldgen/houses/house34.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_34" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/...i_Structures/worldgen/houses/house_3.json → ...i_Structures/worldgen/houses/house35.json b/...i_Structures/worldgen/houses/house_3.json → ...i_Structures/worldgen/houses/house35.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_35" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/...i_Structures/worldgen/houses/house_4.json → ...i_Structures/worldgen/houses/house36.json b/...i_Structures/worldgen/houses/house_4.json → ...i_Structures/worldgen/houses/house36.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_36" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/...i_Structures/worldgen/houses/house_5.json → ...i_Structures/worldgen/houses/house37.json b/...i_Structures/worldgen/houses/house_5.json → ...i_Structures/worldgen/houses/house37.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_37" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/...i_Structures/worldgen/houses/house_6.json → ...i_Structures/worldgen/houses/house38.json b/...i_Structures/worldgen/houses/house_6.json → ...i_Structures/worldgen/houses/house38.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_38" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/...i_Structures/worldgen/houses/house_7.json → ...i_Structures/worldgen/houses/house39.json b/...i_Structures/worldgen/houses/house_7.json → ...i_Structures/worldgen/houses/house39.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_39" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/...i_Structures/worldgen/houses/house_8.json → ...i_Structures/worldgen/houses/house40.json b/...i_Structures/worldgen/houses/house_8.json → ...i_Structures/worldgen/houses/house40.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_40" ],
     "object": {
       "fill_ter": "t_floor_waxed",
       "rows": [

diff --git a/...i_Structures/worldgen/houses/house_9.json → ...i_Structures/worldgen/houses/house41.json b/...i_Structures/worldgen/houses/house_9.json → ...i_Structures/worldgen/houses/house41.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_41" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/..._Structures/worldgen/houses/house_10.json → ...i_Structures/worldgen/houses/house42.json b/..._Structures/worldgen/houses/house_10.json → ...i_Structures/worldgen/houses/house42.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_42" ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [

diff --git a/data/mods/Fuji_Structures/worldgen/overmap_terrain.json b/data/mods/Fuji_Structures/worldgen/overmap_terrain.json
@@ -416,5 +416,95 @@
     "see_cost": 5,
     "extras": "build",
     "mondensity": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_33",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_34",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_35",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_36",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_37",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_38",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_39",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_40",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_41",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_42",
+    "copy-from": "generic_city_building",
+    "name": "house",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
   }
 ]
diff --git a/data/mods/Fuji_Structures/worldgen/regional_overlay.json b/data/mods/Fuji_Structures/worldgen/regional_overlay.json
@@ -3,7 +3,20 @@
     "type": "region_overlay",
     "regions": [ "all" ],
     "city": {
-      "houses": { "s_apt": 40, "s_apt_2": 40 },
+      "houses": {
+        "s_apt": 40,
+        "s_apt_2": 40,
+        "house_33": 50,
+        "house_34": 50,
+        "house_35": 50,
+        "house_36": 50,
+        "house_37": 50,
+        "house_38": 50,
+        "house_39": 50,
+        "house_40": 50,
+        "house_41": 50,
+        "house_42": 50
+      },
       "shops": {
         "s_gunstore": 500,
         "s_diner": 400,