From f4efdb90cd5c34487dbff7d44510d95806fc8e24 Mon Sep 17 00:00:00 2001
From: arijust <54635208+arijust@users.noreply.github.com>
Date: Fri, 24 Apr 2020 12:24:57 +0200
Subject: [PATCH 1/2] Add fire/police stations to surrounded scenario.

---
 data/json/scenarios.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/json/scenarios.json b/data/json/scenarios.json
index a0312f178ec3f..050343c7259aa 100644
--- 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" ]

From cdae8dedbde7310de038d018a4ba01a8acea0bbe Mon Sep 17 00:00:00 2001
From: arijust <54635208+arijust@users.noreply.github.com>
Date: Sun, 26 Apr 2020 14:37:27 +0200
Subject: [PATCH 2/2] Change definitions for starting locations

Police station and Fire station.
---
 data/json/start_locations.json | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/json/start_locations.json b/data/json/start_locations.json
index a1055c362b678..90272b04d1b4c 100644
--- 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",