Removed the defaults

CleverRaven · Mar 30, 2024 · 3816627 · 3816627
1 parent 4365e4f
commit 3816627
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -310,6 +310,14 @@
       "river_floodplain_buffer_distance_min": 3,
       "river_floodplain_buffer_distance_max": 15
     },
+    "overmap_connection_settings": {
+      "intra_city_road_connection": "local_road",
+      "inter_city_road_connection": "local_road",
+      "trail_connection": "forest_trail",
+      "sewer_connection": "sewer_tunnel",
+      "subway_connection": "subway_tunnel",
+      "rail_connection": "local_railroad"
+    },
     "forest_mapgen_settings": {
       "forest": {
         "terrains": [ "forest", "special_forest" ],

diff --git a/doc/REGION_SETTINGS.md b/doc/REGION_SETTINGS.md
@@ -395,14 +395,14 @@ The **overmap_connection_settings** section defines the `overmap_connection_id`s
 
 ### Fields
 
-|          Identifier          |                                                    Description                                                  |    Default     |
-| ---------------------------- | --------------------------------------------------------------------------------------------------------------- | -------------- |
-| `intra_city_road_connection` | overmap_connection id used within cities. Should include locations for road, city_center and road_nesw_manhole. | local_road     |
-| `inter_city_road_connection` | overmap_connection id used between cities. Should include locations for the intra city terrains.                | local_road     |
-| `trail_connection`           | overmap_connection id used for forest trails.                                                                   | forest_trail   |
-| `sewer_connection`           | overmap_connection id used for sewer connections.                                                               | sewer_tunnel   |
-| `subway_connection`          | overmap_connection id used for for both z-2 and z-4 subway connections.                                         | subway_tunnel  |
-| `rail_connection`            | overmap_connection id used for rail connections. ( Unused in vanilla as of 0.H )                                | local_railroad |
+|          Identifier          |                                                    Description                                                  |
+| ---------------------------- | --------------------------------------------------------------------------------------------------------------- |
+| `intra_city_road_connection` | overmap_connection id used within cities. Should include locations for road, city_center and road_nesw_manhole. |
+| `inter_city_road_connection` | overmap_connection id used between cities. Should include locations for the intra city terrains.                |
+| `trail_connection`           | overmap_connection id used for forest trails.                                                                   |
+| `sewer_connection`           | overmap_connection id used for sewer connections.                                                               |
+| `subway_connection`          | overmap_connection id used for for both z-2 and z-4 subway connections.                                         |
+| `rail_connection`            | overmap_connection id used for rail connections. ( Unused in vanilla as of 0.H )                                |
 
 ### Example
 

diff --git a/src/regional_settings.cpp b/src/regional_settings.cpp
@@ -595,7 +595,7 @@ void load_region_settings( const JsonObject &jo )
 
     load_overmap_ravine_settings( jo, new_region.overmap_ravine, strict, false );
 
-    load_overmap_connection_settings( jo, new_region.overmap_connection, false, false );
+    load_overmap_connection_settings( jo, new_region.overmap_connection, strict, false );
 
     load_region_terrain_and_furniture_settings( jo, new_region.region_terrain_and_furniture, strict,
             false );

diff --git a/src/regional_settings.h b/src/regional_settings.h
@@ -234,12 +234,12 @@ struct overmap_ravine_settings {
 };
 
 struct overmap_connection_settings {
-    overmap_connection_id trail_connection = overmap_connection_id( "forest_trail" );
-    overmap_connection_id sewer_connection = overmap_connection_id( "sewer_tunnel" );
-    overmap_connection_id subway_connection = overmap_connection_id( "subway_tunnel" );
-    overmap_connection_id rail_connection = overmap_connection_id( "local_railroad" );
-    overmap_connection_id intra_city_road_connection = overmap_connection_id( "local_road" );
-    overmap_connection_id inter_city_road_connection = overmap_connection_id( "local_road" );
+    overmap_connection_id trail_connection;
+    overmap_connection_id sewer_connection;
+    overmap_connection_id subway_connection;
+    overmap_connection_id rail_connection;
+    overmap_connection_id intra_city_road_connection;
+    overmap_connection_id inter_city_road_connection;
 
     void finalize();
     overmap_connection_settings() = default;