diff --git a/docs/changelog.txt b/docs/changelog.txt index 1923c16d..d2afa9aa 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -2,7 +2,7 @@ - Furness Railway Railmotor? - LNER P2 Streamlined version (gfx done need coding) - GWR 5700/6700/8750 Class (gfx done need coding) -- Class 52 (new gfx, presumably need template swap in code and additional livery adding) +- Class 20 (graphics drawn? Need to check if they're actually right) # v2.12 - Added LMS Black 5 @@ -18,6 +18,7 @@ - Added AnsaldoBreda T-68 (Manchester Metrolink tram) - Added LU S7/S8 stock Tram variants - Added LU 1938 stock Tram Variant +- Re-drew Class 52 - Improved LNER Teak coach windows and roofs to fit scale better - Improved Standard 9F - Fixed some introduction and model lifespans (set is now fully freight playable from ~1850 onwards) diff --git a/gfx/BR52.png b/gfx/Archive/BR52.png similarity index 100% rename from gfx/BR52.png rename to gfx/Archive/BR52.png diff --git a/gfx/Diesel/52.png b/gfx/Diesel/52.png index fc56e9b5..38f9423d 100644 Binary files a/gfx/Diesel/52.png and b/gfx/Diesel/52.png differ diff --git a/lang/english.lng b/lang/english.lng index 91f569e7..a8b92a55 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -1442,6 +1442,7 @@ str_BRLLogoCentre : (BR Large Logo - Centre Headcode) str_BRLLogoSplit : (BR Large Logo - Split Box) str_BRMalachite : (BR - Malachite Green) str_BRMaroon : (BR - Maroon) +str_BROchre : (BR - Golden Ochre) str_BRPrototype : (BR - Prototype) str_BRProvincial : (BR - Provincial) str_BRRefurb : (BR - Refurbished) diff --git a/src/trains/diesel/BR052.pnml b/src/trains/diesel/52.pnml similarity index 72% rename from src/trains/diesel/BR052.pnml rename to src/trains/diesel/52.pnml index 4132275f..273d0c68 100644 --- a/src/trains/diesel/BR052.pnml +++ b/src/trains/diesel/52.pnml @@ -1,36 +1,42 @@ -spriteset(spriteset_BR52_Purchase, "gfx/BR52.png") { +spriteset(spriteset_BR52_Purchase, "gfx/Diesel/52.png") { template_purchase(0, 0) } -spriteset(spriteset_BR52_BRSand, "gfx/BR52.png") { - template_train28px_old(0, 13) +spriteset(spriteset_BR52_BRBlue, "gfx/Diesel/52.png") { + template_train32px(0, 13) } -spriteset(spriteset_BR52_BRMaroon, "gfx/BR52.png") { - template_train28px_old(0, 36) +spriteset(spriteset_BR52_BRSand, "gfx/Diesel/52.png") { + template_train32px(0, 39) } -spriteset(spriteset_BR52_BRBlue, "gfx/BR52.png") { - template_train28px_old(0, 59) +spriteset(spriteset_BR52_BRMaroon, "gfx/Diesel/52.png") { + template_train32px(0, 65) } -spriteset(spriteset_BR52_BRGreen, "gfx/BR52.png") { - template_train28px_old(0, 82) +spriteset(spriteset_BR52_BRGreen, "gfx/Diesel/52.png") { + template_train32px(0, 91) +} + +spriteset(spriteset_BR52_BROchre, "gfx/Diesel/52.png") { + template_train32px(0, 117) } switch(FEAT_TRAINS,SELF, sw_BR52,cargo_subtype){ - 0: spriteset_BR52_BRSand; - 1: spriteset_BR52_BRMaroon; - 2: spriteset_BR52_BRBlue; + 0: spriteset_BR52_BRBlue; + 1: spriteset_BR52_BRSand; + 2: spriteset_BR52_BRMaroon; 3: spriteset_BR52_BRGreen; + 4: spriteset_BR52_BROchre; return CB_RESULT_NO_TEXT; } switch(FEAT_TRAINS,SELF,sw_BR52_cargo_subtype_text,cargo_subtype){ - 0: return string(str_BRDesertSand); - 1: return string(str_BRMaroon); - 2: return string(str_BRBlue); + 0: return string(str_BRBlue); + 1: return string(str_BRDesertSand); + 2: return string(str_BRMaroon); 3: return string(str_BRGreen); + 4: return string(str_BROchre); return CB_RESULT_NO_TEXT; }