From 4f65f37b525af680a8d822f4af655527c2b7b93f Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 22 Aug 2024 14:43:01 +0100 Subject: [PATCH] Class 20 sprites flip depending on position, added Railfreight Grey livery, coded current liveries --- gfx/Diesel/20.png | Bin 22612 -> 26431 bytes lang/english.lng | 2 + src/templates_trains.pnml | 14 ++++++- src/trains/diesel_loco/20.pnml | 68 +++++++++++++++++++++++++++++++-- 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/gfx/Diesel/20.png b/gfx/Diesel/20.png index 7406008030817c756b1ab97a6ce5fa81b856ac1c..1a3e8880c583a6ac714a96995dcbbdab78e47950 100644 GIT binary patch delta 21543 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 YFL?7@WKjUeWAOHXW delta 17862 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 diff --git a/lang/english.lng b/lang/english.lng index a188148e..6a70a9eb 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -1545,6 +1545,7 @@ str_Biffa : (Biffa) str_BlackpoolTransport : (Blackpool Transport) str_BoltonCorporation : (BoltonCorporation) str_BP : (BP) +str_BR2ToneGrey : (BR - 2 Tone Grey) str_BRBlack : (BR - Black) str_BRBlue : (BR - Blue) str_BRBlueAlt : (BR - Blue, Alternate) @@ -1574,6 +1575,7 @@ str_BRMaroon : (BR - Maroon) str_BROchre : (BR - Golden Ochre) str_BRPrototype : (BR - Prototype) str_BRProvincial : (BR - Provincial) +str_BRRailfreightGrey : (BR - Railfreight Grey) str_BRResearch : (BR - Research Department) str_BRRefurb : (BR - Refurbished) str_BRTransitionalRed : (BR - TransitionalRed) diff --git a/src/templates_trains.pnml b/src/templates_trains.pnml index bcf4d06f..72defb3b 100644 --- a/src/templates_trains.pnml +++ b/src/templates_trains.pnml @@ -27,7 +27,6 @@ template template_train8px(x,y){ [ x+71, y, 10, 13, -5, -11] //nw } - template template_train12px(x,y){ //left_x, upper_y, width, height, offset_x, offset_y [ x, y, 8, 15, -3, -12] //n @@ -52,7 +51,7 @@ template template_train16px(x,y){ [ x+99, y, 14, 15, -5, -11] //nw } -template template_train20px(x,y){ // Clone to 4view when changed +template template_train20px(x,y){ //left_x, upper_y, width, height, offset_x, offset_y [ x, y, 8, 19, -3, -13] // n [ x+9, y, 16, 16, -7, -12] //ne @@ -63,6 +62,17 @@ template template_train20px(x,y){ // Clone to 4view when changed [ x+91, y, 21, 13, -15, -9] //w [ x+113, y, 16, 16, -5, -11] //nw } +template template_train20px_reversed(x,y){ + //left_x, upper_y, width, height, offset_x, offset_y + [ x+65, y, 8, 19, -3, -13] //s as n + [ x+74, y, 16, 16, -7, -12] //sw as ne + [ x+91, y, 21, 13, -8, -9] //w as e + [ x+113, y, 16, 16, 0, -8] //nw as se (might be -1 -8 with the class 20 sprite NW being wrong?) + [ x, y, 8, 19, -3, -13] // n as s + [ x+9, y, 16, 16, -13, -9] //ne as sw + [ x+26, y, 21, 13, -15, -9] //e as w + [ x+48, y, 16, 16, -5, -11] //se as nw +} template template_train24px(x,y){ //left_x, upper_y, width, height, offset_x, offset_y diff --git a/src/trains/diesel_loco/20.pnml b/src/trains/diesel_loco/20.pnml index fa0acb1a..da9e6134 100644 --- a/src/trains/diesel_loco/20.pnml +++ b/src/trains/diesel_loco/20.pnml @@ -5,13 +5,75 @@ spriteset(spriteset_BR20_Purchase, "gfx/Diesel/20.png") { spriteset(spriteset_BR20_BRBlue, "gfx/Diesel/20.png") { template_train20px(0, 13) } +spriteset(spriteset_BR20_reversed_BRBlue, "gfx/Diesel/20.png") { + template_train20px_reversed(0, 13) +} + +spriteset(spriteset_BR20_GBRf, "gfx/Diesel/20.png") { + template_train20px(0, 39) +} +spriteset(spriteset_BR20_reversed_GBRf, "gfx/Diesel/20.png") { + template_train20px_reversed(0, 39) +} + +spriteset(spriteset_BR20_GBRf2Tone, "gfx/Diesel/20.png") { + template_train20px(0, 65) +} +spriteset(spriteset_BR20_reversed_GBRf2Tone, "gfx/Diesel/20.png") { + template_train20px_reversed(0, 65) +} + +spriteset(spriteset_BR20_BR2Tone, "gfx/Diesel/20.png") { + template_train20px(0, 91) +} +spriteset(spriteset_BR20_reversed_BR2Tone, "gfx/Diesel/20.png") { + template_train20px_reversed(0, 91) +} + +spriteset(spriteset_BR20_EWS, "gfx/Diesel/20.png") { + template_train20px(0, 117) +} +spriteset(spriteset_BR20_reversed_EWS, "gfx/Diesel/20.png") { + template_train20px_reversed(0, 117) +} + +spriteset(spriteset_BR20_BRRailfreightGrey, "gfx/Diesel/20.png") { + template_train20px(0, 143) +} +spriteset(spriteset_BR20_reversed_BRRailfreightGrey, "gfx/Diesel/20.png") { + template_train20px_reversed(0, 143) +} + +switch(FEAT_TRAINS,SELF, sw_BR20_normal,cargo_subtype){ + 0: spriteset_BR20_BRRailfreightGrey; + 1: spriteset_BR20_BRBlue; + 2: spriteset_BR20_GBRf; + 3: spriteset_BR20_GBRf2Tone; + 4: spriteset_BR20_BR2Tone; + 5: spriteset_BR20_EWS; +} +switch(FEAT_TRAINS,SELF, sw_BR20_reversed,cargo_subtype){ + 0: spriteset_BR20_reversed_BRRailfreightGrey; + 1: spriteset_BR20_reversed_BRBlue; + 2: spriteset_BR20_reversed_GBRf; + 3: spriteset_BR20_reversed_GBRf2Tone; + 4: spriteset_BR20_reversed_BR2Tone; + 5: spriteset_BR20_reversed_EWS; +} -switch(FEAT_TRAINS,SELF, sw_BR20,cargo_subtype){ - 0: spriteset_BR20_BRBlue; +// Automatically flip second vehicle +switch(FEAT_TRAINS,SELF, sw_BR20, position_in_consist % 2){ + 0: sw_BR20_reversed; + sw_BR20_normal; } switch(FEAT_TRAINS,SELF,sw_BR20_cargo_subtype_text,cargo_subtype){ - 0: return string(str_BRBlue); + 0: return string(str_BRRailfreightGrey); + 1: return string(str_BRBlue); + 2: return string(str_GBRf); + 3: return string(str_GBRf2ToneGrey); + 4: return string(str_BR2ToneGrey); + 5: return string(str_EWSRed); return CB_RESULT_NO_TEXT; }