Skip to content

Commit 4766a61

Browse files
authored
Fix new region settings/overlay finalize order (#83146)
* fix Magiclysm region overlay typo * swap new region settings/overlay finalization order
1 parent 7b1154f commit 4766a61

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

data/mods/Magiclysm/worldgen/regional_overlay.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"apply_to_tags": [ "all" ],
66
"cities": "default_magiclysm",
77
"map_extras": "default_magiclysm",
8-
"terrain_furniture": "default_magiclysm"
8+
"terrain_furniture": "default_magiclysm",
9+
"forest_composition": "default_magiclysm"
910
},
1011
{
1112
"type": "region_settings_city",
@@ -122,6 +123,11 @@
122123
"overlay_id": "forest_thick",
123124
"extras": [ [ "mx_catoblepas_lair", 1 ] ]
124125
},
126+
{
127+
"type": "region_settings_forest_mapgen",
128+
"id": "default_magiclysm",
129+
"biomes": [ "biome_forest_thick_default_magiclysm" ]
130+
},
125131
{
126132
"type": "forest_biome_mapgen",
127133
"id": "biome_forest_thick_default_magiclysm",

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,8 +896,8 @@ void DynamicDataLoader::finalize_loaded_data()
896896
{ _( "Proficiency Categories" ), &proficiency_category::finalize_all },
897897
{ _( "Qualities" ), &quality::finalize_all },
898898
{ _( "Recipe Groups" ), &recipe_group::finalize },
899-
{ _( "Region Settings" ), &region_settings::finalize_all },
900899
{ _( "Region Overlays" ), &region_overlay_new::finalize_all },
900+
{ _( "Region Settings" ), &region_settings::finalize_all },
901901
{ _( "Relic Procedural Generations" ), &relic_procgen_data::finalize_all },
902902
{ _( "Speed Descriptions" ), &speed_description::finalize_all },
903903
{ _( "Species" ), &species_type::finalize_all },

src/regional_settings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,7 @@ struct region_settings {
885885
* To solve this, we apply region_overlay.
886886
*
887887
* region_overlay should NEVER redefine or remove elements from a given setting!
888+
* overlays must always be applied before region_settings::finalize_all
888889
*/
889890
struct region_overlay_new {
890891
region_overlay_new_id id = region_overlay_new_id::NULL_ID();

0 commit comments

Comments
 (0)