From 917c3c7fc23ae7b88e3f866eb4a9f0861345eefd Mon Sep 17 00:00:00 2001 From: mc776 <24984517+mc776@users.noreply.github.com> Date: Mon, 16 Jun 2025 15:04:01 -0700 Subject: [PATCH] sprites: simplify FCAN. (#1516) * sprites: simplify FCAN. (also update the flame, apparently) When the current fire can sprite was first introduced it came with a small, straight blue flame, in keeping with the appearance of a pressurized canister full of flammable gas: https://github.com/freedoom/attic/blob/master/sprites/raymoohawk/old-fcan/fcana0.png It made perfect sense internally, but broke a lot of maps that used this actor (including FD's own Map16) as a generic rough yellow flame effect. This was amended so that the flame's shape looked more like the slanted id one, but stayed blue: https://github.com/freedoom/attic/blob/master/sprites/raymoohawk/newer-fcan/fcana0.png Eventually it was decided we could differentiate from id enough by doing the exact opposite - keeping the colour but changing the shape, resulting in the current yellow flames going up. Unfortunately by this point it was clear that the pressurized canister had long stopped making sense, but I'd already done the flickering lighting animation effects on it and didn't feel like making any changes. This bugged me for years until today I decided to splice together something from the nukage barrel's bands and here we are. * sprites: update new FCAN offsets. The new flames don't throw particles quite as far up. --- buildcfg.txt | 6 +++--- sprites/fcana0.png | Bin 1234 -> 1021 bytes sprites/fcanb0.png | Bin 1221 -> 1015 bytes sprites/fcanc0.png | Bin 1244 -> 1012 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildcfg.txt b/buildcfg.txt index efad9f08..c7097ecf 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -2465,9 +2465,9 @@ COL4A0 18 40 COL5A0 18 53 COL5B0 18 53 COL6A0 18 49 -FCANA0 12 62 -FCANB0 12 62 -FCANC0 12 62 +FCANA0 12 57 +FCANB0 12 57 +FCANC0 12 57 FSKUA0 17 47 FSKUB0 17 47 FSKUC0 17 47 diff --git a/sprites/fcana0.png b/sprites/fcana0.png index 70015e27a2e243473b2c4074fd1adaa70f3ba953..6d60474113dad30882be4f3e469d04732ea8a270 100644 GIT binary patch literal 1021 zcmV3ce7&z_tlh4Vba{>^+d^Udsrra9od{oJJHJ->Gc z^!qxWqz`e5@%JyE5)K4njO&A(0r30RBCUVSdk+4KTOo6BRAf{xNr1CF32&oR5L(bleh*%|Ss+Q*~O4qgBLEnN39*t?&Hf!Cc3N(Vbr z5-&#=yz8KJGRS?5co=v+nnkY;$H&L%JEQM_b3kesSX97L zS|vUrCVIxrx60@8jve-9&?%~^l@Ut|GM~@ec}a^IFz>Y^-cSVK>gp;jm&>$Ttjb~fCv&nBQ;VdCDDma#R9jPOeT2}qel@S zZrjbxP5T7=M_xLu%j@K6qu@g=8NuzMSesa@S{v>KZjXNmc)W?D z;Buys?N|Ospo8*e>Oi{0@kb*U(}L=N%fj1%#DDU6VtHHG=k4)Q2`HA)x2Z%YG2$3) zZLb2l5jQ-nJz(~{Qc@CM!id+zA_`JQ9)Cp2e}tm*%Inyt1x0^}d{atcKfZ`nTFO?e rIV)SUq+mdLUyt*Wl1NR-c?tRlmqS0)TGKzx00000NkvXXu0mjfFyz@L delta 1229 zcmV;;1Ty>m2hs^OiBL{Q4GJ0x0000DNk~Le0000P0000#2nGNE02Lf#NB{r;2xoFZ zVgLXD3;+NCK87uw%#k4%e*|zzL_t(o!|j)?R-{J|hQ}cgD-Z}o1OgF(L?96e1R`Pt zA_B2u1OkDGh(N610uU>Z2*k>W2t))T7Z8ES1?)w1@_gi(^G;2F!(_vXoU?OIpZ=?= zx9Y9x?r$cOH~L+EKWUS1zc>A@!|8{kjrRXY-a4MXxg%o+)0zJSf4VBFk7rx$%_8g> zW9`#V-?gt=eE|ISasTV&Mfw1!k*rPCD#6UpAHN=T>00Xy_4u!QI6@>COs5!E{k5X& z7kb{fTSqL|2pA%u2BIo$Q0Dov2Z-q{ng6L9cQ81Y(RHGPNKUqESc>vWhfj zJ~W(BDQD{*&@s=GcR-A!QkCl&S(mO<)~Mjpq)gJ5Ksg`HOLCu-^gwDM)X2IZa$c#h zC%PJmYZ;kssmkOrt0qgeRv5-<8BqmY$crboMp8Yj)YbJ0f4Xq;v(D=|un1J{<*66x zQsR9lG?d)yp+MPs;8x{m3A0g+IZvS8TCR^?`{tz@=>cR*0O!7*3jjMiJ8gG&cW7H% zTaEeN-d@|^-yhn+!9hDbJZvW?Cv7^Nw&UaDVa~cT$fJk8HfRe#byMI36ENrOBbR#G zTB3_Z?=TcieBt!Ks59(zuB;F^3n4Uj)IIuAYHVhqoet_(v=Y{fmFj7Iz2sY zXJ=<^Hk-AptE+Z>ecf(vZwHU>?(W*n&CRfm46^2_0(PV6C4MaF$c-ib)sKi;C3q!R zdaSo8`>J7-HJaQ)A7kiY{_yZH%vrCwOgl>;a4W|se@lm6LPtizJR?9Jy|l9cKyoQP zdU!`TsSqFyB#=>{hdy?=qUh%l__k*ho_;;VI5a&zJ`O!|WsyTZqw&lQ5xJQyuNcZR z0XTpO#J(V7w&qEf8bi-qm}J(WKx!;?Ws~CW-DS;tCVI+v#=1pOok7p?UIN(M+?;PP zMvw%0e-CaKRt8S)e%4) z>|uB53C@!(4JZ)FFUOPi`*fqVpLd3yIqU2zn>RuC?}HxG6Z*x)#rzX#xcYzG92zt^ z_G*VdY`_E$s>n+ z>a)KDQqM_Vet963%P*U}MDv_1fOtJ1Ky#e*X&6HlQ0J5Qp6w?^zuzSYtPTm?dj=hehd5l=oI?c@%dmpVUatZi6QEhH0FDf z0IaK%5wM0m>|%eQ%-c1e+xq3=+2N}9OuVKu2dE!+`6lEUNU&;LxvJm&V#&l=!mf=u r;a<|#y;8=&DuCeml2+NCy}tm!zX#!04~d)B00000NkvXXu0mjfFbGr> diff --git a/sprites/fcanb0.png b/sprites/fcanb0.png index 247cdfdd25d23032d54e7d84644879456841f320..021c3887c91d29a10ac4f82dc0aa167cc6339d47 100644 GIT binary patch literal 1015 zcmVLA6~%r59+<=Cfc23=mQ)?dIDE0SyjcrMlkke*ewELH-v`WM`v z#5aMvv@Ci9tj&6Rd%NuH?3Br5(f}_8S!PWDaKOZB02W-_-Q6wI>9pG3-d@??-!F%U zhvoSAxEvfD)H&v0^ZNh zyndH={P4Gm749vs%~)!%*=)8Px71hxv<@)-%uCvcx;NQvmt)`mgy2fTxJ91>RwAdUrQVHYx`};a4Tjs2%?DP|7 z2~0MW2OUts2C}n>tYfFAr^~U;wF>;C6TBKgt}!<9fsHpeH7ksht*y06AyaLgV!&fOV!#JXkOWO?q)tjQh(W~ycQhW4>majdBS4(C zv$L~ud3jka|LtI%9}1G5ldMrO^gg3r=l=@#rtdZSpk*zEK^E&CynxM z<}GjqH`AmCN9H)oJE~yLdN$PF^@0m(1&q^)Lt`Utm@08z719Sz1LQ8R0l`&{RJpEv zO>Pi4mS@0A&3nX5ZR}w1%w8welHjUkE%7?{ZKwe_EZiO3FL|$U#WLp`=AjZ$EVEyhl0h=#%(ic>2lUxo z@MGTvrslPllDr8MZ delta 1216 zcmV;x1V8)t2gM0BiBL{Q4GJ0x0000DNk~Le0000P0000#2nGNE02Lf#NB{r;2xoFZ zVgLXD3;+NCK87uw%#k4%e*|MmL_t(o!_}9qRvlRoh1($z5eNh#0)dD?B9K=g5QvB? z5D|!oD-a08h!Kbg9sm)6L?9v%BSs)15P5)zh>?gq#F>0ezFzyD?t7agFtgHYopt`I zYFF*5bGo}}e&RWK)s*J9e4gF&caxRhl$!tTk+LVv%_3ufJ$n(ne?MF+|49iG&4)i; zmS@R{Q4B@%%VnMbJRje0KW!0U2mlR26CkWTS;fhJQpG&!`Dv`m*OJmlJ@pyD%Ti7{qk`1Y)wx<4h4f^iS)(}z zSgMS|{ZZe8a*dgk-13YHE`x9qgo1(6_n!y)%&Co*^FvwPLk`Io;nICt*dUd zx)MM`Lx3q~Zagoex9(7a1+q`iYrv&cdFay9P(Fy7kQD%;!JZQI$|DZ9J7 zWq*IaOsCVbx3|~MSyu*m^w764r_BM?n*t}GpgCtBxzy8Ek17_eE)=B!qovFW4^a>i z{lhbB_stu6f1a6zAd4c9GTLM^>Bco>8Bq_UHjJTzgM)H-cvxn$Svfm9E2pQYZGUlb zQEqN-%H`!{IX^#d*O4<x3{kNQbrqZBMX*4vaFHH@-GlUwLxe0_c0 z&Y_4o>vb;EP7efLrfyymb$V@@!;LXf@R8C7*fVF)-8(K8T2gg9>D7AYPZ1{K@#X$z$gZw z=j!UJe?95YCxY8*R^=b@r9bn_%!?Qjh5g{rLE}dzH3V|C`meL6c)&3DAc;dTD1V z2!?0^VGPfyC?cU}&bk0cM@OyBqd^E81r$lPe;`l+2)!We3t(OrfULJ1TH6@OocNCU z=k1H~_4q~GGdIb~TA{RuoUG4R*Xxy)x$5w}VM(%2#ZX=J%q@B3kWYQ~dm!~W$;&Sf zq;mOnlb2|olQ|Ht2Lx!2lRgb&s0P%z+D3QkhlB;tTkGFjz~1vDXzHfjhL@0kNsPTY zf4vkj=q>#4xjHL%cX!=&@B2rm(8rG7!;Bji{n{`@y^_X!pCkb5>SP40VGq05Zz=P3 ztv@yM%f++9RqvS?)9C=}kGp&)T#x_&002ovPDHLk0$_r?a6#Ar diff --git a/sprites/fcanc0.png b/sprites/fcanc0.png index f2a4d54688d7c68b6f50994e692f6798d33ba0c5..8f8f252c6838b782a3d5dd81ddfb5606365de645 100644 GIT binary patch literal 1012 zcmV&fB9M`Y3Iw78i9kjm5Xgu~WCQ|%s6Zep zkO)KtAAqPpR`w$z`T>Z3#B}YUJDf~j$O|jHwJvXF-psjY&OI|>Fxc|B`Z_3sT|PSp z?30B4_wjHyi3Jk$$8=PFe*04B?__t$)Fks?C^y|vit zM5;H7TCLjz7ExJxUtS(*EtbV?YoSXZ)JuQ8-4-@kcO}_6fyK=oD2WO35cN*5E=g<2 z4*_=-T8ox4@4O03(A$~k12L~O%^PcgV0N~MRRI$LU2^h%W!{Om!IXXJ3aeRDSPEJnB+1Xi{ zOeW>@^tARFcMkJeC&q$39VBrV?j#eKB>Q}qr2)0DYL=@TbT2HeP;E$ zdb5u8vR^8w+iDpr2{9gz7wuLOcR+i^+hk)R0MqHT%x1H4eSKYSZ*R-P!$Wy~elCxX zkLB*}u8uS3{QSJWtpV#-SnHZy6m#K{1ZIJVK1-nLp4-erlQOD%+=NTO6z$t**17Ms8$8*&NVg<-URLjdud`%=>!Pep)~d^fTY>BGPXW)9xDi~uv8tON8l9Pne; z1*YeXR+7946K{}36r^RIKO*fvLYchdc3hQ(iT)CKr?kO%-iV#Dv{vj&)>^ZbU`?z% iE1I{Gq%^JOE$Bb_Fq0000BU!supWg4Uf1jk){Qc=x`S8mR z>m>rTwFqlmUyG~Ix&>s7_OIfju&$xk682nAl2=)#_UW1=(hAqV*^1PPv4HM<{x~Ye zh4oj}NiPNh2?`N&h`uQ{9PZVD)?_@s{4t&*UO7I!18S?4fa|hcU)iFbe*x42U8TFy zx>qMcTGVEgu5#Tye_g$DB4n)?E8PSMO>p*|r(!Evl0^rI1Z@iI!i>pE7inq*?O5h3Y|p%^ZZ1KzC^k<4l0os=4dD%@#q@0*NwCD%4uFuoiTaW@||cEU3yj z&!ic8kCB>Z!Ld$EXj+s>kXAEanz9M1hS_I4XeLA60$HHle@ahZ3!WOM%hIy;F3UJ| zgwy#DS9j-&+!==AioOeT|Zd3jl`uCB_>%}sfDcqq5Gx8?f!x~_BP;fF)m_G&z$u(f0l_eM}lAVGs3tcwZt813G=jo z^Ttw~83F=K>e1tK4yP+5NPr~L3gnOnhg*YwYJm?jA-_vP{NvG&Y8YlXMg zpm?>&&1|emLW)X2@jX93*TR#CeMuH!&D>pSdd9*avyKaNjj8V0bg`Io*=3qi4?STt zW8I`^f0aSb^qwQw+}xaQFyrU;Nv(CO}^Cswi*{d-< zru$Ln75@3>&DwC2W3P73o}Zsrxx`sY0uT*Bf8Q50C!?^0o;m9hoSmIjnUzT}8vz6f zwj{U$5_(D4m%z9zAla@yG`9iCnE1y0`Swlua{i|F%nh<<%~0A)OtxpU>!*#4ne6cG zFeTY1W5_Og=B7O7IG^(D&ylosl9yi=q~|Qe_7crHnIZ9d-~i2Wx=&z$T0)g;F{V}D ze>*IJ+M55~0`}IEq$!)Y1CNmZO&EJ~dMN_vE&TF5JgJ{R-om~=Dup~a{(WFPu;|x@ zCaRTg%=hH!>1pOYQ6?>54LoqcuP*a;&F8lLaaB^d$xI2_kGp&mvIdf@1@~Ml z-~D3Az?s6XEmFe0bX)gISwz+nNS-fg8GE*e_ZO3u%!cwYjwb*B002ovPDHLkV1fet BUeEvl