From 3748c2458024580a672ef67bc629217505c13fe7 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 3 Oct 2024 17:55:23 +0100 Subject: [PATCH] Class 70 - added Freightliner Orange livery --- docs/changelog.txt | 1 + gfx/Diesel/70.png | Bin 13401 -> 22660 bytes lang/english.lng | 2 +- src/trains/diesel_loco/BR070.pnml | 10 ++++++++-- 4 files changed, 10 insertions(+), 3 deletions(-) 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 c35e081b428b20809a54ed524ebfc1a98ea859a8..c154a33a9b611609eed00477ff2b21e9bdd06b70 100644 GIT binary patch literal 22660 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 @O3XDHiqYq!ZC$K(8!W7U#*BV!ygg!TJ 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 MNhOH}F_V!02Wmk5MgRZ+ 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; }