From e4fdee3425384ae73e9f078b4676bbc8b141c2b8 Mon Sep 17 00:00:00 2001
From: Eric Pierce <wapcaplet88@gmail.com>
Date: Fri, 6 Mar 2020 03:39:54 -0700
Subject: [PATCH] Add subway maps (#37540)

---
 data/json/items/book/maps.json    | 17 ++++++++++++++++-
 data/json/mapgen/sub_station.json |  3 ++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/data/json/items/book/maps.json b/data/json/items/book/maps.json
index 095d1ac6720df..a599ac57fc740 100644
--- a/data/json/items/book/maps.json
+++ b/data/json/items/book/maps.json
@@ -71,12 +71,27 @@
         "hospital",
         "school",
         "police",
-        "sub_station",
+        { "om_terrain": "sub_station", "om_terrain_match_type": "TYPE" },
         "bank"
       ],
       "message": "You add roads and points of interest to your map."
     }
   },
+  {
+    "id": "subwaymap",
+    "copy-from": "abstractmap",
+    "type": "GENERIC",
+    "name": "subway maintenance map",
+    "looks_like": "roadmap",
+    "description": "This is a map of subway tunnels formerly used by public maintenance workers.  Using it will add subway lines and underground stations to your map.",
+    "color": "light_blue",
+    "use_action": {
+      "type": "reveal_map",
+      "radius": 180,
+      "terrain": [ "subway", "sub_station" ],
+      "message": "You add subway lines and underground stations to your map."
+    }
+  },
   {
     "id": "trailmap",
     "copy-from": "abstractmap",
diff --git a/data/json/mapgen/sub_station.json b/data/json/mapgen/sub_station.json
index 5881e8d04d858..200c1be0667f0 100644
--- a/data/json/mapgen/sub_station.json
+++ b/data/json/mapgen/sub_station.json
@@ -106,7 +106,8 @@
       ],
       "palettes": [ "subway_underground" ],
       "vendingmachines": { "J": { "item_group": "vending_drink" }, "C": { "item_group": "vending_food" } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 6, 20 ], "y": [ 4, 9 ], "repeat": [ 5, 9 ] } ]
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 6, 20 ], "y": [ 4, 9 ], "repeat": [ 5, 9 ] } ],
+      "place_item": [ { "item": "subwaymap", "x": 1, "y": [ 6, 7 ], "chance": 75 } ]
     }
   },
   {