From 0aeff7735e550f2f2c858b034a2d7fae8f33efb5 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Wed, 3 Apr 2024 14:35:12 +0100 Subject: [PATCH 1/4] Yeet 75% of the list --- data/json/regional_map_settings.json | 191 ++++++--------------------- 1 file changed, 39 insertions(+), 152 deletions(-) diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 72a854c661ab7..2d3e591031930 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -345,146 +345,51 @@ }, "forest_thick": { "terrains": [ - "forest_thick", - "forest_trail_isolated", - "forest_trail_end_north", - "forest_trail_end_east", - "forest_trail_end_south", - "forest_trail_end_west", - "forest_trail_ns", - "forest_trail_ew", - "forest_trail_ne", - "forest_trail_es", - "forest_trail_sw", - "forest_trail_wn", - "forest_trail_new", - "forest_trail_nsw", - "forest_trail_esw", - "forest_trail_nes", - "forest_trail_nesw", - "campsite_north", - "campsite_south", - "campsite_east", - "campsite_west", - "campsite_cabin_incomplete_north", - "campsite_cabin_incomplete_south", - "campsite_cabin_incomplete_east", - "campsite_cabin_incomplete_west", - "campsite_field_biker_north", - "campsite_field_biker_south", - "campsite_field_biker_east", - "campsite_field_biker_west", - "campsite_field_biker_destroyed_north", - "campsite_field_biker_destroyed_south", - "campsite_field_biker_destroyed_east", - "campsite_field_biker_destroyed_west", - "campsite_a_north", - "campsite_a_south", - "campsite_a_east", - "campsite_a_west", - "desolatebarn_north", - "desolatebarn_south", - "desolatebarn_east", - "desolatebarn_west", - "derelict_property_north", - "derelict_property_south", - "derelict_property_east", - "derelict_property_west", - "homelesscamp_north", - "homelesscamp_south", - "homelesscamp_east", - "homelesscamp_west", - "spider_pit_north", - "spider_pit_south", - "spider_pit_east", - "spider_pit_west", - "survivor_forest_camp_north", - "survivor_forest_camp_south", - "survivor_forest_camp_east", - "survivor_forest_camp_west", - "central_lab_entrance", - "moonshine_still_north", - "moonshine_still_south", - "moonshine_still_east", - "moonshine_still_west", - "moonshine_still_1_north", - "moonshine_still_1_south", - "moonshine_still_1_east", - "moonshine_still_1_west", - "moonshine_still_2_north", - "moonshine_still_2_south", - "moonshine_still_2_east", - "moonshine_still_2_west", - "standing_stones", - "ws_survivor_bunker_f0_north", - "ws_survivor_bunker_f0_south", - "ws_survivor_bunker_f0_east", - "ws_survivor_bunker_f0_west", - "bandit_cabin_north", - "bandit_cabin_south", - "bandit_cabin_east", - "bandit_cabin_west", - "bandit_garage_1_north", - "bandit_garage_1_south", - "bandit_garage_1_east", - "bandit_garage_1_west", - "bandit_garage_2_north", - "bandit_garage_2_south", - "bandit_garage_2_east", - "bandit_garage_2_west", - "natural_spring_north", - "natural_spring_south", - "natural_spring_east", - "natural_spring_west", + "anthill", + "bandit_cabin", + "bandit_garage_1", + "bandit_garage_2", + "campsite", + "campsite_a", + "campsite_cabin_incomplete", + "campsite_field_biker", + "campsite_field_biker_destroyed", "cave", - "special_forest_thick", - "island_forest_north", - "island_forest_east", - "island_forest_south", - "island_forest_west", - "island_forest_thick_north", - "island_forest_thick_east", - "island_forest_thick_south", - "island_forest_thick_west", + "central_lab_entrance", + "corpse_tentacle_surface_entry", + "derelict_property", + "desolatebarn", + "forest_thick", + "forest_trail", + "forest_trail_intersection", + "homelesscamp", + "island_forest", + "island_forest_thick", "lake_shore", + "moonshine_still", + "moonshine_still_1", + "moonshine_still_2", + "natural_spring", + "river", + "river_c_not_ne", + "river_c_not_nw", + "river_c_not_se", + "river_c_not_sw", "river_center", - "river_north", - "river_east", - "river_south", - "river_west", "river_ne", + "river_nw", "river_se", "river_sw", - "river_nw", - "river_c_not_ne", - "river_c_not_se", - "river_c_not_sw", - "river_c_not_nw", - "stream_north", - "stream_east", - "stream_south", - "stream_west", - "stream_corner_north", - "stream_corner_east", - "stream_corner_south", - "stream_corner_west", - "stream_end_north", - "stream_end_east", - "stream_end_south", - "stream_end_west", "slimepit_top", - "anthill_north", - "anthill_east", - "anthill_south", - "anthill_west", - "corpse_tentacle_surface_entry_north", - "corpse_tentacle_surface_entry_east", - "corpse_tentacle_surface_entry_south", - "corpse_tentacle_surface_entry_west", - "ws_giant_sinkhole_1_north", - "ws_giant_sinkhole_1_east", - "ws_giant_sinkhole_1_south", - "ws_giant_sinkhole_1_west" + "special_forest_thick", + "spider_pit", + "standing_stones", + "stream", + "stream_corner", + "stream_end", + "survivor_forest_camp", + "ws_giant_sinkhole_1", + "ws_survivor_bunker_f0" ], "sparseness_adjacency_factor": 4, "item_group": "forest", @@ -522,25 +427,7 @@ "terrain_furniture": { } }, "forest_water": { - "terrains": [ - "forest_water", - "hunter_shack_north", - "hunter_shack_south", - "hunter_shack_east", - "hunter_shack_west", - "hunter_shack_1_north", - "hunter_shack_1_south", - "hunter_shack_1_east", - "hunter_shack_1_west", - "shipwreck_river_1_north", - "shipwreck_river_1_south", - "shipwreck_river_1_east", - "shipwreck_river_1_west", - "shipwreck_river_2_north", - "shipwreck_river_2_south", - "shipwreck_river_2_east", - "shipwreck_river_2_west" - ], + "terrains": [ "forest_water", "hunter_shack", "hunter_shack_1", "shipwreck_river_1", "shipwreck_river_2" ], "sparseness_adjacency_factor": 2, "item_group": "forest", "item_group_chance": 60, From 7389929889145d8803a7ebd938a268808ccc4326 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:16:36 +0100 Subject: [PATCH 2/4] oter_id -> oter_type_id --- src/mapgen_functions.cpp | 11 ++++------- src/regional_settings.cpp | 2 +- src/regional_settings.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/mapgen_functions.cpp b/src/mapgen_functions.cpp index fd04b2af29fba..d7d98aed723e4 100644 --- a/src/mapgen_functions.cpp +++ b/src/mapgen_functions.cpp @@ -873,10 +873,7 @@ void mapgen_forest( mapgendata &dat ) // being placed by the relative density of the current terrain to its // neighbors. For example, a forest_thick surrounded by forest_thick on // all sides can be much more dense than a forest_water surrounded by - // fields on all sides. The properties of this density and blending would - // do well to be encoded in JSON for the regional and biome settings, but - // for now use the general hardcoded pattern from previous generations of the - // algorithm. + // fields on all sides. // "Sparsity Factor" is a misnomer carried over from JSON; the value reflects // the density of the terrain, not the sparsity. @@ -894,7 +891,7 @@ void mapgen_forest( mapgendata &dat ) * @return A discrete scale of the density of natural features occurring in \p ot. */ const auto get_sparseness_adjacency_factor = [&dat]( const oter_id & ot ) { - const auto biome = dat.region.forest_composition.biomes.find( ot ); + const auto biome = dat.region.forest_composition.biomes.find( ot->get_type_id() ); if( biome == dat.region.forest_composition.biomes.end() ) { return 0; } @@ -936,7 +933,7 @@ void mapgen_forest( mapgendata &dat ) // This can be calculated once from dat.t_nesw, and stored here: std::array adjacent_biomes; for( int d = 0; d < 7; d++ ) { - auto lookup = dat.region.forest_composition.biomes.find( dat.t_nesw[d] ); + auto lookup = dat.region.forest_composition.biomes.find( dat.t_nesw[d]->get_type_id() ); if( lookup != dat.region.forest_composition.biomes.end() ) { adjacent_biomes[d] = &( lookup->second ); } else { @@ -1036,7 +1033,7 @@ void mapgen_forest( mapgendata &dat ) } // Get the current biome definition for this terrain. - const auto current_biome_def_it = dat.region.forest_composition.biomes.find( dat.terrain_type() ); + const auto current_biome_def_it = dat.region.forest_composition.biomes.find( dat.terrain_type()->get_type_id() ); // If there is no biome definition for this terrain, fill in with the region's default ground cover // and bail--nothing more to be done. Should not continue with terrain feathering if there is diff --git a/src/regional_settings.cpp b/src/regional_settings.cpp index 8483ea0deae1d..216f7acb50785 100644 --- a/src/regional_settings.cpp +++ b/src/regional_settings.cpp @@ -889,7 +889,7 @@ void forest_mapgen_settings::finalize() { for( auto &pr : unfinalized_biomes ) { pr.second.finalize(); - const oter_id ot( pr.first ); + const oter_type_id ot( pr.first ); biomes[ot] = pr.second; } } diff --git a/src/regional_settings.h b/src/regional_settings.h index 2551f4a83981d..c873cbb9d1ecc 100644 --- a/src/regional_settings.h +++ b/src/regional_settings.h @@ -152,7 +152,7 @@ struct forest_biome { struct forest_mapgen_settings { std::map unfinalized_biomes; - std::map biomes; + std::map biomes; void finalize(); forest_mapgen_settings() = default; From a3a360df1be1a476453ac77a2a7a4a158398844a Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:30:58 +0100 Subject: [PATCH 3/4] Mods --- .../Magiclysm/worldgen/regional_overlay.json | 176 ++++-------------- data/mods/No_Hope/regional_map_settings.json | 129 +++---------- .../tropical_regional_map_settings.json | 129 +++---------- .../alberta_regional_map_settings.json | 129 +++---------- data/mods/innawood/region_overlay.json | 47 +---- 5 files changed, 117 insertions(+), 493 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/regional_overlay.json b/data/mods/Magiclysm/worldgen/regional_overlay.json index 37c152463fbef..961b518c91c18 100644 --- a/data/mods/Magiclysm/worldgen/regional_overlay.json +++ b/data/mods/Magiclysm/worldgen/regional_overlay.json @@ -62,150 +62,52 @@ "forest_mapgen_settings": { "forest_thick": { "terrains": [ - "forest_thick", - "forest_trail_isolated", - "forest_trail_end_north", - "forest_trail_end_east", - "forest_trail_end_south", - "forest_trail_end_west", - "forest_trail_ns", - "forest_trail_ew", - "forest_trail_ne", - "forest_trail_es", - "forest_trail_sw", - "forest_trail_wn", - "forest_trail_new", - "forest_trail_nsw", - "forest_trail_esw", - "forest_trail_nes", - "forest_trail_nesw", - "campsite_north", - "campsite_south", - "campsite_east", - "campsite_west", - "campsite_cabin_incomplete_north", - "campsite_cabin_incomplete_south", - "campsite_cabin_incomplete_east", - "campsite_cabin_incomplete_west", - "campsite_field_biker_north", - "campsite_field_biker_south", - "campsite_field_biker_east", - "campsite_field_biker_west", - "campsite_field_biker_destroyed_north", - "campsite_field_biker_destroyed_south", - "campsite_field_biker_destroyed_east", - "campsite_field_biker_destroyed_west", - "campsite_a_north", - "campsite_a_south", - "campsite_a_east", - "campsite_a_west", - "desolatebarn_north", - "desolatebarn_south", - "desolatebarn_east", - "desolatebarn_west", - "derelict_property_north", - "derelict_property_south", - "derelict_property_east", - "derelict_property_west", - "druid_ritual_home_z0_north", - "druid_ritual_home_z0_west", - "druid_ritual_home_z0_east", - "druid_ritual_home_z0_south", - "homelesscamp_north", - "homelesscamp_south", - "homelesscamp_east", - "homelesscamp_west", - "spider_pit_north", - "spider_pit_south", - "spider_pit_east", - "spider_pit_west", - "survivor_forest_camp_north", - "survivor_forest_camp_south", - "survivor_forest_camp_east", - "survivor_forest_camp_west", - "central_lab_entrance", - "moonshine_still_north", - "moonshine_still_south", - "moonshine_still_east", - "moonshine_still_west", - "moonshine_still_1_north", - "moonshine_still_1_south", - "moonshine_still_1_east", - "moonshine_still_1_west", - "moonshine_still_2_north", - "moonshine_still_2_south", - "moonshine_still_2_east", - "moonshine_still_2_west", - "standing_stones", - "ws_survivor_bunker_f0_north", - "ws_survivor_bunker_f0_south", - "ws_survivor_bunker_f0_east", - "ws_survivor_bunker_f0_west", - "bandit_cabin_north", - "bandit_cabin_south", - "bandit_cabin_east", - "bandit_cabin_west", - "bandit_garage_1_north", - "bandit_garage_1_south", - "bandit_garage_1_east", - "bandit_garage_1_west", - "bandit_garage_2_north", - "bandit_garage_2_south", - "bandit_garage_2_east", - "bandit_garage_2_west", - "natural_spring_north", - "natural_spring_south", - "natural_spring_east", - "natural_spring_west", + "anthill", + "bandit_cabin", + "bandit_garage_1", + "bandit_garage_2", + "campsite", + "campsite_a", + "campsite_cabin_incomplete", + "campsite_field_biker", + "campsite_field_biker_destroyed", "cave", - "special_forest_thick", - "island_forest_north", - "island_forest_east", - "island_forest_south", - "island_forest_west", - "island_forest_thick_north", - "island_forest_thick_east", - "island_forest_thick_south", - "island_forest_thick_west", + "central_lab_entrance", + "corpse_tentacle_surface_entry", + "derelict_property", + "desolatebarn", + "druid_ritual_home_z0", + "forest_thick", + "forest_trail", + "forest_trail_intersection", + "homelesscamp", + "island_forest", + "island_forest_thick", "lake_shore", + "moonshine_still", + "moonshine_still_1", + "moonshine_still_2", + "natural_spring", + "river", + "river_c_not_ne", + "river_c_not_nw", + "river_c_not_se", + "river_c_not_sw", "river_center", - "river_north", - "river_east", - "river_south", - "river_west", "river_ne", + "river_nw", "river_se", "river_sw", - "river_nw", - "river_c_not_ne", - "river_c_not_se", - "river_c_not_sw", - "river_c_not_nw", - "stream_north", - "stream_east", - "stream_south", - "stream_west", - "stream_corner_north", - "stream_corner_east", - "stream_corner_south", - "stream_corner_west", - "stream_end_north", - "stream_end_east", - "stream_end_south", - "stream_end_west", "slimepit_top", - "anthill_north", - "anthill_east", - "anthill_south", - "anthill_west", - "corpse_tentacle_surface_entry_north", - "corpse_tentacle_surface_entry_east", - "corpse_tentacle_surface_entry_south", - "corpse_tentacle_surface_entry_west", - "ws_giant_sinkhole_1_north", - "ws_giant_sinkhole_1_east", - "ws_giant_sinkhole_1_south", - "ws_giant_sinkhole_1_west" + "special_forest_thick", + "spider_pit", + "standing_stones", + "stream", + "stream_corner", + "stream_end", + "survivor_forest_camp", + "ws_giant_sinkhole_1", + "ws_survivor_bunker_f0" ] } } diff --git a/data/mods/No_Hope/regional_map_settings.json b/data/mods/No_Hope/regional_map_settings.json index b3d7746df6f1f..bb02f1faf4676 100644 --- a/data/mods/No_Hope/regional_map_settings.json +++ b/data/mods/No_Hope/regional_map_settings.json @@ -318,95 +318,30 @@ }, "forest_thick": { "terrains": [ - "forest_thick", - "forest_trail_isolated", - "forest_trail_end_north", - "forest_trail_end_east", - "forest_trail_end_south", - "forest_trail_end_west", - "forest_trail_ns", - "forest_trail_ew", - "forest_trail_ne", - "forest_trail_es", - "forest_trail_sw", - "forest_trail_wn", - "forest_trail_new", - "forest_trail_nsw", - "forest_trail_esw", - "forest_trail_nes", - "forest_trail_nesw", - "campsite_north", - "campsite_south", - "campsite_east", - "campsite_west", - "campsite_cabin_incomplete_north", - "campsite_cabin_incomplete_south", - "campsite_cabin_incomplete_east", - "campsite_cabin_incomplete_west", - "campsite_field_biker_north", - "campsite_field_biker_south", - "campsite_field_biker_east", - "campsite_field_biker_west", - "campsite_field_biker_destroyed_north", - "campsite_field_biker_destroyed_south", - "campsite_field_biker_destroyed_east", - "campsite_field_biker_destroyed_west", - "campsite_a_north", - "campsite_a_south", - "campsite_a_east", - "campsite_a_west", - "desolatebarn_north", - "desolatebarn_south", - "desolatebarn_east", - "desolatebarn_west", - "derelict_property_north", - "derelict_property_south", - "derelict_property_east", - "derelict_property_west", - "homelesscamp_north", - "homelesscamp_south", - "homelesscamp_east", - "homelesscamp_west", - "spider_pit_north", - "spider_pit_south", - "spider_pit_east", - "spider_pit_west", + "bandit_cabin", + "bandit_garage_1", + "bandit_garage_2", + "campsite", + "campsite_a", + "campsite_cabin_incomplete", + "campsite_field_biker", + "campsite_field_biker_destroyed", + "cave", "central_lab_entrance", - "moonshine_still_north", - "moonshine_still_south", - "moonshine_still_east", - "moonshine_still_west", - "moonshine_still_1_north", - "moonshine_still_1_south", - "moonshine_still_1_east", - "moonshine_still_1_west", - "moonshine_still_2_north", - "moonshine_still_2_south", - "moonshine_still_2_east", - "moonshine_still_2_west", + "derelict_property", + "desolatebarn", + "forest_thick", + "forest_trail", + "forest_trail_intersection", + "homelesscamp", + "moonshine_still", + "moonshine_still_1", + "moonshine_still_2", + "natural_spring", + "special_forest_thick", + "spider_pit", "standing_stones", - "ws_survivor_bunker_f0_north", - "ws_survivor_bunker_f0_south", - "ws_survivor_bunker_f0_east", - "ws_survivor_bunker_f0_west", - "bandit_cabin_north", - "bandit_cabin_south", - "bandit_cabin_east", - "bandit_cabin_west", - "bandit_garage_1_north", - "bandit_garage_1_south", - "bandit_garage_1_east", - "bandit_garage_1_west", - "bandit_garage_2_north", - "bandit_garage_2_south", - "bandit_garage_2_east", - "bandit_garage_2_west", - "natural_spring_north", - "natural_spring_south", - "natural_spring_east", - "natural_spring_west", - "cave", - "special_forest_thick" + "ws_survivor_bunker_f0" ], "sparseness_adjacency_factor": 4, "item_group": "forest", @@ -439,25 +374,7 @@ "terrain_furniture": { } }, "forest_water": { - "terrains": [ - "forest_water", - "hunter_shack_north", - "hunter_shack_south", - "hunter_shack_east", - "hunter_shack_west", - "hunter_shack_1_north", - "hunter_shack_1_south", - "hunter_shack_1_east", - "hunter_shack_1_west", - "shipwreck_river_1_north", - "shipwreck_river_1_south", - "shipwreck_river_1_east", - "shipwreck_river_1_west", - "shipwreck_river_2_north", - "shipwreck_river_2_south", - "shipwreck_river_2_east", - "shipwreck_river_2_west" - ], + "terrains": [ "forest_water", "hunter_shack", "hunter_shack_1", "shipwreck_river_1", "shipwreck_river_2" ], "sparseness_adjacency_factor": 2, "item_group": "forest", "item_group_chance": 60, diff --git a/data/mods/TropiCataclysm/tropical_regional_map_settings.json b/data/mods/TropiCataclysm/tropical_regional_map_settings.json index df73774882e65..ff0613243e339 100644 --- a/data/mods/TropiCataclysm/tropical_regional_map_settings.json +++ b/data/mods/TropiCataclysm/tropical_regional_map_settings.json @@ -371,95 +371,30 @@ }, "forest_thick": { "terrains": [ - "forest_thick", - "forest_trail_isolated", - "forest_trail_end_north", - "forest_trail_end_east", - "forest_trail_end_south", - "forest_trail_end_west", - "forest_trail_ns", - "forest_trail_ew", - "forest_trail_ne", - "forest_trail_es", - "forest_trail_sw", - "forest_trail_wn", - "forest_trail_new", - "forest_trail_nsw", - "forest_trail_esw", - "forest_trail_nes", - "forest_trail_nesw", - "campsite_north", - "campsite_south", - "campsite_east", - "campsite_west", - "campsite_cabin_incomplete_north", - "campsite_cabin_incomplete_south", - "campsite_cabin_incomplete_east", - "campsite_cabin_incomplete_west", - "campsite_field_biker_north", - "campsite_field_biker_south", - "campsite_field_biker_east", - "campsite_field_biker_west", - "campsite_field_biker_destroyed_north", - "campsite_field_biker_destroyed_south", - "campsite_field_biker_destroyed_east", - "campsite_field_biker_destroyed_west", - "campsite_a_north", - "campsite_a_south", - "campsite_a_east", - "campsite_a_west", - "desolatebarn_north", - "desolatebarn_south", - "desolatebarn_east", - "desolatebarn_west", - "derelict_property_north", - "derelict_property_south", - "derelict_property_east", - "derelict_property_west", - "homelesscamp_north", - "homelesscamp_south", - "homelesscamp_east", - "homelesscamp_west", - "spider_pit_north", - "spider_pit_south", - "spider_pit_east", - "spider_pit_west", + "bandit_cabin", + "bandit_garage_1", + "bandit_garage_2", + "campsite", + "campsite_a", + "campsite_cabin_incomplete", + "campsite_field_biker", + "campsite_field_biker_destroyed", + "cave", "central_lab_entrance", - "moonshine_still_north", - "moonshine_still_south", - "moonshine_still_east", - "moonshine_still_west", - "moonshine_still_1_north", - "moonshine_still_1_south", - "moonshine_still_1_east", - "moonshine_still_1_west", - "moonshine_still_2_north", - "moonshine_still_2_south", - "moonshine_still_2_east", - "moonshine_still_2_west", + "derelict_property", + "desolatebarn", + "forest_thick", + "forest_trail", + "forest_trail_intersection", + "homelesscamp", + "moonshine_still", + "moonshine_still_1", + "moonshine_still_2", + "natural_spring", + "special_forest_thick", + "spider_pit", "standing_stones", - "ws_survivor_bunker_f0_north", - "ws_survivor_bunker_f0_south", - "ws_survivor_bunker_f0_east", - "ws_survivor_bunker_f0_west", - "bandit_cabin_north", - "bandit_cabin_south", - "bandit_cabin_east", - "bandit_cabin_west", - "bandit_garage_1_north", - "bandit_garage_1_south", - "bandit_garage_1_east", - "bandit_garage_1_west", - "bandit_garage_2_north", - "bandit_garage_2_south", - "bandit_garage_2_east", - "bandit_garage_2_west", - "natural_spring_north", - "natural_spring_south", - "natural_spring_east", - "natural_spring_west", - "cave", - "special_forest_thick" + "ws_survivor_bunker_f0" ], "sparseness_adjacency_factor": 4, "item_group": "forest", @@ -507,25 +442,7 @@ "terrain_furniture": { } }, "forest_water": { - "terrains": [ - "forest_water", - "hunter_shack_north", - "hunter_shack_south", - "hunter_shack_east", - "hunter_shack_west", - "hunter_shack_1_north", - "hunter_shack_1_south", - "hunter_shack_1_east", - "hunter_shack_1_west", - "shipwreck_river_1_north", - "shipwreck_river_1_south", - "shipwreck_river_1_east", - "shipwreck_river_1_west", - "shipwreck_river_2_north", - "shipwreck_river_2_south", - "shipwreck_river_2_east", - "shipwreck_river_2_west" - ], + "terrains": [ "forest_water", "hunter_shack", "hunter_shack_1", "shipwreck_river_1", "shipwreck_river_2" ], "sparseness_adjacency_factor": 2, "item_group": "forest", "item_group_chance": 60, diff --git a/data/mods/classic_zombies/alberta_regional_map_settings.json b/data/mods/classic_zombies/alberta_regional_map_settings.json index ff045c8b25a96..f243017b3f09b 100644 --- a/data/mods/classic_zombies/alberta_regional_map_settings.json +++ b/data/mods/classic_zombies/alberta_regional_map_settings.json @@ -304,95 +304,30 @@ }, "forest_thick": { "terrains": [ - "forest_thick", - "forest_trail_isolated", - "forest_trail_end_north", - "forest_trail_end_east", - "forest_trail_end_south", - "forest_trail_end_west", - "forest_trail_ns", - "forest_trail_ew", - "forest_trail_ne", - "forest_trail_es", - "forest_trail_sw", - "forest_trail_wn", - "forest_trail_new", - "forest_trail_nsw", - "forest_trail_esw", - "forest_trail_nes", - "forest_trail_nesw", - "campsite_north", - "campsite_south", - "campsite_east", - "campsite_west", - "campsite_cabin_incomplete_north", - "campsite_cabin_incomplete_south", - "campsite_cabin_incomplete_east", - "campsite_cabin_incomplete_west", - "campsite_field_biker_north", - "campsite_field_biker_south", - "campsite_field_biker_east", - "campsite_field_biker_west", - "campsite_field_biker_destroyed_north", - "campsite_field_biker_destroyed_south", - "campsite_field_biker_destroyed_east", - "campsite_field_biker_destroyed_west", - "campsite_a_north", - "campsite_a_south", - "campsite_a_east", - "campsite_a_west", - "desolatebarn_north", - "desolatebarn_south", - "desolatebarn_east", - "desolatebarn_west", - "derelict_property_north", - "derelict_property_south", - "derelict_property_east", - "derelict_property_west", - "homelesscamp_north", - "homelesscamp_south", - "homelesscamp_east", - "homelesscamp_west", - "spider_pit_north", - "spider_pit_south", - "spider_pit_east", - "spider_pit_west", + "bandit_cabin", + "bandit_garage_1", + "bandit_garage_2", + "campsite", + "campsite_a", + "campsite_cabin_incomplete", + "campsite_field_biker", + "campsite_field_biker_destroyed", + "cave", "central_lab_entrance", - "moonshine_still_north", - "moonshine_still_south", - "moonshine_still_east", - "moonshine_still_west", - "moonshine_still_1_north", - "moonshine_still_1_south", - "moonshine_still_1_east", - "moonshine_still_1_west", - "moonshine_still_2_north", - "moonshine_still_2_south", - "moonshine_still_2_east", - "moonshine_still_2_west", + "derelict_property", + "desolatebarn", + "forest_thick", + "forest_trail", + "forest_trail_intersection", + "homelesscamp", + "moonshine_still", + "moonshine_still_1", + "moonshine_still_2", + "natural_spring", + "special_forest_thick", + "spider_pit", "standing_stones", - "ws_survivor_bunker_f0_north", - "ws_survivor_bunker_f0_south", - "ws_survivor_bunker_f0_east", - "ws_survivor_bunker_f0_west", - "bandit_cabin_north", - "bandit_cabin_south", - "bandit_cabin_east", - "bandit_cabin_west", - "bandit_garage_1_north", - "bandit_garage_1_south", - "bandit_garage_1_east", - "bandit_garage_1_west", - "bandit_garage_2_north", - "bandit_garage_2_south", - "bandit_garage_2_east", - "bandit_garage_2_west", - "natural_spring_north", - "natural_spring_south", - "natural_spring_east", - "natural_spring_west", - "cave", - "special_forest_thick" + "ws_survivor_bunker_f0" ], "sparseness_adjacency_factor": 4, "item_group": "forest", @@ -425,25 +360,7 @@ "terrain_furniture": { } }, "forest_water": { - "terrains": [ - "forest_water", - "hunter_shack_north", - "hunter_shack_south", - "hunter_shack_east", - "hunter_shack_west", - "hunter_shack_1_north", - "hunter_shack_1_south", - "hunter_shack_1_east", - "hunter_shack_1_west", - "shipwreck_river_1_north", - "shipwreck_river_1_south", - "shipwreck_river_1_east", - "shipwreck_river_1_west", - "shipwreck_river_2_north", - "shipwreck_river_2_south", - "shipwreck_river_2_east", - "shipwreck_river_2_west" - ], + "terrains": [ "forest_water", "hunter_shack", "hunter_shack_1", "shipwreck_river_1", "shipwreck_river_2" ], "sparseness_adjacency_factor": 2, "item_group": "forest", "item_group_chance": 60, diff --git a/data/mods/innawood/region_overlay.json b/data/mods/innawood/region_overlay.json index d90fb06d24aab..3d0305d548591 100644 --- a/data/mods/innawood/region_overlay.json +++ b/data/mods/innawood/region_overlay.json @@ -14,46 +14,17 @@ "forest_mapgen_settings": { "forest_thick": { "terrains": [ - "forest_thick", - "forest_trail_isolated", - "forest_trail_end_north", - "forest_trail_end_east", - "forest_trail_end_south", - "forest_trail_end_west", - "forest_trail_ns", - "forest_trail_ew", - "forest_trail_ne", - "forest_trail_es", - "forest_trail_sw", - "forest_trail_wn", - "forest_trail_new", - "forest_trail_nsw", - "forest_trail_esw", - "forest_trail_nes", - "forest_trail_nesw", - "spider_pit_north", - "spider_pit_south", - "spider_pit_east", - "spider_pit_west", - "standing_stones", - "natural_spring_north", - "natural_spring_south", - "natural_spring_east", - "natural_spring_west", "cave_innawood", + "forest_thick", + "forest_trail", + "forest_trail_intersection", + "natural_spring", "special_forest", - "stream_north", - "stream_east", - "stream_south", - "stream_west", - "stream_corner_north", - "stream_corner_east", - "stream_corner_south", - "stream_corner_west", - "stream_end_north", - "stream_end_east", - "stream_end_south", - "stream_end_west" + "spider_pit", + "standing_stones", + "stream", + "stream_corner", + "stream_end" ] }, "forest_water": { "terrains": [ "forest_water" ] } From de453193312f21e17f6070518567ceda56982c32 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:33:41 +0100 Subject: [PATCH 4/4] Astyle --- src/mapgen_functions.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mapgen_functions.cpp b/src/mapgen_functions.cpp index 99ca285fba8cd..3a26a387891e8 100644 --- a/src/mapgen_functions.cpp +++ b/src/mapgen_functions.cpp @@ -1033,7 +1033,8 @@ void mapgen_forest( mapgendata &dat ) } // Get the current biome definition for this terrain. - const auto current_biome_def_it = dat.region.forest_composition.biomes.find( dat.terrain_type()->get_type_id() ); + const auto current_biome_def_it = dat.region.forest_composition.biomes.find( + dat.terrain_type()->get_type_id() ); // If there is no biome definition for this terrain, fill in with the region's default ground cover // and bail--nothing more to be done. Should not continue with terrain feathering if there is