From 2e1aa0a9d37799cc95158b3cac7ec8f7712eccd8 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:37:18 -0500 Subject: [PATCH] rename houses for save migration --- .../houses/{house_1.json => house33.json} | 2 +- .../houses/{house_2.json => house34.json} | 2 +- .../houses/{house_3.json => house35.json} | 2 +- .../houses/{house_4.json => house36.json} | 2 +- .../houses/{house_5.json => house37.json} | 2 +- .../houses/{house_6.json => house38.json} | 2 +- .../houses/{house_7.json => house39.json} | 2 +- .../houses/{house_8.json => house40.json} | 2 +- .../houses/{house_9.json => house41.json} | 2 +- .../houses/{house_10.json => house42.json} | 2 +- .../worldgen/overmap_terrain.json | 90 +++++++++++++++++++ .../worldgen/regional_overlay.json | 15 +++- 12 files changed, 114 insertions(+), 11 deletions(-) rename data/mods/Fuji_Structures/worldgen/houses/{house_1.json => house33.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_2.json => house34.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_3.json => house35.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_4.json => house36.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_5.json => house37.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_6.json => house38.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_7.json => house39.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_8.json => house40.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_9.json => house41.json} (99%) rename data/mods/Fuji_Structures/worldgen/houses/{house_10.json => house42.json} (99%) diff --git a/data/mods/Fuji_Structures/worldgen/houses/house_1.json b/data/mods/Fuji_Structures/worldgen/houses/house33.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_1.json rename to data/mods/Fuji_Structures/worldgen/houses/house33.json index 627c9d017d689..9293973e645b4 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_1.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_2.json b/data/mods/Fuji_Structures/worldgen/houses/house34.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_2.json rename to data/mods/Fuji_Structures/worldgen/houses/house34.json index 3e0e7d0b52de0..627f3173f0ebe 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_2.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_3.json b/data/mods/Fuji_Structures/worldgen/houses/house35.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_3.json rename to data/mods/Fuji_Structures/worldgen/houses/house35.json index e24d9dbc518cf..b5fc087f961c9 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_3.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_4.json b/data/mods/Fuji_Structures/worldgen/houses/house36.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_4.json rename to data/mods/Fuji_Structures/worldgen/houses/house36.json index dbaa09a287d54..afb588f547583 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_4.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_5.json b/data/mods/Fuji_Structures/worldgen/houses/house37.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_5.json rename to data/mods/Fuji_Structures/worldgen/houses/house37.json index 024dc563911f5..b208d1d3f4227 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_5.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_6.json b/data/mods/Fuji_Structures/worldgen/houses/house38.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_6.json rename to data/mods/Fuji_Structures/worldgen/houses/house38.json index 3602887fd39cc..f8f6ebd57298e 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_6.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_7.json b/data/mods/Fuji_Structures/worldgen/houses/house39.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_7.json rename to data/mods/Fuji_Structures/worldgen/houses/house39.json index f91e0d1e4529f..4fed6ea94e086 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_7.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_8.json b/data/mods/Fuji_Structures/worldgen/houses/house40.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_8.json rename to data/mods/Fuji_Structures/worldgen/houses/house40.json index b45b2e564cd3d..a6ab3680ec038 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_8.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_9.json b/data/mods/Fuji_Structures/worldgen/houses/house41.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_9.json rename to data/mods/Fuji_Structures/worldgen/houses/house41.json index ab76ee7f8df67..9dc0f1264f0dc 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_9.json +++ b/data/mods/Fuji_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/data/mods/Fuji_Structures/worldgen/houses/house_10.json b/data/mods/Fuji_Structures/worldgen/houses/house42.json similarity index 99% rename from data/mods/Fuji_Structures/worldgen/houses/house_10.json rename to data/mods/Fuji_Structures/worldgen/houses/house42.json index fdb2aaa48f72f..a63f86cd4259c 100644 --- a/data/mods/Fuji_Structures/worldgen/houses/house_10.json +++ b/data/mods/Fuji_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 index 0640b73b0c8c7..352be97d12782 100644 --- 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 index 07127027c7ac6..9a65464403aaa 100644 --- 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,