Skip to content

Commit 1f6023d

Browse files
authored
New region settings structs, part 3 (#82933)
* new region settings structs, part 3 * add new region settings JSON to parser
1 parent f30c996 commit 1f6023d

File tree

7 files changed

+703
-0
lines changed

7 files changed

+703
-0
lines changed

data/json/regional_map_settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,5 +1286,9 @@
12861286
"base_wind_season_variation": 50
12871287
},
12881288
"overmap_feature_flag_settings": { "clear_blacklist": false, "blacklist": [ ], "clear_whitelist": false, "whitelist": [ ] }
1289+
},
1290+
{
1291+
"type": "region_settings_new",
1292+
"id": "default"
12891293
}
12901294
]

lang/string_extractor/parser.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,23 @@ def dummy_parser(json, origin):
212212
"recipe_group": parse_recipe_group,
213213
"region_overlay": dummy_parser,
214214
"region_settings": dummy_parser,
215+
"region_settings_river": dummy_parser,
216+
"region_settings_lake": dummy_parser,
217+
"region_settings_ocean": dummy_parser,
218+
"region_settings_ravine": dummy_parser,
219+
"region_settings_forest": dummy_parser,
220+
"region_settings_highway": dummy_parser,
221+
"region_settings_forest_trail": dummy_parser,
222+
"region_settings_city": dummy_parser,
223+
"region_settings_terrain_furniture": dummy_parser,
224+
"region_terrain_furniture": dummy_parser,
225+
"region_settings_forest_mapgen": dummy_parser,
226+
"region_settings_map_extras": dummy_parser,
227+
"forest_biome_feature": dummy_parser,
228+
"forest_biome_mapgen": dummy_parser,
229+
"map_extra_collection": dummy_parser,
230+
"region_settings_new": dummy_parser,
231+
"region_overlay_new": dummy_parser,
215232
"relic_procgen_data": dummy_parser,
216233
"requirement": dummy_parser,
217234
"rotatable_symbol": dummy_parser,
@@ -257,5 +274,6 @@ def dummy_parser(json, origin):
257274
"weakpoint_set": parse_weakpoint_set,
258275
"weapon_category": parse_weapon_category,
259276
"weather_type": parse_weather_type,
277+
"weather_generator": dummy_parser,
260278
"widget": parse_widget,
261279
}

src/init.cpp

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,19 @@ void DynamicDataLoader::initialize()
420420
&region_settings_terrain_furniture::load_region_settings_terrain_furniture );
421421
add( "region_terrain_furniture",
422422
&region_terrain_furniture::load_region_terrain_furniture );
423+
add( "region_settings_forest_mapgen",
424+
&region_settings_forest_mapgen::load_region_settings_forest_mapgen );
425+
add( "region_settings_map_extras",
426+
&region_settings_map_extras::load_region_settings_map_extras );
427+
add( "forest_biome_feature",
428+
&forest_biome_feature::load_forest_biome_feature );
429+
add( "forest_biome_mapgen",
430+
&forest_biome_mapgen::load_forest_biome_mapgen );
431+
add( "map_extra_collection",
432+
&map_extra_collection::load_map_extra_collection );
433+
add( "region_settings_new", &region_settings::load_region_settings );
434+
add( "region_overlay_new", &region_overlay_new::load_region_overlay_new );
435+
423436
add( "ITEM_BLACKLIST", []( const JsonObject & jo ) {
424437
item_controller->load_item_blacklist( jo );
425438
} );
@@ -702,6 +715,13 @@ void DynamicDataLoader::unload_data()
702715
region_settings_city::reset();
703716
region_settings_terrain_furniture::reset();
704717
region_terrain_furniture::reset();
718+
region_settings_forest_mapgen::reset();
719+
region_settings_map_extras::reset();
720+
forest_biome_feature::reset();
721+
forest_biome_mapgen::reset();
722+
map_extra_collection::reset();
723+
region_settings::reset();
724+
region_overlay_new::reset();
705725
reset_monster_adjustment();
706726
recipe_dictionary::reset();
707727
recipe_group::reset();
@@ -860,6 +880,8 @@ void DynamicDataLoader::finalize_loaded_data()
860880
{ _( "Proficiency Categories" ), &proficiency_category::finalize_all },
861881
{ _( "Qualities" ), &quality::finalize_all },
862882
{ _( "Recipe Groups" ), &recipe_group::finalize },
883+
{ _( "Region Settings" ), &region_settings::finalize_all },
884+
{ _( "Region Overlays" ), &region_overlay_new::finalize_all },
863885
{ _( "Relic Procedural Generations" ), &relic_procgen_data::finalize_all },
864886
{ _( "Speed Descriptions" ), &speed_description::finalize_all },
865887
{ _( "Species" ), &species_type::finalize_all },

0 commit comments

Comments
 (0)