From 4509d33527754c636dc7f0694bfd0e6eda482440 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 28 Mar 2024 01:38:26 +0000 Subject: [PATCH] More work on Coppernob --- gfx/Steam/FurnessCoppernob.png | Bin 3698 -> 4006 bytes src/templates.pnml | 18 +++++++++--------- src/trains/steam/FurnessCoppernob.pnml | 21 +++++++++++++-------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/gfx/Steam/FurnessCoppernob.png b/gfx/Steam/FurnessCoppernob.png index 1e718e9f76ed25a4b11f6d2d4bcc4d91419ac743..2306d41c9030ab1ab9af2cd46ff49e1de67994e3 100644 GIT binary patch delta 2755 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 JPDHLkV1gcL9drNy delta 2444 zcmV;733K+QAMzZq-UJ5#Hx-t4Y5D*W5@I*L`((f0#rr*6@4N(Jy7g-T;mm(CAn`8V?d&D-0|;ZiK;EYt4?yf8)&jz68J&}s zegfHIlLeOquYCj}Yd{vu=cNOrI@ANiPEdAET3R5|DKq(G`xb z%w^5R_&`JkiYrtLOR`dFnoD7Ts5!`As3J{OS{MLgF<;J$;s8VdpBGgDDGGRWAuJGg z(h^T5b9gajs+kuxJr|#6hcb8 z;X$X)Wd_Ys`h?mlEdHRV)MXrJ9jAKEQBH-Kb%Yv%6)MlAr3Tpm1hRj%)DqBD*&UOX zWnj{=7C|lKG;!5kL$DVp5C~LV&>EDUPPqo6XB*$I5WsY*HHD|@j)n`tLscLUJfv}$ z?2buGcu7cy3I|mNo<~5sfndk|{PI*XrW;bIz0=ppN=w?9bi~1MxthFAg?%23mUXoP zh+Wz3Ny{>5rjz=eKxTh4B=S_QR!lcCuY5J>9g_yZWW_;L31j6I=+2>&PE~HQ<>%Q| zy1;Z&zZ(cPQ%h)c0u+^F`3^pk6pK06I7}acjob;@wRBRyXOsnB1?7{`dZo+vCz3)j zUs>IC$8%!#A)VCk1j5B?CHcS}7P6sF;Fs^88`CSFtd$+PqIQ4OirZM{eSZTh8$-WW znIIq+1LAAVeOMqtuESZ;C_i59D~DwfkRyQP48F55rfgoWRKK)J&zIo6VOa#^7$B%@ z$c?ml&Ol`lx0IqD5~WoN9?Z=&d{0*3q&ZnP0mAOThJ?(NbrcqgeF)-~0;fD6Lik}k z3rY|+)DNS$Wlw)rkinBN1%q+nWc{8%B4by%WRs=KdY+?(rYVwTh&qC_fCX*=5XtO= zoacGjlNDrm6zfiikB3gy6@fTw&9?%A>smH02L!~zvMz+V#kiCi)Q}LXhnAgV4aua` z55gZ9<@RJj4bcF($reu5^?C6hU zW}cIEH6X3E<{JSqo~~qPJzWiGBlza0A)`WbAdFo&IZzQf>$-f zU2DE&4S9d}bX^3bgdul;NLKPti;Kc?UiM@$=>TbFT@6TUt+_{-x~J>{ zKv=ZZ_Muo?h}dO-WVo6vq5a3M7aJe!jspis$jShZW8;GzblH=|LI+4Q>s%nR8%W1m zbGI-JPuU4T+G8j)k;l+NRN08uO!NZj85n;I1Py<4`iqBN8bl>Q;=o*Uy99`L&{kLW zW${Lun{@_|x@D{lq_x)EElk5xb~KPEN|MdG6Nvs`ddQErdV#DrNz#Sn<0i{^7@xwP zr|QGu6EpUoVOggEF@{QWr(qduH687>=1yUnp0Xo>AddY$j@BLL6}iG+VXynnyN+V$ z^*eu%bgzemUl{ump17hhENeKBhGlHve5KmilH z)k;~njJY3){ncAAUS6J`mrKAopShm09w2{}H})W91S8sb1AX=>=WP_;bp$W7i=(5k zdJCj-xEdf0%UDa8zmEdqc*=T!RNh$I`foPTHU=Tr?4(<3ys-qNHOev$*UyGdIJ1A5;XH3q7U?Ce0c&q1&_WOJPGz5fzP!JFTLh-;rUSD7TwUOHR zarS77fPDNeKbiv~AR_|la!UxkFNTiHMsB0BBf)nR0zyC@07yhYd;)TCtTlfh{Pt~P z;~yJS8{fZEA96h)i^ajQMnF6Og5Jf-vDSPL{b44!jVBwSjX!MsY2)kHuLR`0ce#$y zyI48a2*}vM(XlpPRE{+QGCq)Kvzg5*#~MwYj2(_+jev|Dj$@60j6ce1IMxV=58p#- zjx_>8K|lxy1p)cE(-?ibECPQ*KnMr{As_^VfQ$)*5fB1GKyI_;A^{l;k>1Ef+l=Wj*GWi{1ix)GZf% z1@f?4F8&7Y_up%WKl*nB0zyGR2nYoMAs`e4gn&>G5CTHsRs0X#j89 diff --git a/src/templates.pnml b/src/templates.pnml index 4a105a7f..bcab1702 100644 --- a/src/templates.pnml +++ b/src/templates.pnml @@ -25,16 +25,16 @@ template tmpl_train_8_reversed(x, y) { [x + 92, y + 2, 21, 18, -12, -12] // nw } -template template_train16px(x,y){ // Clone to 4view when changed +template template_train12px(x,y){ //left_x, upper_y, width, height, offset_x, offset_y - [ x, y, 8, 15, -3, -11] - [ x+9, y, 13, 13, -7, -10] - [ x+23, y, 16, 12, -4, -8] - [ x+40, y, 13, 13, 1, -7] - [ x+54, y, 8, 15, -3, -5] - [ x+63, y, 13, 13, -13, -7] - [ x+77, y, 16, 12, -15, -8] - [ x+94, y, 13, 13, -5, -10] + [ x, y, 8, 14, -3, -11] + [ x+9, y, 12, 12, -7, -7] + [ x+23, y, 12, 12, -4, -8] + [ x+35, y, 12, 12, 1, -7] + [ x+48, y, 8, 14, -3, -5] + [ x+57, y, 12, 12, -13, -7] + [ x+70, y, 12, 12, -15, -8] + [ x+83, y, 12, 12, -5, -7] } template template_train20px(x,y){ // Clone to 4view when changed diff --git a/src/trains/steam/FurnessCoppernob.pnml b/src/trains/steam/FurnessCoppernob.pnml index c660d4ef..3a92f905 100644 --- a/src/trains/steam/FurnessCoppernob.pnml +++ b/src/trains/steam/FurnessCoppernob.pnml @@ -3,24 +3,29 @@ spriteset(spriteset_Coppernob_Purchase, "gfx/Steam/FurnessCoppernob.png") { } spriteset(spriteset_Coppernob_FurnessRed, "gfx/Steam/FurnessCoppernob.png") { - template_train20px_anim(0, 13) + template_train20px(0, 13) } spriteset(spriteset_CoppernobT_FurnessRed, "gfx/Steam/FurnessCoppernob.png") { - template_train16px(0, 31) + template_train12px(0, 31) } -switch(FEAT_TRAINS,SELF, sw_CoppernobT,cargo_subtype){ +switch(FEAT_TRAINS,SELF, sw_CoppernobLoco,cargo_subtype){ + 0: spriteset_Coppernob_FurnessRed; +} + +switch(FEAT_TRAINS,SELF, sw_CoppernobTender,cargo_subtype){ 0: spriteset_CoppernobT_FurnessRed; } -switch(FEAT_TRAINS,SELF, sw_Coppernob,cargo_subtype){ - 0: spriteset_Coppernob_FurnessRed; +switch(FEAT_TRAINS, SELF, sw_Coppernob, position_in_articulated_veh){ + 0: sw_CoppernobLoco; + 1: sw_CoppernobTender; } -switch(FEAT_TRAINS, SELF, switch_coppernob_length, position_in_articulated_veh % 2) { - 1: return 5; - 2: return 4; +switch(FEAT_TRAINS, SELF, switch_coppernob_length, position_in_articulated_veh) { + 0: return 5; + 1: return 4; } switch (FEAT_TRAINS, SELF, switch_articulated_Coppernob, extra_callback_info1) {