Implement new region settings (#83033)

* set default region external options

* remove highways in aftershock, isolation-protocol

neither mod should have them, aftershock because of intersection generation over ravines

* region settings c++: replace old classes/structs with new

* add finalization for weather_generator

Author: ShnitzelX2

data/mods/Backrooms/modinfo.json

@@ -10,5 +10,11 @@
     "conflicts": [ "desertpack", "tropicata" ],
     "dependencies": [ "dda" ],
     "version": "0.1"
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "DEFAULT_REGION",
+    "stype": "string_input",
+    "value": "default_backrooms"
   }
 ]

data/mods/Isolation-Protocol/modinfo.json

@@ -9,5 +9,17 @@
     "category": "total_conversion",
     "dependencies": [ "dda" ],
     "conflicts": [ "generic_guns", "aftershock_exoplanet", "innawood", "skyisland", "backrooms", "defense_mode", "MA", "tropicata" ]
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "DEFAULT_REGION",
+    "stype": "string_input",
+    "value": "default_isolation"
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_HIGHWAYS",
+    "stype": "bool",
+    "value": false
   }
 ]

data/mods/TropiCataclysm/modinfo.json

@@ -29,5 +29,11 @@
     "name": "OVERMAP_PLACE_HIGHWAYS",
     "stype": "bool",
     "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "DEFAULT_REGION",
+    "stype": "string_input",
+    "value": "default_tropicataclysm"
   }
 ]

data/mods/aftershock_exoplanet/modinfo.json

@@ -10,5 +10,11 @@
     "dependencies": [ "dda" ],
     "conflicts": [ "mindovermatter", "generic_guns", "skyisland" ],
     "loading_images": [ "aftershock.png" ]
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "DEFAULT_REGION",
+    "stype": "string_input",
+    "value": "default_aftershock"
   }
 ]

data/mods/aftershock_exoplanet/options.json

@@ -34,5 +34,11 @@
     "name": "CAPITALISM",
     "stype": "bool",
     "value": true
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_HIGHWAYS",
+    "stype": "bool",
+    "value": false
   }
 ]

data/mods/classic_zombies/modinfo.json

@@ -101,5 +101,11 @@
     "name": "OVERMAP_URBAN_INCREASE_SOUTH",
     "stype": "int",
     "value": 0
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "DEFAULT_REGION",
+    "stype": "string_input",
+    "value": "default_classiczombies"
   }
 ]

data/mods/desert_region/modinfo.json

@@ -30,5 +30,11 @@
     "name": "OVERMAP_PLACE_HIGHWAYS",
     "stype": "bool",
     "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "DEFAULT_REGION",
+    "stype": "string_input",
+    "value": "default_desert"
   }
 ]

data/mods/innawood/modinfo.json

@@ -10,5 +10,11 @@
     "dependencies": [ "dda" ],
     "loading_images": [ "innawoods1.png" ],
     "obsolete": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "DEFAULT_REGION",
+    "stype": "string_input",
+    "value": "default_innawood"
   }
 ]

src/init.cpp

@@ -821,6 +821,7 @@ void DynamicDataLoader::finalize_loaded_data()
             { _( "Damage info orders" ), &damage_info_order::finalize_all },
             { _( "Diseases" ), &disease_type::finalize_all },
             { _( "Weather types" ), &weather_types::finalize_all },
+            { _( "Weather generators" ), &weather_generator::finalize_all },
             { _( "Effect on conditions" ), &effect_on_conditions::finalize_all },
             { _( "Field types" ), &field_types::finalize_all },
             { _( "Ammo effects" ), &ammo_effects::finalize_all },

src/map_extras.cpp

@@ -104,6 +104,8 @@ static const mtype_id mon_fungaloid_queen( "mon_fungaloid_queen" );
 
 static const oter_type_str_id oter_type_road( "road" );
 
+static const region_settings_id region_settings_default( "default" );
+
 static const relic_procgen_id relic_procgen_data_alien_reality( "alien_reality" );
 
 static const ter_str_id ter_t_coast_rock_surf( "t_coast_rock_surf" );
@@ -1210,10 +1212,12 @@ void debug_spawn_test()
 {
     uilist mx_menu;
     std::vector<std::string> mx_names;
-    for( std::pair<const std::string, map_extras> &region_extra :
-         region_settings_map["default"].region_extras ) {
-        mx_menu.addentry( -1, true, -1, region_extra.first );
-        mx_names.push_back( region_extra.first );
+    const region_settings_map_extras &settings_map_extras =
+        region_settings_default->get_settings_map_extras();
+    for( const map_extra_collection_id &region_extra : settings_map_extras.extras ) {
+        const std::string &mx_name = region_extra.str();
+        mx_menu.addentry( -1, true, -1, mx_name );
+        mx_names.push_back( mx_name );
     }
 
     mx_menu.text = _( "Test which map extra list?" );
@@ -1228,9 +1232,13 @@ void debug_spawn_test()
         map_extra_id mx_null = map_extra_id::NULL_ID();
 
         for( size_t a = 0; a < 32400; a++ ) {
-            map_extras ex = region_settings_map["default"].region_extras[mx_names[index]];
+            auto mx_iter = settings_map_extras.extras.find( map_extra_collection_id( mx_names[index] ) );
+            if( mx_iter == settings_map_extras.extras.end() ) {
+                continue;
+            }
+            const map_extra_collection &ex = **mx_iter;
             if( ex.chance > 0 && one_in( ex.chance ) ) {
-                map_extra_id *extra = ex.values.pick();
+                const map_extra_id *extra = ex.values.pick();
                 if( extra == nullptr ) {
                     results[mx_null]++;
                 } else {