Skip to content

Commit 5101129

Browse files
audigexaudigex
committed
Fixed dual voltage trains not working on both voltages if track set doesn't have 3RDC/SAAZ
1 parent 3c21c08 commit 5101129

File tree

12 files changed

+40
-40
lines changed

12 files changed

+40
-40
lines changed

‎src/trains/electric_loco/92.pnml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ item (FEAT_TRAINS, item_BR92, 723) {
2020
sprite_id: SPRITE_ID_NEW_TRAIN;
2121
speed: 87 mph;
2222
refit_cost: 0;
23-
track_type: BR_3RDC;
23+
track_type: [BR_3RDC, BR_3RDR, ELRL];
2424
ai_special_flag: AI_FLAG_CARGO;
2525
power: 6760 hp;
2626
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/325.pnml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ item (FEAT_TRAINS, item_BR325, 420) {
1616
sprite_id: SPRITE_ID_NEW_TRAIN;
1717
speed: 100 mph;
1818
refit_cost: 0;
19-
track_type: BR_3RDC;
19+
track_type: [BR_3RDC, BR_3RDR, ELRL];
2020
ai_special_flag: AI_FLAG_CARGO;
2121
power: 2000 hp;
2222
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/BR319.pnml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ item (FEAT_TRAINS, item_BR319, 248) {
209209
sprite_id: SPRITE_ID_NEW_TRAIN;
210210
speed: 100 mph;
211211
refit_cost: 0;
212-
track_type: BR_3RDC;
212+
track_type: [BR_3RDC, BR_3RDR, ELRL];
213213
ai_special_flag: AI_FLAG_CARGO;
214214
power: 1438 hp;
215215
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -260,7 +260,7 @@ item (FEAT_TRAINS, item_BR319b, 249) {
260260
speed: 100 mph;
261261
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
262262
refit_cost: 0;
263-
track_type: BR_3RDC;
263+
track_type: [BR_3RDC, BR_3RDR, ELRL];
264264
ai_special_flag: AI_FLAG_CARGO;
265265
power: 0 hp;
266266
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -304,7 +304,7 @@ item (FEAT_TRAINS, item_BR319c, 250) {
304304
speed: 100 mph;
305305
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
306306
refit_cost: 0;
307-
track_type: BR_3RDC;
307+
track_type: [BR_3RDC, BR_3RDR, ELRL];
308308
ai_special_flag: AI_FLAG_CARGO;
309309
power: 0 hp;
310310
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -347,7 +347,7 @@ item (FEAT_TRAINS, item_BR319d, 251) {
347347
sprite_id: SPRITE_ID_NEW_TRAIN;
348348
speed: 100 mph;
349349
refit_cost: 0;
350-
track_type: BR_3RDC;
350+
track_type: [BR_3RDC, BR_3RDR, ELRL];
351351
ai_special_flag: AI_FLAG_CARGO;
352352
power: 0 hp;
353353
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/BR373.pnml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ item (FEAT_TRAINS, item_BR373, 80) {
221221
sprite_id: SPRITE_ID_NEW_TRAIN;
222222
speed: 300 km/h;
223223
refit_cost: 0;
224-
track_type: BR_3RDC;
224+
track_type: [BR_3RDC, BR_3RDR, ELRL];
225225
ai_special_flag: AI_FLAG_CARGO;
226226
power: 16400 hp;
227227
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/BR377_4dualvoltage.pnml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ item (FEAT_TRAINS, item_BR377_4_dv, 214) {
9797
sprite_id: SPRITE_ID_NEW_TRAIN;
9898
speed: 100 mph;
9999
refit_cost: 0;
100-
track_type: BR_3RDC;
100+
track_type: [BR_3RDC, BR_3RDR, ELRL];
101101
ai_special_flag: AI_FLAG_CARGO;
102102
power: 2012 hp;
103103
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -149,7 +149,7 @@ item (FEAT_TRAINS, item_BR377_4_dvb, 215) {
149149
speed: 100 mph;
150150
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
151151
refit_cost: 0;
152-
track_type: BR_3RDC;
152+
track_type: [BR_3RDC, BR_3RDR, ELRL];
153153
ai_special_flag: AI_FLAG_CARGO;
154154
power: 0 hp;
155155
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -193,7 +193,7 @@ item (FEAT_TRAINS, item_BR377_4_dvc, 216) {
193193
speed: 100 mph;
194194
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
195195
refit_cost: 0;
196-
track_type: BR_3RDC;
196+
track_type: [BR_3RDC, BR_3RDR, ELRL];
197197
ai_special_flag: AI_FLAG_CARGO;
198198
power: 0 hp;
199199
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -236,7 +236,7 @@ item (FEAT_TRAINS, item_BR377_4_dvd, 217) {
236236
sprite_id: SPRITE_ID_NEW_TRAIN;
237237
speed: 100 mph;
238238
refit_cost: 0;
239-
track_type: BR_3RDC;
239+
track_type: [BR_3RDC, BR_3RDR, ELRL];
240240
ai_special_flag: AI_FLAG_CARGO;
241241
power: 0 hp;
242242
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/BR377_5dualvoltage.pnml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ item (FEAT_TRAINS, item_BR377_5dv, 221) {
6161
sprite_id: SPRITE_ID_NEW_TRAIN;
6262
speed: 100 mph;
6363
refit_cost: 0;
64-
track_type: BR_3RDC;
64+
track_type: [BR_3RDC, BR_3RDR, ELRL];
6565
ai_special_flag: AI_FLAG_CARGO;
6666
power: 2681 hp;
6767
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -113,7 +113,7 @@ item (FEAT_TRAINS, item_BR377_5dvb, 222) {
113113
speed: 100 mph;
114114
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
115115
refit_cost: 0;
116-
track_type: BR_3RDC;
116+
track_type: [BR_3RDC, BR_3RDR, ELRL];
117117
ai_special_flag: AI_FLAG_CARGO;
118118
power: 0 hp;
119119
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -156,7 +156,7 @@ item (FEAT_TRAINS, item_BR377_5dvc, 223) {
156156
sprite_id: SPRITE_ID_NEW_TRAIN;
157157
speed: 100 mph;
158158
refit_cost: 0;
159-
track_type: BR_3RDC;
159+
track_type: [BR_3RDC, BR_3RDR, ELRL];
160160
ai_special_flag: AI_FLAG_CARGO;
161161
power: 0 hp;
162162
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -201,7 +201,7 @@ item (FEAT_TRAINS, item_BR377_5dvd, 224) {
201201
sprite_id: SPRITE_ID_NEW_TRAIN;
202202
speed: 100 mph;
203203
refit_cost: 0;
204-
track_type: BR_3RDC;
204+
track_type: [BR_3RDC, BR_3RDR, ELRL];
205205
ai_special_flag: AI_FLAG_CARGO;
206206
power: 0 hp;
207207
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/BR378.pnml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ item (FEAT_TRAINS, item_BR378_3dv, 225) {
165165
sprite_id: SPRITE_ID_NEW_TRAIN;
166166
speed: 75 mph;
167167
refit_cost: 0;
168-
track_type: BR_3RDC;
168+
track_type: [BR_3RDC, BR_3RDR, ELRL];
169169
ai_special_flag: AI_FLAG_CARGO;
170170
power: 1341 hp;
171171
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -266,7 +266,7 @@ item (FEAT_TRAINS, item_BR378_4dv, 227) {
266266
sprite_id: SPRITE_ID_NEW_TRAIN;
267267
speed: 75 mph;
268268
refit_cost: 0;
269-
track_type: BR_3RDC;
269+
track_type: [BR_3RDC, BR_3RDR, ELRL];
270270
ai_special_flag: AI_FLAG_CARGO;
271271
power: 2012 hp;
272272
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -366,7 +366,7 @@ item (FEAT_TRAINS, item_BR378_5dv, 229) {
366366
sprite_id: SPRITE_ID_NEW_TRAIN;
367367
speed: 75 mph;
368368
refit_cost: 0;
369-
track_type: BR_3RDC;
369+
track_type: [BR_3RDC, BR_3RDR, ELRL];
370370
ai_special_flag: AI_FLAG_CARGO;
371371
power: 2012 hp;
372372
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -414,7 +414,7 @@ item (FEAT_TRAINS, item_BR378b, 231) {
414414
sprite_id: SPRITE_ID_NEW_TRAIN;
415415
speed: 75 mph;
416416
refit_cost: 0;
417-
track_type: BR_3RDC;
417+
track_type: [BR_3RDC, BR_3RDR, ELRL];
418418
ai_special_flag: AI_FLAG_CARGO;
419419
power: 0 hp;
420420
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -459,7 +459,7 @@ item (FEAT_TRAINS, item_BR378c, 232) {
459459
sprite_id: SPRITE_ID_NEW_TRAIN;
460460
speed: 75 mph;
461461
refit_cost: 0;
462-
track_type: BR_3RDC;
462+
track_type: [BR_3RDC, BR_3RDR, ELRL];
463463
ai_special_flag: AI_FLAG_CARGO;
464464
power: 0 hp;
465465
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -504,7 +504,7 @@ item (FEAT_TRAINS, item_BR378d, 233) {
504504
sprite_id: SPRITE_ID_NEW_TRAIN;
505505
speed: 75 mph;
506506
refit_cost: 0;
507-
track_type: BR_3RDC;
507+
track_type: [BR_3RDC, BR_3RDR, ELRL];
508508
ai_special_flag: AI_FLAG_CARGO;
509509
power: 0 hp;
510510
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/BR387.pnml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ item (FEAT_TRAINS, item_BR387, 240) {
169169
sprite_id: SPRITE_ID_NEW_TRAIN;
170170
speed: 110 mph;
171171
refit_cost: 0;
172-
track_type: BR_3RDC;
172+
track_type: [BR_3RDC, BR_3RDR, ELRL];
173173
ai_special_flag: AI_FLAG_CARGO;
174174
power: 2012 hp;
175175
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -221,7 +221,7 @@ item (FEAT_TRAINS, item_BR387_b, 241) {
221221
speed: 110 mph;
222222
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
223223
refit_cost: 0;
224-
track_type: BR_3RDC;
224+
track_type: [BR_3RDC, BR_3RDR, ELRL];
225225
ai_special_flag: AI_FLAG_CARGO;
226226
power: 0 hp;
227227
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -265,7 +265,7 @@ item (FEAT_TRAINS, item_BR387_c, 242) {
265265
speed: 110 mph;
266266
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
267267
refit_cost: 0;
268-
track_type: BR_3RDC;
268+
track_type: [BR_3RDC, BR_3RDR, ELRL];
269269
ai_special_flag: AI_FLAG_CARGO;
270270
power: 0 hp;
271271
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -308,7 +308,7 @@ item (FEAT_TRAINS, item_BR387_d, 243) {
308308
sprite_id: SPRITE_ID_NEW_TRAIN;
309309
speed: 110 mph;
310310
refit_cost: 0;
311-
track_type: BR_3RDC;
311+
track_type: [BR_3RDC, BR_3RDR, ELRL];
312312
ai_special_flag: AI_FLAG_CARGO;
313313
power: 0 hp;
314314
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/BR395.pnml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ item (FEAT_TRAINS, item_BR395, 77) {
5959
sprite_id: SPRITE_ID_NEW_TRAIN;
6060
speed: 225 km/h;
6161
refit_cost: 0;
62-
track_type: BR_3RDC;
62+
track_type: [BR_3RDC, BR_3RDR, ELRL];
6363
ai_special_flag: AI_FLAG_CARGO;
6464
power: 4480 hp;
6565
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -110,7 +110,7 @@ item (FEAT_TRAINS, item_395b, 78) {
110110
speed: 225 km/h;
111111
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
112112
refit_cost: 0;
113-
track_type: BR_3RDC;
113+
track_type: [BR_3RDC, BR_3RDR, ELRL];
114114
ai_special_flag: AI_FLAG_CARGO;
115115
power: 0;
116116
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -156,7 +156,7 @@ item (FEAT_TRAINS, item_395c, 79) {
156156
speed: 225 km/h;
157157
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
158158
refit_cost: 0;
159-
track_type: BR_3RDC;
159+
track_type: [BR_3RDC, BR_3RDR, ELRL];
160160
ai_special_flag: AI_FLAG_CARGO;
161161
power: 0;
162162
running_cost_base: RUNNING_COST_ELECTRIC;

‎src/trains/electric_mu/BR700.pnml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ item (FEAT_TRAINS, item_BR700, 255) {
8686
sprite_id: SPRITE_ID_NEW_TRAIN;
8787
speed: 100 mph;
8888
refit_cost: 0;
89-
track_type: BR_3RDC;
89+
track_type: [BR_3RDC, BR_3RDR, ELRL];
9090
ai_special_flag: AI_FLAG_CARGO;
9191
power: 4425 hp;
9292
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -137,7 +137,7 @@ item (FEAT_TRAINS, item_BR700_2, 256) {
137137
sprite_id: SPRITE_ID_NEW_TRAIN;
138138
speed: 100 mph;
139139
refit_cost: 0;
140-
track_type: BR_3RDC;
140+
track_type: [BR_3RDC, BR_3RDR, ELRL];
141141
ai_special_flag: AI_FLAG_CARGO;
142142
power: 6705 hp;
143143
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -188,7 +188,7 @@ item (FEAT_TRAINS, item_BR700b, 257) {
188188
speed: 100 mph;
189189
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
190190
refit_cost: 0;
191-
track_type: BR_3RDC;
191+
track_type: [BR_3RDC, BR_3RDR, ELRL];
192192
ai_special_flag: AI_FLAG_CARGO;
193193
power: 0 hp;
194194
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -230,7 +230,7 @@ item (FEAT_TRAINS, item_BR700c, 258) {
230230
sprite_id: SPRITE_ID_NEW_TRAIN;
231231
speed: 100 mph;
232232
refit_cost: 0;
233-
track_type: BR_3RDC;
233+
track_type: [BR_3RDC, BR_3RDR, ELRL];
234234
ai_special_flag: AI_FLAG_CARGO;
235235
power: 0 hp;
236236
running_cost_base: RUNNING_COST_ELECTRIC;
@@ -274,7 +274,7 @@ item (FEAT_TRAINS, item_BR700d, 259) {
274274
sprite_id: SPRITE_ID_NEW_TRAIN;
275275
speed: 100 mph;
276276
refit_cost: 0;
277-
track_type: BR_3RDC;
277+
track_type: [BR_3RDC, BR_3RDR, ELRL];
278278
ai_special_flag: AI_FLAG_CARGO;
279279
power: 0 hp;
280280
running_cost_base: RUNNING_COST_ELECTRIC;

0 commit comments

Comments
 (0)