From bc031ba82f8fd87038c9d06514415020cb5f442d Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 15 May 2024 09:28:01 +0100 Subject: [PATCH] Redrew Royal Mail TPO as 8/8 length, added push-pull with Class 47 --- gfx/{Freight => Archive}/RM_TPO.png | Bin gfx/Rolling Stock/RoyalMail_TPO.png | Bin 0 -> 16262 bytes .../Rolling Stock_Sprites/RM_TPO.pnml | 22 +++++++++--------- src/trains/diesel/BR047.pnml | 2 +- src/trains/rollingstock/RM_TPO.pnml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) rename gfx/{Freight => Archive}/RM_TPO.png (100%) create mode 100644 gfx/Rolling Stock/RoyalMail_TPO.png diff --git a/gfx/Freight/RM_TPO.png b/gfx/Archive/RM_TPO.png similarity index 100% rename from gfx/Freight/RM_TPO.png rename to gfx/Archive/RM_TPO.png diff --git a/gfx/Rolling Stock/RoyalMail_TPO.png b/gfx/Rolling Stock/RoyalMail_TPO.png new file mode 100644 index 0000000000000000000000000000000000000000..a2830febc7cf9344c1772487a2ee7cffa5b260f4 GIT binary patch literal 16262 zcmch8g;N_&&}e{Q#exTIa0(QHI|O$K?i4HTR-izGdy5x$DDLhqMT?gLr9dg}PJs9O z=6&y9crz!nd%LrHJ9jsGce~MWbp^avl&=5)0G^Vftk!>h(|`2=3+=yFQYwcU0N^h6 z*D>(YviJaT^KiAXcX|);@^gC+dGBj)0|5B09%maSnFuDyz0}7Tp)!xwQODVIhnfZD z#bRj{D=(Vz9L{LPOj=tHQ2}m6g{Wt8UY=_YpU=O13NtTgcWO>Gi}}~P=J_S`b><6l z`SbNY=I`00Eb zp=A3RS@)@1(dXL{Fbxpuy@I&aIq z8A+DDK+??LzDj!D;k$D|(j=WrCqoRAbmbc_I!Lf1UyOH{Vs6-MEjH{ z`DA~#ebE2r*O@8bDtGxe1uHEx=kz7maA2s>in=X<@zU@!fDLV%z z_b4&@Zz~h-?q#Ej`q5zybmqufH>>v}J`R(AV@6AcCeHsghke+1o^F-io)kS>0tRFE)dy1kN~-=CVy z;?9HC&*8$!vzwyq#otoqd6_}E@v&%_=$dC`NY;R@oJVknBssN_P?BHJ($1j4$!55M z-*#PIiHV%OWPv_`iht3hI?c$jviozIk;{^DWp(q0{1@@y;3bvX?(2=wC>OWF{(6kl z*Ihi@s=OLm@0Whs>={)Wk#Xdohu)G%iyD+aVxlQCK zxE^qvX6)Me^f|AQtjGTGUu`e9;~!DS^Qn{#{ZG@BwH-#EsOhoPRXs=IhH?4tDkvcN zMZ1%&37!j+_R|4h7{lc_=lBF&FsH!U=^9Z!gEQ@qR=dyDex6JJHL)+tlfr82FQb#f zr6+m+j=5}{WB)B>)oYMBs0PwMenuf%B()NHsJc(1Y1`4ZY}&b1^LEb(Y*vBo7CCk{ zrg++JxomBHO!tg$u~D)QRd7C59P>>1@A~X6iKjK6N_a0pU1lo1P6|l{ zXMnHUf03L}Cf`Q*efvk|HP(mc_N$14U?DHr8Q9DFAZJsh&CgV!%^b}^e?%=`wp>puVSY~Ii zSz{b!{XOUK3P0SV5DdQdZ@rw9>u4oR-C;TMozmlARHl}_E(`M7zDO|lE>@$~8)HY0 z9a6PyidySwXg4=u+CICS{mn3#c)IfCXi6Fl)>(`597u`zkj*QYpoC9LL*YS zHrkCkhvy7S*7Qa){Sug)No;)gZ1i*EcbF_iQrf|XL~F-P(=?+>>{G;)q3T$=42Ouj zlWp;DDPl6YC6Ovs_yf&m9y_Y^uB`JTa&hVdc|WV2Q;ntBKUix8DXgq8W6$^HFCxo7 zx}AD%K*z>R=TvuvX?cmky32ZN6Q$Qp8|z7L{tXFbRHR@4>OGXKUoZb6_WRUvlF+rb zzRUO-HsiVL9opU{-Gue|%4meMSn70<9zHs@7C0fTwlMjEJKO#Z%~BROS~b%b9~V

ZDq5HKclmq2@NatkiZ$L1Um$= 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

->S~aY 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 literal 0 HcmV?d00001 diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/RM_TPO.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/RM_TPO.pnml index 78edb46d..da83f847 100644 --- a/src/trains/_spriteset/Rolling Stock_Sprites/RM_TPO.pnml +++ b/src/trains/_spriteset/Rolling Stock_Sprites/RM_TPO.pnml @@ -1,23 +1,23 @@ -spriteset(spriteset_RMTPO_Purchase, "gfx/Freight/RM_TPO.png") { +spriteset(spriteset_RMTPO_Purchase, "gfx/Rolling Stock/RoyalMail_TPO.png") { template_purchase(0, 0) } -spriteset(spriteset_RMTPO_NoDoors, "gfx/Freight/RM_TPO.png") { - template_train28px_old(0, 13) +spriteset(spriteset_RMTPO_NoDoors, "gfx/Rolling Stock/RoyalMail_TPO.png") { + template_train32px(0, 13) } -spriteset(spriteset_RMTPO_2Door, "gfx/Freight/RM_TPO.png") { - template_train28px_old(0, 36) +spriteset(spriteset_RMTPO_2Door, "gfx/Rolling Stock/RoyalMail_TPO.png") { + template_train32px(0, 39) } -spriteset(spriteset_RMTPO_3Door, "gfx/Freight/RM_TPO.png") { - template_train28px_old(0, 59) +spriteset(spriteset_RMTPO_3Door, "gfx/Rolling Stock/RoyalMail_TPO.png") { + template_train32px(0, 65) } -spriteset(spriteset_RMTPO_PCV, "gfx/Freight/RM_TPO.png") { - template_train28px_old(0, 82) +spriteset(spriteset_RMTPO_PCV, "gfx/Rolling Stock/RoyalMail_TPO.png") { + template_train32px(0, 91) } -spriteset(spriteset_RMTPO_PCVr, "gfx/Freight/RM_TPO.png") { - template_train28px_old(0, 105) +spriteset(spriteset_RMTPO_PCVr, "gfx/Rolling Stock/RoyalMail_TPO.png") { + template_train32px(0, 117) } random_switch(FEAT_TRAINS, SELF, sw_RMTPO_Random) diff --git a/src/trains/diesel/BR047.pnml b/src/trains/diesel/BR047.pnml index 7dda2558..f83019f1 100644 --- a/src/trains/diesel/BR047.pnml +++ b/src/trains/diesel/BR047.pnml @@ -1,6 +1,6 @@ // If the rear of this consist is a compatible Driving Trailer, call that vehicles's remote sprite call switch switch(FEAT_TRAINS, PARENT, sw_BR47_PushPUll, [STORE_TEMP(num_vehs_in_consist - 1, 0x10F), var[0x61, 0, 0x0000FFFF, 0xC6]]) { - //483: sw_PUSHPULL_LocomotiveAsRMTPO; // Royal Mail TPO, uncommen this line when RMTPO has been changed to length 8 + 483: sw_PUSHPULL_LocomotiveAsRMTPO; // Royal Mail TPO PCV 630: sw_PUSHPULL_LocomotiveAsMk2DBSO; // Mk2 DBSO 586: sw_PUSHPULL_LocomotiveAsMk3DVT; // Mk3 DVT sw_BR47; // No compatible locomotive found, show normal sprites diff --git a/src/trains/rollingstock/RM_TPO.pnml b/src/trains/rollingstock/RM_TPO.pnml index 1ea9a170..01549414 100644 --- a/src/trains/rollingstock/RM_TPO.pnml +++ b/src/trains/rollingstock/RM_TPO.pnml @@ -31,7 +31,7 @@ item (FEAT_TRAINS, item_RMTPO, 483) { default_cargo_type: MAIL; cargo_capacity: 50; weight: 30 ton; - length: 7; + length: 8; bitmask_vehicle_info: 0; cargo_age_period: 185; }