Adjust park spawns and make unique OMTs (#51877)

CleverRaven · Sep 26, 2021 · 5aa2069 · 5aa2069
1 parent 65044ef
commit 5aa2069
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 29 deletions.
diff --git a/data/json/mapgen/garden_community.json b/data/json/mapgen/garden_community.json
@@ -62,7 +62,7 @@
   },
   {
     "method": "json",
-    "om_terrain": "communitygarden",
+    "om_terrain": "communitygarden_2",
     "type": "mapgen",
     "weight": 100,
     "object": {
@@ -114,7 +114,7 @@
   },
   {
     "method": "json",
-    "om_terrain": "communitygarden",
+    "om_terrain": "communitygarden_3",
     "type": "mapgen",
     "weight": 100,
     "object": {

diff --git a/data/json/mapgen/garden_public.json b/data/json/mapgen/garden_public.json
@@ -122,7 +122,7 @@
         { "signage": "<city> Public Garden", "x": 15, "y": 21 }
       ]
     },
-    "om_terrain": "publicgarden",
+    "om_terrain": "publicgarden_2",
     "type": "mapgen",
     "weight": 100
   }

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
@@ -2,7 +2,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "playground_1",
     "//": "Playground",
     "weight": 500,
     "object": {
@@ -42,7 +42,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "baskeball_court",
     "//": "Basketball Court",
     "weight": 700,
     "object": {
@@ -84,7 +84,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "tennis_court",
     "//": "Tennis Court",
     "weight": 500,
     "object": {
@@ -123,7 +123,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "volleyball_court",
     "//": "Volleyball Court",
     "weight": 300,
     "object": {
@@ -205,7 +205,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "park_2",
     "//": "Scenic Park",
     "weight": 500,
     "object": {
@@ -245,7 +245,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "dog_park",
     "//": "Dog Park",
     "weight": 500,
     "object": {
@@ -314,7 +314,7 @@
   },
   {
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "park_3",
     "//": "Picnic Park",
     "type": "mapgen",
     "weight": 300,
@@ -370,7 +370,7 @@
   },
   {
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "park_4",
     "//": "Picnic Park",
     "type": "mapgen",
     "weight": 200,
@@ -426,7 +426,7 @@
   },
   {
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "playground",
     "//": "Playground",
     "type": "mapgen",
     "weight": 300,
@@ -475,7 +475,7 @@
   },
   {
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "park_5",
     "//": "Scenic Park",
     "type": "mapgen",
     "weight": 300,
@@ -519,7 +519,7 @@
   },
   {
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "park_6",
     "//": "Scenic Park",
     "type": "mapgen",
     "weight": 400,
@@ -560,7 +560,7 @@
   },
   {
     "method": "json",
-    "om_terrain": "park",
+    "om_terrain": "park_7",
     "//": "Pavilion",
     "type": "mapgen",
     "weight": 100,

diff --git a/data/json/mapgen/park_mazes.json b/data/json/mapgen/park_mazes.json
@@ -50,7 +50,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "park_maze" ],
+    "om_terrain": [ "park_maze_2" ],
     "weight": 800,
     "object": {
       "fill_ter": "t_region_groundcover_urban",

diff --git a/data/json/mapgen/trail_small.json b/data/json/mapgen/trail_small.json
@@ -60,7 +60,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "small_wooded_trail" ],
+    "om_terrain": [ "small_wooded_trail_2" ],
     "weight": 100,
     "object": {
       "rows": [

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json
@@ -44,7 +44,21 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "park",
+    "id": [
+      "park",
+      "park_2",
+      "park_3",
+      "park_4",
+      "park_5",
+      "park_6",
+      "park_7",
+      "playground",
+      "playground_1",
+      "dog_park",
+      "volleyball_court",
+      "tennis_court",
+      "baskeball_court"
+    ],
     "name": "park",
     "sym": "O",
     "color": "green",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json
@@ -95,7 +95,7 @@
     "color": "light_gray"
   },
   {
-    "id": "small_wooded_trail",
+    "id": [ "small_wooded_trail", "small_wooded_trail_2" ],
     "type": "overmap_terrain",
     "copy-from": "generic_city_building",
     "name": "small wooded trail",
@@ -161,7 +161,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "communitygarden",
+    "id": [ "communitygarden", "communitygarden_2", "communitygarden_3" ],
     "name": "community garden",
     "sym": "g",
     "color": "yellow",
@@ -171,7 +171,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "publicgarden",
+    "id": [ "publicgarden", "publicgarden_2" ],
     "name": "public garden",
     "sym": "g",
     "color": "light_green",
@@ -697,7 +697,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "park_maze",
+    "id": [ "park_maze", "park_maze_2" ],
     "name": "hedge maze",
     "sym": "g",
     "color": "light_green",

diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -756,23 +756,39 @@
         "railroad_city": 5
       },
       "parks": {
-        "park": 400,
-        "pool": 20,
+        "park": 50,
+        "park_2": 50,
+        "park_3": 50,
+        "park_4": 50,
+        "park_5": 50,
+        "park_6": 50,
+        "park_7": 50,
         "pool_1": 20,
         "pool_2": 20,
         "pool_3": 20,
         "pool_4": 20,
         "pool_5": 20,
         "pool_6": 20,
-        "skate_park": 100,
-        "park_maze": 50,
-        "small_wooded_trail": 300,
+        "playground": 40,
+        "playground_1": 40,
+        "dog_park": 20,
+        "volleyball_court": 30,
+        "tennis_court": 30,
+        "baskeball_court": 30,
+        "skate_park": 30,
+        "park_maze": 10,
+        "park_maze_2": 10,
+        "small_wooded_trail": 30,
+        "small_wooded_trail_2": 30,
         "pavilion": 100,
         "pavilion_1": 100,
         "cemetery_small": 200,
         "Pond": 200,
-        "communitygarden": 200,
-        "publicgarden": 200,
+        "communitygarden": 75,
+        "communitygarden_2": 75,
+        "communitygarden_3": 75,
+        "publicgarden": 100,
+        "publicgarden_2": 100,
         "cathedral": 50,
         "football_field": 25,
         "baseball_field": 50,