Skip to content

Commit 327e1f1

Browse files
committed
Improved metro switch
1 parent 76983f7 commit 327e1f1

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

docs/SpriteIDs.xlsx

-1 Bytes
Binary file not shown.

lang/english.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ STR_TRAM_DEFAULT :(Default) Realistic Heavy/Light rail split (Tr
4141
STR_TRAM_TRAINONLY :Display all Metro units as Trains only (no trams)
4242
STR_TRAM_TRAMONLY :Display all Metro Units as Trams only (no London Underground trains etc, only as trams)
4343
STR_TRAM_BOTH :Display Trams and Trains as both Trams and Trains (all purchaseable as either)
44-
STR_TRAM_EXTRA :Display as both AND include some extra heavy rail units (Thameslink, Crossrail etc)
44+
STR_TRAM_EXTRA :(Experimental) Display as both AND include some extra heavy rail units (Thameslink, Crossrail etc)
4545
STR_TRAM_SUPEREXTRA :(Experimental) Include a slightly ridiculous number of extra units (London Overground, trains used for suburban routes)
4646

4747
STR_PARAM_NAME_2CC :Parameter not in use (yet)

src/metroparam_switch.pnml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
if (param[6] < 5) {
99
// Disable "SUPEREXTRA" tram units at 5 or any setting below 5
10-
11-
1210
}
1311

1412
if (param[6] < 4) {
@@ -18,18 +16,28 @@ if (param[6] < 4) {
1816
// Do nothing when set to 3 specifically, "EXTRA" and "SUPEREXTRA" will already be removed above
1917
// and BOTH includes both tram and train versions so there's nothing to disable
2018

21-
if (param[6] == 2) { // TRAM
19+
if (param[6] == 2) { // TRAM ONLY
2220
// Disable train versions of all metro units
21+
disable_item(FEAT_TRAINS, 595); // London Underground 2024 stock tram
22+
disable_item(FEAT_TRAINS, 636); // Class 555
23+
disable_item(FEAT_TRAINS, 450); // Class 777
24+
disable_item(FEAT_TRAINS, 464); // Class 139 Parry People Mover
25+
2326
}
2427

25-
if (param[6] == 1) { // TRAIN
26-
// Disable train versions of all metro units
27-
disable_item(FEAT_TRAINS, 595); // London Underground 2024 stock tram
28+
if (param[6] == 1) { // TRAIN ONLY
29+
// Disable tram versions of all metro units (where duplicated)
30+
disable_item(FEAT_ROADVEHS, 643); // Class 777
31+
disable_item(FEAT_ROADVEHS, 642); // Class 555
32+
disable_item(FEAT_ROADVEHS, 595); // London Underground 2024 stock
33+
2834
}
2935

3036
if (param[6] == 0) { // DEFAULT
3137
// Disable tram versions of heavy rail units
3238
disable_item(FEAT_ROADVEHS, 595); // London Underground 2024 stock tram
39+
disable_item(FEAT_ROADVEHS, 643); // Class 777
40+
disable_item(FEAT_ROADVEHS, 642); // Class 555
3341

3442
// Disable train versions of light rail versions
3543
}

0 commit comments

Comments
 (0)