Skip to content

Commit

Permalink
Recalculated 80X series train power (both electric and diesel). Made …
Browse files Browse the repository at this point in the history 
…BR807 an EMU
  • Loading branch information
@audigex
audigex committed Apr 27, 2024
1 parent 4e7d54d commit 4f76e46
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 37 deletions.
Binary file added docs/Class 80X power calculations.ods
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/trains/_spriteset/EMU_Sprites/800.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spriteset(spriteset_BR80X_middle3_Avanti, "gfx/BR80X.png") {



// Speed switch
// 125mph service speed, 140mph design speed
switch(FEAT_TRAINS, SELF, switch_BR800_speed, param_max_speed) {
0: 201;
1: 225;
Expand Down
18 changes: 13 additions & 5 deletions src/trains/bmu/800_5car_0-2.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,25 @@ switch(FEAT_TRAINS, SELF, switch_BR800_5car_can_attach_wagon, vehicle_type_id) {
return string(STR_CANNOT_ATTACH);
}

// LNER trains hold fewer passengers than GWR trains
// GWR trains hold more passengers than LNER/others
switch(FEAT_TRAINS, SELF, switch_BR800_5car_capacity, cargo_subtype) {
0: return (302/5 * param_pax);
1: return (326/5 * param_pax);
3: return (326/5 * param_pax);
return (302/5 * param_pax);
}

switch(FEAT_TRAINS, SELF, switch_BR800_5car_power, current_railtype) {
ELRL: return 3200;
// GWR trains have higher diesel power than LNER/others
switch(FEAT_TRAINS, SELF, switch_BR800_5car_diesel_power, cargo_subtype) {
1: return 2700; // GWR
3: return 2700; // GWR Pride
return 2250;
}

switch(FEAT_TRAINS, SELF, switch_BR800_5car_power, current_railtype) {
ELRL: return 4000;
return switch_BR800_5car_diesel_power;
}

// Class 800/0/2 (5car)
item(FEAT_TRAINS, item_BR800_5car, 459) {
property {
Expand All @@ -121,7 +129,7 @@ item(FEAT_TRAINS, item_BR800_5car, 459) {
cargo_disallow_refit: [];

speed: 125 mph;
power: 3200 hp;
power: 4000 hp;
cargo_capacity: (302/5);
weight: 243 ton;

Expand Down
21 changes: 14 additions & 7 deletions src/trains/bmu/800_9car_0-1.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,23 @@ switch(FEAT_TRAINS, SELF, switch_BR800_9car_can_attach_wagon, vehicle_type_id) {
return string(STR_CANNOT_ATTACH);
}

// LNER trains hold fewer passengers than GWR trains
// GWR trains hold more passengers than LNER/others
switch(FEAT_TRAINS, SELF, switch_BR800_9car_capacity, cargo_subtype) {
0: return (611/9 * param_pax);
1: return (650/9 * param_pax);
1: return (650/9 * param_pax); // GWR
3: return (650/9 * param_pax); // GWR Pride
return (611/9 * param_pax); // Anything else
}

switch(FEAT_TRAINS, SELF, switch_BR800_9car_power, current_railtype) {
ELRL: return 5760;
return 3750;
// GWR trains have higher diesel power than LNER speeds
switch(FEAT_TRAINS, SELF, switch_BR800_9car_diesel_power, cargo_subtype) {
1: return 4500; // GWR
3: return 4500; // GWR Pride
return 3750; // Anything else
}

switch(FEAT_TRAINS, SELF, switch_BR800_9car_power, current_railtype) {
ELRL: return 5600;
return switch_BR800_9car_diesel_power;
}

// Class 800/1/3 (9car)
Expand All @@ -122,7 +129,7 @@ item(FEAT_TRAINS, item_BR800_9car, 460) {
cargo_disallow_refit: [];

speed: 125 mph;
power: 5760 hp;
power: 5600 hp;
cargo_capacity: (611/9);
weight: 438 ton;

Expand Down
2 changes: 1 addition & 1 deletion src/trains/bmu/802_5car_-0-2-3.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ switch(FEAT_TRAINS, SELF, switch_BR802_5car_capacity, cargo_subtype) {
}

switch(FEAT_TRAINS, SELF, switch_BR802_5car_power, current_railtype) {
ELRL: return 3200;
ELRL: return 4000;
return 2820;
}

Expand Down
2 changes: 1 addition & 1 deletion src/trains/bmu/802_9car_1.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ switch(FEAT_TRAINS, SELF, switch_BR802_9car_can_attach_wagon, vehicle_type_id) {
}

switch(FEAT_TRAINS, SELF, switch_BR802_9car_power, current_railtype) {
ELRL: return 5760;
ELRL: return 7200;
return 4700;
}

Expand Down
5 changes: 2 additions & 3 deletions src/trains/bmu/805_5car.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,10 @@ switch(FEAT_TRAINS, SELF, switch_BR805_5car_can_attach_wagon, vehicle_type_id) {
}

switch(FEAT_TRAINS, SELF, switch_BR805_5car_power, current_railtype) {
ELRL: return 3200;
ELRL: return 4000;
return 2820;
}

// Class 805/0/2/3 (5car)
item(FEAT_TRAINS, item_BR805_5car, 581) {
property {
name: string(STR_BR805_5CAR);
Expand All @@ -87,7 +86,7 @@ item(FEAT_TRAINS, item_BR805_5car, 581) {
cargo_disallow_refit: [];

speed: 125 mph;
power: 3200 hp;
power: 4000 hp;
cargo_capacity: (301/5);
weight: 261 ton;

Expand Down
7 changes: 3 additions & 4 deletions src/trains/bmu/810_5car.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,10 @@ switch(FEAT_TRAINS, SELF, switch_BR810_5car_can_attach_wagon, vehicle_type_id) {
}

switch(FEAT_TRAINS, SELF, switch_BR810_5car_power, current_railtype) {
ELRL: return 3200;
return 2820;
ELRL: return 4000;
return 3944;
}

// Class 810/0/2/3 (5car)
item(FEAT_TRAINS, item_BR810_5car, 579) {
property {
name: string(STR_BR810_5CAR);
Expand All @@ -86,7 +85,7 @@ item(FEAT_TRAINS, item_BR810_5car, 579) {
cargo_disallow_refit: [];

speed: 125 mph;
power: 3200 hp;
power: 3944 hp;
cargo_capacity: (301/5);
weight: 261 ton;

Expand Down
14 changes: 3 additions & 11 deletions src/trains/bmu/807_7car.pnml → src/trains/emu/807_7car.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ switch(FEAT_TRAINS, SELF, switch_BR807_7car_can_attach_wagon, vehicle_type_id) {
return string(STR_CANNOT_ATTACH);
}

switch(FEAT_TRAINS, SELF, switch_BR807_7car_power, current_railtype) {
ELRL: return 5760;
return 4700;
}

// Class 802/1 (9car)
item(FEAT_TRAINS, item_BR807_7car, 580) {
property {
name: string(STR_BR807_7CAR);
Expand All @@ -91,14 +85,14 @@ item(FEAT_TRAINS, item_BR807_7car, 580) {
cargo_disallow_refit: [];

speed: 125 mph;
power: 4480 hp;
power: 5600 hp;
cargo_capacity: (453/7);
weight: 357 ton;

sprite_id: SPRITE_ID_NEW_TRAIN; // required
misc_flags: bitmask(TRAIN_FLAG_MU); // acts as multiple-unit
refit_cost: 0;
track_type: RAIL;
track_type: ELRL;
ai_special_flag: AI_FLAG_PASSENGER; // tell ai that this is a passenger train
running_cost_base: RUNNING_COST_ELECTRIC;
dual_headed: 0; // set to 0 otherwise limited to 2 cars only
Expand All @@ -114,9 +108,7 @@ item(FEAT_TRAINS, item_BR807_7car, 580) {

graphics {
default: switch_BR807_7car_spriteset;
purchase: spriteset_BR805_807_purchase;

power: switch_BR807_7car_power;
purchase: spriteset_BR805_807_purchase;
speed: switch_BR800_speed;

cargo_subtype_text: switch_BR807_7car_subtype_text;
Expand Down
2 changes: 1 addition & 1 deletion src/trains/emu/BR801_5car_1.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ item(FEAT_TRAINS, item_BR801_5car, 451) {
cargo_disallow_refit: [];

speed: 125 mph;
power: 3200 hp;
power: 4000 hp;
cargo_capacity: (302/5);
weight: 205 ton;

Expand Down
2 changes: 1 addition & 1 deletion src/trains/emu/BR801_9car_2.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ item(FEAT_TRAINS, item_BR801_9car, 452) {
cargo_disallow_refit: [];

speed: 125 mph;
power: 5760 hp;
power: 7200 hp;
cargo_capacity: (611/9);
weight: 369 ton;

Expand Down
3 changes: 1 addition & 2 deletions src/trains/emu/BR803_5car_1.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ switch(FEAT_TRAINS, SELF, switch_BR803_5car_can_attach_wagon, vehicle_type_id) {
return string(STR_CANNOT_ATTACH);
}

// Class 803/1 (5car)
item(FEAT_TRAINS, item_BR803_5car, 547) {
property {
name: string(STR_BR803_5CAR);
Expand All @@ -50,7 +49,7 @@ item(FEAT_TRAINS, item_BR803_5car, 547) {
cargo_disallow_refit: [];

speed: 125 mph;
power: 3200 hp;
power: 4000 hp;
cargo_capacity: (302/5);
weight: 205 ton;

Expand Down

0 comments on commit 4f76e46

Please sign in to comment.