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.

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 steam locomotive to miniature railroad location #35413

Merged
merged 20 commits into from
Nov 10, 2019
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d6941e7
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 24, 2019
c74dd17
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 25, 2019
8f7710e
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 28, 2019
adf523b
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 29, 2019
dbe3e9b
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
snipercup Oct 30, 2019
a2958bd
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
snipercup Oct 30, 2019
8e4280a
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 30, 2019
8d518d8
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 31, 2019
f57c82c
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 1, 2019
1ce3ca0
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 3, 2019
6fded34
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 4, 2019
7b88e44
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 4, 2019
c747d0f
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 5, 2019
0d4beeb
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 6, 2019
1d3345e
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 8, 2019
7e6c153
add steam locomotive to miniature railroad location
snipercup Nov 9, 2019
976a4f3
web linter
snipercup Nov 9, 2019
2069b6b
change handle to frame
snipercup Nov 9, 2019
6ad7c7d
Update data/json/vehicles/trains.json
snipercup Nov 9, 2019
7333777
Removed headlight
snipercup Nov 9, 2019
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
4 changes: 4 additions & 0 deletions data/json/mapgen/miniature_railway/miniature_railway_z1.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
"place_monsters": [
{ "monster": "GROUP_SCHOOL", "x": [ 35, 40 ], "y": [ 10, 15 ], "repeat": [ 0, 1 ], "density": 1 },
{ "monster": "GROUP_SCHOOL", "x": [ 35, 40 ], "y": [ 35, 40 ], "repeat": [ 0, 1 ], "density": 1 }
],
"place_vehicles": [
{ "vehicle": "miniature_train_loco", "x": 5, "y": 31, "chance": 5, "fuel": 20, "status": 25, "rotation": 270 },
{ "vehicle": "miniature_train_loco", "x": 41, "y": 41, "chance": 5, "fuel": 5, "status": 15, "rotation": 270 }
]
}
}
Expand Down
11 changes: 11 additions & 0 deletions data/json/vehicles/trains.json
Original file line number Diff line number Diff line change
Expand Up @@ -238,5 +238,16 @@
{ "x": 1, "y": 0, "parts": [ "headlight", "battery_motorbike" ] },
{ "x": -1, "y": 0, "parts": [ "muffler", "box" ] }
]
},
{
"id": "miniature_train_loco",
"type": "vehicle",
"name": "Miniature train locomotive",
snipercup marked this conversation as resolved.
Show resolved Hide resolved
"blueprint": [ "oo" ],
"parts": [
{ "x": 1, "y": 0, "parts": [ "frame_vertical_2", "engine_steam_small", "rail_wheel_small_pair", "headlight" ] },
snipercup marked this conversation as resolved.
Show resolved Hide resolved
snipercup marked this conversation as resolved.
Show resolved Hide resolved
{ "x": 0, "y": 0, "parts": [ "frame_vertical_2", "seat", "rail_wheel_small_pair", "controls" ] },
{ "x": 0, "y": 0, "parts": [ { "part": "fuel_bunker", "fuel": "coal_lump" } ] }
]
}
]