diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx index 4e46d36b..693c47c8 100644 Binary files a/docs/SpriteIDs.xlsx and b/docs/SpriteIDs.xlsx differ diff --git a/lang/english.lng b/lang/english.lng index dcca5263..a48fd155 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -110,7 +110,7 @@ STR_BR802_5CAR :British Rail Class 802/0/2/3 (5-Car) STR_BR802_9CAR :British Rail Class 802/1 (9-Car) STR_BR803_5CAR :British Rail Class 803 (5-car) STR_BR805_5CAR :British Rail Class 805 (5-car) -STR_BR807 :British Rail Class 807 (7-car) +STR_BR807_7CAR :British Rail Class 807 (7-car) STR_BR810_5CAR :British Rail Class 810 (5-car) @@ -156,14 +156,14 @@ STR_DSC_BR_769 :Type: {RED}Diesel{BLACK}-{BLUE}Electric STR_DSC_BR_769_9 :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Suburban Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Great Western Railway STR_DSC_BR_777 :Type: {BLUE}Electric Multiple Unit{}{BLACK}Usage: {GOLD}Urban Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Merseyrail -STR_DSC_BR800 :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}London North Eastern Railway, Great Western Railway, Virgin Trains East Coast -STR_DSC_BR801 :Type: {BLUE}Electric Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}London North Eastern Railway -STR_DSC_BR802_5CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Great Western Railway, Transpennine Express, Hull Trains -STR_DSC_BR802_9CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Great Western Railway -STR_DSC_BR803 :Type: {BLUE}Electric Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Lumo -STR_DSC_BR805_5CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Avanti West Coast -STR_DSC_BR807 :Type: {BLUE}Electric Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Avanti West Coast -STR_DSC_BR810_5CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}East Midland Railway +STR_DSC_BR800 :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}London North Eastern Railway, Great Western Railway, Virgin Trains East Coast, Hitachi +STR_DSC_BR801 :Type: {BLUE}Electric Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}London North Eastern Railway, Hitachi +STR_DSC_BR802_5CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Great Western Railway, Transpennine Express, Hull Trains, Hitachi +STR_DSC_BR802_9CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Great Western Railway, Hitachi +STR_DSC_BR803 :Type: {BLUE}Electric Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Lumo, Hitachi +STR_DSC_BR805_5CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Avanti West Coast, Hitachi +STR_DSC_BR807_7CAR :Type: {BLUE}Electric Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Avanti West Coast, Hitachi +STR_DSC_BR810_5CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}East Midland Railway, Hitachi str_purchase_loco_with_liveries :{BLACK}Type: {STRING}{}{BLACK}Route Availability: {GOLD}{STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLACK}Withdrawal: {GOLD}{STRING}{}{BLACK}Liveries: {GOLD}{STRING}{BLACK} str_purchase_loco :{BLACK}Type: {STRING}{}{BLACK}Route Availability: {GOLD}{STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLACK}Withdrawal: {GOLD}{STRING}{}{BLACK} @@ -938,7 +938,7 @@ str_BR717_liveries :Govia Great Northern STR_NAME_BR800 :British Rail Class 800/1 'IET' str_BR800_usage :Regional Passenger str_BR800_eos :--- -str_BR800_liveries :Hatachi, GWR +str_BR800_liveries :Hitachi, GWR STR_NAME_RS_SWB_Hopper :Standard Medium Hopper str_RS_SWB_Hopper_usage :Bulk Cargos @@ -1335,7 +1335,8 @@ str_GWRGreen : (GWR "Green") str_GWRPride : (GWR "Pride") str_GWRGreenUn : (GWR "Green" Unbranded) str_HarryNeedle : (Harry Needle Railroad) -str_Hatachi : (Hatachi) +str_Hitachi : (Hitachi) +str_HitachiWhite : (Hitachi) str_HeathrowExpressPurple : (Heathrow Express - Grey and Purple) str_HogwartsExpress : (Hogwarts Express) str_HT : (Hull Trains) diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index 889ea4d5..159756bb 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -192,7 +192,8 @@ sort(FEAT_TRAINS, [ item_BR802_5car, item_BR802_9car, item_BR803_5car, - item_BR805_5car, + item_BR805_5car, + item_BR807_7car, item_BR810_5car, item_DR98_9, item_LU1938, diff --git a/src/trains/bmu/800_5car_0-2.pnml b/src/trains/bmu/800_5car_0-2.pnml index ee5093cb..86daf731 100644 --- a/src/trains/bmu/800_5car_0-2.pnml +++ b/src/trains/bmu/800_5car_0-2.pnml @@ -23,11 +23,18 @@ switch(FEAT_TRAINS, SELF, switch_BR800_5car_spriteset_GWRPride, position_in_arti spriteset_BR80X_middle_GWRPride; } +switch(FEAT_TRAINS, SELF, switch_BR800_5car_spriteset_Hitachi, position_in_articulated_veh % 5) { + 0: spriteset_BR80X_front_Hitachi; + 4: spriteset_BR80X_rear_Hitachi; + spriteset_BR80X_middle_Hitachi; +} + switch(FEAT_TRAINS, SELF, switch_BR800_5car_subtype_text, cargo_subtype) { 0: return string(STR_LIVERY_BR800_LNER); 1: return string(str_GWRGreen); 2: return string(STR_LIVERY_BR800_VTEC); 3: return string(str_GWRPride); + 4: return string(str_HitachiWhite); return CB_RESULT_NO_TEXT; } @@ -40,6 +47,7 @@ switch(FEAT_TRAINS, SELF, switch_BR800_5car_spriteset, cargo_subtype) { 1: switch_BR800_5car_spriteset_GWR; 2: switch_BR800_5car_spriteset_VTEC; 3: switch_BR800_5car_spriteset_GWRPride; + 4: switch_BR800_5car_spriteset_Hitachi; } // Define articulations diff --git a/src/trains/bmu/800_9car_0-1.pnml b/src/trains/bmu/800_9car_0-1.pnml index 118e5f72..f09667b3 100644 --- a/src/trains/bmu/800_9car_0-1.pnml +++ b/src/trains/bmu/800_9car_0-1.pnml @@ -23,6 +23,13 @@ switch(FEAT_TRAINS, SELF, switch_BR800_9car_spriteset_GWRPride, position_in_arti spriteset_BR80X_middle_GWRPride; } +switch(FEAT_TRAINS, SELF, switch_BR800_9car_spriteset_Hitachi, position_in_articulated_veh % 9) { + 0: spriteset_BR80X_front_Hitachi; + 8: spriteset_BR80X_rear_Hitachi; + spriteset_BR80X_middle_Hitachi; +} + + // Choose sprites depending on car position switch(FEAT_TRAINS, SELF, switch_BR800_9car_spriteset, cargo_subtype) { // 0 is first car, 1 is second car, 2 is third car, so on... @@ -32,6 +39,7 @@ switch(FEAT_TRAINS, SELF, switch_BR800_9car_spriteset, cargo_subtype) { 1: switch_BR800_9car_spriteset_GWR; 2: switch_BR800_9car_spriteset_VTEC; 3: switch_BR800_9car_spriteset_GWRPride; + 4: switch_BR800_9car_spriteset_Hitachi; } switch(FEAT_TRAINS, SELF, switch_BR800_9car_subtype_text, cargo_subtype) { @@ -39,6 +47,7 @@ switch(FEAT_TRAINS, SELF, switch_BR800_9car_subtype_text, cargo_subtype) { 1: return string(str_GWRGreen); 2: return string(STR_LIVERY_BR800_VTEC); 3: return string(str_GWRPride); + 3: return string(str_HitachiWhite); return CB_RESULT_NO_TEXT; } diff --git a/src/trains/bmu/802_5car_-0-2-3.pnml b/src/trains/bmu/802_5car_-0-2-3.pnml index 24f9c00d..43fdda71 100644 --- a/src/trains/bmu/802_5car_-0-2-3.pnml +++ b/src/trains/bmu/802_5car_-0-2-3.pnml @@ -24,6 +24,12 @@ switch(FEAT_TRAINS, SELF, switch_BR802_5car_spriteset_GWRPride, position_in_arti spriteset_BR80X_middle_GWRPride; } +switch(FEAT_TRAINS, SELF, switch_BR802_5car_spriteset_Hitachi, position_in_articulated_veh % 5) { + 0: spriteset_BR80X_front_Hitachi; + 4: spriteset_BR80X_rear_Hitachi; + spriteset_BR80X_middle_Hitachi; +} + // Choose sprites depending on car position switch(FEAT_TRAINS, SELF, switch_BR802_5car_spriteset, cargo_subtype) { @@ -34,6 +40,7 @@ switch(FEAT_TRAINS, SELF, switch_BR802_5car_spriteset, cargo_subtype) { 1: switch_BR802_5car_spriteset_TPE; 2: switch_BR802_5car_spriteset_HullTrains; 3: switch_BR802_5car_spriteset_GWRPride; + 4: switch_BR802_5car_spriteset_Hitachi; } switch(FEAT_TRAINS, SELF, switch_BR802_5car_subtype_text, cargo_subtype) { @@ -41,6 +48,7 @@ switch(FEAT_TRAINS, SELF, switch_BR802_5car_subtype_text, cargo_subtype) { 1: return string(STR_LIVERY_BR800_TPE); 2: return string(STR_LIVERY_BR800_HullTrains); 3: return string(str_GWRPride); + 4: return string(str_HitachiWhite); return CB_RESULT_NO_TEXT; } diff --git a/src/trains/bmu/802_9car_1.pnml b/src/trains/bmu/802_9car_1.pnml index 23f771c7..c493687a 100644 --- a/src/trains/bmu/802_9car_1.pnml +++ b/src/trains/bmu/802_9car_1.pnml @@ -10,18 +10,23 @@ switch(FEAT_TRAINS, SELF, switch_BR802_9car_spriteset_GWRPride, position_in_arti spriteset_BR80X_middle_GWRPride; } +switch(FEAT_TRAINS, SELF, switch_BR802_9car_spriteset_Hitachi, position_in_articulated_veh % 9) { + 0: spriteset_BR80X_front_Hitachi; + 8: spriteset_BR80X_rear_Hitachi; + spriteset_BR80X_middle_Hitachi; +} + // Choose sprites depending on car position switch(FEAT_TRAINS, SELF, switch_BR802_9car_spriteset, cargo_subtype) { - // 0 is first car, 1 is second car, 2 is third car, so on... - // % 3 means that the graphics will repeat properly if another train is added to the end - // so that we get: (front,middle,end);(front,middle,end)... 0: switch_BR802_9car_spriteset_GWR; 1: switch_BR802_9car_spriteset_GWRPride; + 2: switch_BR802_9car_spriteset_Hitachi; } switch(FEAT_TRAINS, SELF, switch_BR802_9car_subtype_text, cargo_subtype) { 0: return string(str_GWRGreen); 1: return string(str_GWRPride); + 2: return string(str_HitachiWhite); return CB_RESULT_NO_TEXT; } diff --git a/src/trains/bmu/805_5car.pnml b/src/trains/bmu/805_5car.pnml index 5cbef252..0c20e15c 100644 --- a/src/trains/bmu/805_5car.pnml +++ b/src/trains/bmu/805_5car.pnml @@ -1,19 +1,27 @@ // Livery callbacks switch(FEAT_TRAINS, SELF, switch_BR805_5car_spriteset_Avanti, position_in_articulated_veh % 5) { 0: spriteset_BR80X_front_Avanti; - 1: spriteset_BR80X_middle_Avanti; - 2: spriteset_BR80X_middle_Avanti; + 1: spriteset_BR80X_middle3_Avanti; + 2: spriteset_BR80X_middle2_Avanti; 3: spriteset_BR80X_middle_Avanti; 4: spriteset_BR80X_rear_Avanti; } +switch(FEAT_TRAINS, SELF, switch_BR805_5car_spriteset_Hitachi, position_in_articulated_veh % 5) { + 0: spriteset_BR80X_front_Hitachi; + 4: spriteset_BR80X_rear_Hitachi; + spriteset_BR80X_middle_Hitachi; +} + // Choose sprites depending on car position switch(FEAT_TRAINS, SELF, switch_BR805_5car_spriteset, cargo_subtype) { 0: switch_BR805_5car_spriteset_Avanti; + 1: switch_BR805_5car_spriteset_Hitachi; } switch(FEAT_TRAINS, SELF, switch_BR805_5car_subtype_text, cargo_subtype) { 0: return string(str_AvantiWestCoast); + 1: return string(str_HitachiWhite); return CB_RESULT_NO_TEXT; } @@ -62,7 +70,7 @@ switch(FEAT_TRAINS, SELF, switch_BR805_5car_power, current_railtype) { } // Class 805/0/2/3 (5car) -item(FEAT_TRAINS, item_BR805_5car, 579) { +item(FEAT_TRAINS, item_BR805_5car, 581) { property { name: string(STR_BR805_5CAR); climates_available: ALL_CLIMATES; // available in all climates diff --git a/src/trains/bmu/807_7car.pnml b/src/trains/bmu/807_7car.pnml new file mode 100644 index 00000000..5416b555 --- /dev/null +++ b/src/trains/bmu/807_7car.pnml @@ -0,0 +1,132 @@ +switch(FEAT_TRAINS, SELF, switch_BR807_7car_spriteset_Avanti, position_in_articulated_veh % 7) { + 0: spriteset_BR80X_front_Avanti; + 1: spriteset_BR80X_middle3_Avanti; + 2: spriteset_BR80X_middle2_Avanti; + 3: spriteset_BR80X_middle_Avanti; + 4: spriteset_BR80X_middle3_Avanti; + 5: spriteset_BR80X_middle2_Avanti; + 6: spriteset_BR80X_rear_Avanti; +} + +switch(FEAT_TRAINS, SELF, switch_BR807_7car_spriteset_Hitachi, position_in_articulated_veh % 7) { + 0: spriteset_BR80X_front_Hitachi; + 6: spriteset_BR80X_rear_Hitachi; + spriteset_BR80X_middle_Hitachi; +} + +// Choose sprites depending on car position +switch(FEAT_TRAINS, SELF, switch_BR807_7car_spriteset, cargo_subtype) { + 0: switch_BR807_7car_spriteset_Avanti; + 1: switch_BR807_7car_spriteset_Hitachi; +} + +switch(FEAT_TRAINS, SELF, switch_BR807_7car_subtype_text, cargo_subtype) { + 0: return string(str_AvantiWestCoast); + 1: return string(str_HitachiWhite); + return CB_RESULT_NO_TEXT; +} + +// Define articulations +switch(FEAT_TRAINS, SELF, switch_BR807_7car_articulated, extra_callback_info1) { + // extra_callback_info1 returns the car number, so 1 is the second car, 2 the third, .. so on + // The callback runs this switch until it returns NO_MORE_ARTICULATED_PARTS, which ends the growth + 1..6: return item_BR807_7car; + return CB_RESULT_NO_MORE_ARTICULATED_PARTS; // Stop adding more cars +} + +switch(FEAT_TRAINS, SELF, switch_BR807_7car_particles_diesel, position_in_articulated_veh % 9) { + // 0 is first car, 1 is second car, 2 is third car, so on... + 0: visual_effect_and_powered(VISUAL_EFFECT_DIESEL, 2, DISABLE_WAGON_POWER); + 6: visual_effect_and_powered(VISUAL_EFFECT_DIESEL, 2, DISABLE_WAGON_POWER); + visual_effect_and_powered(VISUAL_EFFECT_DISABLE, 0, DISABLE_WAGON_POWER); +} + +switch(FEAT_TRAINS, SELF, switch_BR807_7car_particles_electric, position_in_articulated_veh % 9) { + // 0 is first car, 1 is second car, 2 is third car, so on... + 0: visual_effect_and_powered(VISUAL_EFFECT_ELECTRIC, 2, DISABLE_WAGON_POWER); + 6: visual_effect_and_powered(VISUAL_EFFECT_ELECTRIC, 2, DISABLE_WAGON_POWER); + visual_effect_and_powered(VISUAL_EFFECT_DISABLE, 0, DISABLE_WAGON_POWER); +} + +// Only give particle effects to front/rear cars +switch(FEAT_TRAINS, SELF, switch_BR807_7car_particles, current_railtype) { + ELRL: switch_BR807_7car_particles_electric; + switch_BR807_7car_particles_diesel; +} + +// Start/stop switch, used to limit maximum length +switch(FEAT_TRAINS, SELF, switch_BR807_7car_start_stop, num_vehs_in_consist) { + return CB_RESULT_NO_TEXT; // Allow any length +} + +// Only allow the same train type to be added to itself +switch(FEAT_TRAINS, SELF, switch_BR807_7car_can_attach_wagon, vehicle_type_id) { + item_BR807_7car: return CB_RESULT_ATTACH_ALLOW; + item_BR802_5car: return CB_RESULT_ATTACH_ALLOW; + item_BR800_5car: return CB_RESULT_ATTACH_ALLOW; + item_BR800_9car: return CB_RESULT_ATTACH_ALLOW; + 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); + climates_available: ALL_CLIMATES; // available in all climates + introduction_date: date(2018, 08, 18); + model_life: VEHICLE_NEVER_EXPIRES; // keep available forever + vehicle_life: 27.5; // years after vehicle is deemed "old" and should be replaced + reliability_decay: 0; // dont reduce reliabilty, (will grow from 75% upwards over the years) + refittable_cargo_classes: bitmask(CC_PASSENGERS); + non_refittable_cargo_classes: bitmask(); + cost_factor: 147; + loading_speed: 10; + running_cost_factor: 90; + cargo_allow_refit: []; + cargo_disallow_refit: []; + + speed: 125 mph; + power: 4480 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; + 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 + engine_class: ENGINE_CLASS_DIESEL; // even if its 3rd rail, ELECTRIC would give overhead wire effects + extra_power_per_wagon: 0 kW; + tractive_effort_coefficient: 0.3; + air_drag_coefficient: 0.06; + length: 8; + visual_effect_and_powered: visual_effect_and_powered(VISUAL_EFFECT_ELECTRIC, 2, DISABLE_WAGON_POWER); // visual fx + extra_weight_per_wagon: 0 ton; + bitmask_vehicle_info: 0; + } + + graphics { + default: switch_BR807_7car_spriteset; + purchase: spriteset_BR805_807_purchase; + + power: switch_BR807_7car_power; + speed: switch_BR800_speed; + + cargo_subtype_text: switch_BR807_7car_subtype_text; + articulated_part: switch_BR807_7car_articulated; + start_stop: switch_BR807_7car_start_stop; + can_attach_wagon: switch_BR807_7car_can_attach_wagon; + visual_effect_and_powered: switch_BR807_7car_particles; + additional_text: string(STR_DSC_BR807_7CAR); + cargo_capacity: return(453/7 * param_pax); + cost_factor: return(GetAdjustedCost(147)); + running_cost_factor: return(GetAdjustedCost(90)); + } +} \ No newline at end of file diff --git a/src/trains/bmu/810_5car.pnml b/src/trains/bmu/810_5car.pnml index 42f18c2d..fe90a38d 100644 --- a/src/trains/bmu/810_5car.pnml +++ b/src/trains/bmu/810_5car.pnml @@ -5,14 +5,22 @@ switch(FEAT_TRAINS, SELF, switch_BR810_5car_spriteset_EMR, position_in_articulat spriteset_BR80X_middle_EMR; } +switch(FEAT_TRAINS, SELF, switch_BR810_5car_spriteset_Hitachi, position_in_articulated_veh % 5) { + 0: spriteset_BR80X_front_Hitachi; + 4: spriteset_BR80X_rear_Hitachi; + spriteset_BR80X_middle_Hitachi; +} + // Choose sprites depending on car position switch(FEAT_TRAINS, SELF, switch_BR810_5car_spriteset, cargo_subtype) { 0: switch_BR810_5car_spriteset_EMR; + 1: switch_BR810_5car_spriteset_Hitachi; } switch(FEAT_TRAINS, SELF, switch_BR810_5car_subtype_text, cargo_subtype) { 0: return string(str_EMRMaroon); + 1: return string(str_HitachiWhite); return CB_RESULT_NO_TEXT; } @@ -61,7 +69,7 @@ switch(FEAT_TRAINS, SELF, switch_BR810_5car_power, current_railtype) { } // Class 810/0/2/3 (5car) -item(FEAT_TRAINS, item_BR810_5car, 461) { +item(FEAT_TRAINS, item_BR810_5car, 579) { property { name: string(STR_BR810_5CAR); climates_available: ALL_CLIMATES; // available in all climates