city exclusives, rural exclusives (#63511)

ponds removed from cities, nature trails migrated to cities, removed small warehouses & fishing ponds from rural spawns
CleverRaven · Mar 2, 2023 · a521814 · a521814
1 parent c64acea
commit a521814
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 58 deletions.
diff --git a/data/json/obsoletion/overmap_special/specials.json b/data/json/obsoletion/overmap_special/specials.json
@@ -682,5 +682,61 @@
     "city_sizes": [ 1, -1 ],
     "occurrences": [ 0, 0 ],
     "flags": [ "UNIQUE", "FARM" ]
+  },
+  {
+    "type": "overmap_special",
+    "id": "nature trail",
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "NatureTrail_1a_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "NatureTrail_1b_north" }
+    ],
+    "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ],
+    "locations": [ "forest" ],
+    "city_distance": [ 3, 8 ],
+    "city_sizes": [ 4, -1 ],
+    "occurrences": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
+  },
+  {
+    "type": "overmap_special",
+    "id": "public pond",
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "PublicPond_1a_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "PublicPond_1b_north" }
+    ],
+    "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ],
+    "locations": [ "land" ],
+    "city_distance": [ 1, 6 ],
+    "city_sizes": [ 4, -1 ],
+    "occurrences": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
+  },
+  {
+    "type": "overmap_special",
+    "id": "warehouse",
+    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "warehouse_north" }, { "point": [ 0, 0, 1 ], "overmap": "warehouse_roof_north" } ],
+    "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ],
+    "locations": [ "land" ],
+    "city_distance": [ 6, 15 ],
+    "city_sizes": [ 4, -1 ],
+    "occurrences": [ 0, 0 ],
+    "flags": [ "CLASSIC", "URBAN" ]
+  },
+  {
+    "id": "Fishing Pond",
+    "type": "overmap_special",
+    "overmaps": [
+      { "point": [ 1, -1, 0 ], "overmap": "road_end_north" },
+      { "point": [ 0, 0, 0 ], "overmap": "fishing_pond_0_0_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "fishing_pond_1_0_north" },
+      { "point": [ 0, 1, 0 ], "overmap": "fishing_pond_0_1_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "fishing_pond_1_1_north" }
+    ],
+    "connections": [ { "point": [ 1, -1, 0 ], "terrain": "road" } ],
+    "locations": [ "field" ],
+    "city_distance": [ 3, 10 ],
+    "city_sizes": [ 4, -1 ],
+    "occurrences": [ 0, 0 ],
+    "flags": [ "CLASSIC", "WILDERNESS" ]
   }
 ]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -4438,6 +4438,15 @@
     "locations": [ "land" ],
     "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "park_7_north" }, { "point": [ 0, 0, 1 ], "overmap": "park_7_roof_north" } ]
   },
+  {
+    "type": "city_building",
+    "id": "nature_trail_city",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "NatureTrail_1a_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "NatureTrail_1b_north" }
+    ]
+  },
   {
     "type": "city_building",
     "id": "salon",

diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -3492,17 +3492,6 @@
     "spawns": { "group": "GROUP_LARGE_STATION", "population": [ 4, 10 ], "radius": [ 1, 2 ] },
     "flags": [ "CLASSIC", "URBAN" ]
   },
-  {
-    "type": "overmap_special",
-    "id": "warehouse",
-    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "warehouse_north" }, { "point": [ 0, 0, 1 ], "overmap": "warehouse_roof_north" } ],
-    "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ],
-    "locations": [ "land" ],
-    "city_distance": [ 6, 15 ],
-    "city_sizes": [ 4, -1 ],
-    "occurrences": [ 0, 4 ],
-    "flags": [ "CLASSIC", "URBAN" ]
-  },
   {
     "type": "overmap_special",
     "id": "ranch_camp",
@@ -3878,23 +3867,6 @@
     "occurrences": [ 0, 3 ],
     "flags": [ "CLASSIC", "WILDERNESS" ]
   },
-  {
-    "id": "Fishing Pond",
-    "type": "overmap_special",
-    "overmaps": [
-      { "point": [ 1, -1, 0 ], "overmap": "road_end_north" },
-      { "point": [ 0, 0, 0 ], "overmap": "fishing_pond_0_0_north" },
-      { "point": [ 1, 0, 0 ], "overmap": "fishing_pond_1_0_north" },
-      { "point": [ 0, 1, 0 ], "overmap": "fishing_pond_0_1_north" },
-      { "point": [ 1, 1, 0 ], "overmap": "fishing_pond_1_1_north" }
-    ],
-    "connections": [ { "point": [ 1, -1, 0 ], "terrain": "road" } ],
-    "locations": [ "field" ],
-    "city_distance": [ 3, 10 ],
-    "city_sizes": [ 4, -1 ],
-    "occurrences": [ 0, 5 ],
-    "flags": [ "CLASSIC", "WILDERNESS" ]
-  },
   {
     "type": "overmap_special",
     "id": "Derelict Property",
@@ -4137,34 +4109,6 @@
     "//": "Obsoleted by dumpsite_mutable",
     "flags": [ "CLASSIC" ]
   },
-  {
-    "type": "overmap_special",
-    "id": "nature trail",
-    "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "NatureTrail_1a_north" },
-      { "point": [ 1, 0, 0 ], "overmap": "NatureTrail_1b_north" }
-    ],
-    "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ],
-    "locations": [ "forest" ],
-    "city_distance": [ 3, 8 ],
-    "city_sizes": [ 4, -1 ],
-    "occurrences": [ 0, 6 ],
-    "flags": [ "CLASSIC" ]
-  },
-  {
-    "type": "overmap_special",
-    "id": "public pond",
-    "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "PublicPond_1a_north" },
-      { "point": [ 1, 0, 0 ], "overmap": "PublicPond_1b_north" }
-    ],
-    "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ],
-    "locations": [ "land" ],
-    "city_distance": [ 1, 6 ],
-    "city_sizes": [ 4, -1 ],
-    "occurrences": [ 0, 5 ],
-    "flags": [ "CLASSIC" ]
-  },
   {
     "type": "overmap_special",
     "id": "cemetery",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json
@@ -152,7 +152,7 @@
   {
     "type": "overmap_terrain",
     "id": [ "NatureTrail_1a", "NatureTrail_1b" ],
-    "copy-from": "generic_city_building_no_sidewalk",
+    "copy-from": "generic_city_building",
     "name": "nature trail",
     "sym": "S",
     "color": "i_green"

diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -1029,7 +1029,6 @@
         "pavilion": 100,
         "pavilion_1": 100,
         "cemetery_small": 200,
-        "Pond": 200,
         "communitygarden": 75,
         "communitygarden_2": 75,
         "communitygarden_3": 75,
@@ -1044,6 +1043,7 @@
         "stadium_football": 25,
         "cemetery_city": 50,
         "public_pond_city": 50,
+        "nature_trail_city": 50,
         "cemetery_religious_city": 25,
         "cs_private_park": 100,
         "cs_public_art_piece": 100,