Tweak surrounded scenario.

[arijust]

Summary

SUMMARY: Bugfixes "Add fire/police stations to surrounded scenario."

Purpose of change

Close #39851

Describe the solution

Add sloc_fire_station and sloc_police to list in that scenario.

[Brian-Otten]

Good to see these return, some of my favorite starts.

[ralreegorganon]

One difference here with the previous behavior is that previously the start location would target just the "main floor" location, but now the prefix match that it uses after #38151 means it will also allow spawning on the roof. Unfortunately because of how the actual location in game is rated and picked for a start, you can actually then end up on the roof of an adjacent building, which doubly defeats the point of being surrounded and in the fire/police station.

I'd suggest changing the definitions of the fire station and police station starting locations such that they don't include the roof. Something like this:

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