diff --git a/docs/changelog.txt b/docs/changelog.txt index aefeffde..2871ffe3 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -35,6 +35,7 @@ - Improved Class 89 sprites - Improved Class 68/88 - Added Harry Needle Orange livery for Class 37 +- Added Freightliner Orange livery for Class 70 - Improved steam train naming conventions and consistency - Fixed some animated pixels on HST rear power car - Fixed some tram capacities diff --git a/gfx/Diesel/70.png b/gfx/Diesel/70.png index c35e081b..c154a33a 100644 Binary files a/gfx/Diesel/70.png and b/gfx/Diesel/70.png differ diff --git a/lang/english.lng b/lang/english.lng index ac1fc262..c32416ec 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -683,7 +683,7 @@ str_BR70OG_liveries :BR Green, BR Blue STR_NAME_BR70 :BR Class 70 "Powerhaul" str_BR70_usage :Heavy Freight str_BR70_eos :--- -str_BR70_liveries :Freightliner, Colas Rail +str_BR70_liveries :Freightliner Powerhaul, Colas Rail, Freightliner Orange STR_NAME_BR71 :BR Class 71 str_BR71_usage :Mixed Traffic diff --git a/src/trains/diesel_loco/BR070.pnml b/src/trains/diesel_loco/BR070.pnml index d754bba1..49736fce 100644 --- a/src/trains/diesel_loco/BR070.pnml +++ b/src/trains/diesel_loco/BR070.pnml @@ -2,7 +2,7 @@ spriteset(spriteset_BR70_Purchase, "gfx/Diesel/70.png") { template_purchase(0, 0) } -spriteset(spriteset_BR70_Freightliner, "gfx/Diesel/70.png") { +spriteset(spriteset_BR70_FreightlinerPowerhaul, "gfx/Diesel/70.png") { template_train32px(0, 13) } @@ -10,14 +10,20 @@ spriteset(spriteset_BR70_ColasRail, "gfx/Diesel/70.png") { template_train32px(0, 39) } +spriteset(spriteset_BR70_FreightlinerOrange, "gfx/Diesel/70.png") { + template_train32px(0, 65) +} + switch(FEAT_TRAINS,SELF, sw_BR70,cargo_subtype){ - 0: spriteset_BR70_Freightliner; + 0: spriteset_BR70_FreightlinerPowerhaul; 1: spriteset_BR70_ColasRail; + 2: spriteset_BR70_FreightlinerOrange; } switch(FEAT_TRAINS,SELF,sw_BR70_cargo_subtype_text,cargo_subtype){ 0: return string(str_Freightliner); 1: return string(str_ColasRail); + 2: return string(str_FreightlinerOrange); return CB_RESULT_NO_TEXT; }