Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add subway maps #37540

Merged
merged 11 commits into from
Mar 6, 2020
+18 −2
Merged

Add subway maps #37540

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
84e317b
Add a subway map, revealing subways
wapcaplet Jan 30, 2020
7a50223
Adds subwaymap to motels, subways and itemgroups
wapcaplet Jan 30, 2020
0c865fb
Update data/json/items/book/maps.json
wapcaplet Jan 30, 2020
a2eb3a9
Don't reveal lab subway stops
wapcaplet Jan 31, 2020
79f330b
Merge branch 'subway-maps' of github.com:wapcaplet/Cataclysm-DDA into…
wapcaplet Jan 31, 2020
b9622b5
Make subway map drop only in subway tool room
wapcaplet Jan 31, 2020
9cfc6d1
Fix broken subway map placement in subway
wapcaplet Jan 31, 2020
ad5a9a2
Merge branch 'master' into subway-maps
wapcaplet Jan 31, 2020
15984fa
Restore blue 'S' to subway map
wapcaplet Jan 31, 2020
823dedf
Merge branch 'master' into subway-maps
wapcaplet Feb 21, 2020
7daac7e
Hide underground subways from road map
wapcaplet Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions data/json/itemgroups/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@
[ "restaurantmap", 25 ],
[ "roadmap", 25 ],
[ "trailmap", 25 ],
[ "subwaymap", 25 ],
[ "modern_tanner", 20 ],
[ "pocket_survival", 20 ],
[ "flyer", 120 ],
Expand Down Expand Up @@ -838,6 +839,7 @@
"id": "subway",
"items": [
[ "wrapper", 50 ],
[ "subwaymap", 50 ],
[ "string_6", 2 ],
[ "chain", 20 ],
[ "rock", 40 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/locations_commercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
[ "file", 10 ],
[ "touristmap", 20 ],
[ "restaurantmap", 20 ],
[ "subwaymap", 20 ],
[ "money_bundle", 55 ],
[ "gold_watch", 5 ],
[ "silver_watch", 10 ],
Expand Down
14 changes: 14 additions & 0 deletions data/json/items/book/maps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,20 @@
"message": "You add roads and points of interest to your map."
}
},
{
"id": "subwaymap",
"copy-from": "abstractmap",
"type": "GENERIC",
"name": "subway map",
"description": "This is a map of subway routes and stations in the area. Using it will add subway lines and underground stations to your map.",
wapcaplet marked this conversation as resolved.
Show resolved Hide resolved
"color": "light_blue",
"use_action": {
"type": "reveal_map",
"radius": 180,
"terrain": [ "subway", "sub_station", "sewer_sub_station", "underground_sub_station" ],
"message": "You add subway lines and underground stations to your map."
}
},
{
"id": "trailmap",
"copy-from": "abstractmap",
Expand Down
2 changes: 2 additions & 0 deletions data/json/mapgen/motel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
{ "item": "roadmap", "x": 8, "y": 8, "chance": 25 },
{ "item": "roadmap", "x": 8, "y": 8, "chance": 25 },
{ "item": "touristmap", "x": 8, "y": 8, "chance": 50 },
{ "item": "subwaymap", "x": 8, "y": 7, "chance": 25 },
{ "item": "survivormap", "x": 8, "y": 7, "chance": 12 }
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ] } ],
Expand Down Expand Up @@ -804,6 +805,7 @@
{ "item": "roadmap", "x": 8, "y": 8, "chance": 25 },
{ "item": "roadmap", "x": 8, "y": 8, "chance": 25 },
{ "item": "touristmap", "x": 8, "y": 8, "chance": 50 },
{ "item": "subwaymap", "x": 8, "y": 7, "chance": 25 },
{ "item": "survivormap", "x": 8, "y": 7, "chance": 12 }
],
"place_items": [ { "item": "traveler", "chance": 90, "x": [ 6, 6 ], "y": [ 6, 6 ] } ],
Expand Down