diff --git a/gfx/Electrostar_v2.png b/gfx/Electrostar_v2.png index 054a2c19..5eb9eb6e 100644 Binary files a/gfx/Electrostar_v2.png and b/gfx/Electrostar_v2.png differ diff --git a/lang/english.lng b/lang/english.lng index 874c8a3f..874e042a 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -1260,7 +1260,8 @@ str_OneChapelf : (One 'Chapelfield') str_OneGhost : (One 'Ghost White') str_OneTrans : (One - Transitional) str_overground : (London Overground) -str_overground5 : (London Overground 5-Car Celebration) +str_overgroundAventra : (LO - Fake Aventra) +str_overground5 : (LO - 5-Car Celebration) str_Police : (Police (Advert)) str_Purple : (Potterbrook Purple) str_Pullman : (Blue Pullman) diff --git a/src/trains/emu/BR378.pnml b/src/trains/emu/BR378.pnml index 2ae54f34..091d7959 100644 --- a/src/trains/emu/BR378.pnml +++ b/src/trains/emu/BR378.pnml @@ -15,6 +15,23 @@ spriteset(spriteset_BR378d_overground, "gfx/Electrostar_v2.png") { template_train32px(0, 375) } +spriteset(spriteset_BR378_LOunwrapped, "gfx/Electrostar_v2.png") { + template_train32px(200, 350) +} + +spriteset(spriteset_BR378a_Aventra, "gfx/Electrostar_v2.png") { + template_train32px(0, 1700) +} +spriteset(spriteset_BR378b_Aventra, "gfx/Electrostar_v2.png") { + template_train32px(0, 1725) +} +spriteset(spriteset_BR378c_Aventra, "gfx/Electrostar_v2.png") { + template_train32px(0, 1750) +} +spriteset(spriteset_BR378d_Aventra, "gfx/Electrostar_v2.png") { + template_train32px(0, 1775) +} + spriteset(spriteset_BR378a_overground5, "gfx/Electrostar_v2.png") { template_train32px(0, 300) } @@ -31,21 +48,31 @@ spriteset(spriteset_BR378d_overground5, "gfx/Electrostar_v2.png") { switch(FEAT_TRAINS,SELF, sw_BR378a,cargo_subtype){ 0: spriteset_BR378a_overground; 1: spriteset_BR378a_overground5; + 2: spriteset_BR378a_Aventra; } switch(FEAT_TRAINS,SELF, sw_BR378b,cargo_subtype){ 0: spriteset_BR378b_overground; 1: spriteset_BR378b_overground5; + 2: spriteset_BR378b_Aventra; } switch(FEAT_TRAINS,SELF, sw_BR378c,cargo_subtype){ 0: spriteset_BR378c_overground; 1: spriteset_BR378c_overground5; + 2: spriteset_BR378c_Aventra; +} + +switch(FEAT_TRAINS, SELF, switch_378_special_livery, position_in_consist) +{ + 2: spriteset_BR378_LOunwrapped; + spriteset_BR378d_overground5; } switch(FEAT_TRAINS,SELF, sw_BR378d,cargo_subtype){ 0: spriteset_BR378d_overground; - 1: spriteset_BR378d_overground5; + 1: switch_378_special_livery; + 2: spriteset_BR378d_Aventra; } switch (FEAT_TRAINS, SELF, switch_articulated_BR378_3dv, extra_callback_info1) { @@ -85,13 +112,19 @@ switch (FEAT_TRAINS, SELF, switch_articulated_BR378_5dv, extra_callback_info1) { } switch(FEAT_TRAINS,SELF,sw_BR378_3_cargo_subtype_text,cargo_subtype){ - 0: return string(str_overground); + 0: return string(str_overground); + return CB_RESULT_NO_TEXT; +} + +switch(FEAT_TRAINS,SELF,sw_BR378_4_cargo_subtype_text,cargo_subtype){ + 0: return string(str_overground); return CB_RESULT_NO_TEXT; } switch(FEAT_TRAINS,SELF,sw_BR378_5_cargo_subtype_text,cargo_subtype){ 0: return string(str_overground); 1: return string(str_overground5); + 2: return string(str_overgroundAventra); return CB_RESULT_NO_TEXT; } @@ -182,7 +215,7 @@ item (FEAT_TRAINS, item_BR378_4, 226) { graphics { additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_emu),string(str_route_2),string(str_BR378_4_usage),string(str_BR378_4_eos),string(str_BR378_4_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BR378_3_cargo_subtype_text; + cargo_subtype_text: sw_BR378_4_cargo_subtype_text; articulated_part: switch_articulated_BR378_4; default: sw_BR378a; purchase: spriteset_BR378_Purchase; @@ -378,8 +411,7 @@ item (FEAT_TRAINS, item_BR378b, 231) { } graphics { additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_emu),string(str_route_2),string(str_BR378_4_usage),string(str_BR378_4_eos),string(str_BR378_4_liveries))); - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BR378_3_cargo_subtype_text; + can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_BR378b; colour_mapping: return PALETTE_CC_FIRST; create_effect: electric_create_visual_effect; @@ -424,8 +456,7 @@ item (FEAT_TRAINS, item_BR378c, 232) { } graphics { additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_emu),string(str_route_2),string(str_BR378_4_usage),string(str_BR378_4_eos),string(str_BR378_4_liveries))); - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BR378_3_cargo_subtype_text; + can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_BR378c; colour_mapping: return PALETTE_CC_FIRST; create_effect: electric_create_visual_effect; @@ -470,8 +501,7 @@ item (FEAT_TRAINS, item_BR378d, 233) { } graphics { additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_emu),string(str_route_2),string(str_BR378_4_usage),string(str_BR378_4_eos),string(str_BR378_4_liveries))); - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BR378_3_cargo_subtype_text; + can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_BR378d; colour_mapping: return PALETTE_CC_FIRST; sound_effect: sw_electrostar_sound;