Merge pull request #39860 from arijust/scenario_surrounded

Tweak surrounded scenario.
CleverRaven · Apr 27, 2020 · 7a27c35 · 7a27c35
2 parents caf81ee + cdae8de
commit 7a27c35
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/data/json/scenarios.json b/data/json/scenarios.json
@@ -63,7 +63,9 @@
       "sloc_golfcourse_mid_course",
       "sloc_golfcourse_clubhouse",
       "sloc_church",
-      "sloc_cemetery"
+      "sloc_cemetery",
+      "sloc_fire_station",
+      "sloc_police"
     ],
     "start_name": "In Town",
     "flags": [ "SUR_START", "CITY_START", "LONE_START" ]

diff --git a/data/json/start_locations.json b/data/json/start_locations.json
@@ -261,13 +261,20 @@
     "type": "start_location",
     "id": "sloc_fire_station",
     "name": "Fire Station",
-    "terrain": [ { "om_terrain": "fire_station", "om_terrain_match_type": "PREFIX" } ]
+    "terrain": [
+      { "om_terrain": "fire_station", "om_terrain_match_type": "TYPE" },
+      { "om_terrain": "fire_station_1", "om_terrain_match_type": "TYPE" }
+    ]
   },
   {
     "type": "start_location",
     "id": "sloc_police",
     "name": "Police Station",
-    "terrain": [ { "om_terrain": "police", "om_terrain_match_type": "PREFIX" } ]
+    "terrain": [
+      { "om_terrain": "police", "om_terrain_match_type": "TYPE" },
+      { "om_terrain": "police_1", "om_terrain_match_type": "TYPE" },
+      { "om_terrain": "police_2", "om_terrain_match_type": "TYPE" }
+    ]
   },
   {
     "type": "start_location",