From 0b2cc6790e952aa2255f49a985ad8c8c46c11dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Tue, 22 Oct 2019 22:58:41 +0200
Subject: [PATCH] Update explosion sprite

---
 assets.h                    |  38 ++++++++++++++++++------------------
 assets/effect_explosion.png | Bin 981 -> 965 bytes
 main.c                      |  10 +++++++---
 settings.h                  |   2 +-
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/assets.h b/assets.h
index 508d28a..d7e2914 100644
--- a/assets.h
+++ b/assets.h
@@ -520,25 +520,25 @@ SFG_PROGRAM_MEMORY uint8_t SFG_monsterSprites[][SFG_TEXTURE_STORE_SIZE] =
 SFG_PROGRAM_MEMORY uint8_t SFG_effects[][SFG_TEXTURE_STORE_SIZE] =
 {
   { // 0, explostion
-175,103,95,183,191,7,111,255,31,254,173,87,15,102,23,190,0,0,0,0,0,0,0,0,16,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,1,16,0,0,16,0,0,0,0,0,0,0,0,0,16,0,1,17,0,1,16,0,0,1,16,
-0,17,0,0,0,17,0,17,17,16,17,0,0,1,17,0,0,17,17,16,0,1,18,34,50,17,17,0,1,17,17,
-0,0,1,23,17,17,187,34,35,241,33,16,1,17,33,16,0,0,1,23,113,18,43,33,19,65,17,16,
-17,18,49,16,0,0,1,17,115,146,34,17,115,65,17,17,17,51,17,0,0,0,0,17,19,57,42,17,
-35,102,17,19,114,52,16,0,0,0,0,17,34,58,161,23,42,194,35,34,34,68,16,0,0,1,16,1,
-34,35,33,18,157,194,50,35,51,65,17,17,0,0,17,18,34,18,19,217,38,85,109,212,68,
-34,17,0,0,0,0,18,33,17,51,54,120,85,102,51,68,18,32,0,0,0,1,34,23,34,51,68,133,
-85,86,51,65,50,35,16,0,1,17,18,33,68,54,72,85,85,86,99,67,18,33,17,16,17,17,19,
-54,104,181,85,85,85,85,91,134,67,51,19,51,0,17,18,33,20,54,104,85,85,88,225,102,
-99,35,51,48,0,0,17,33,19,36,69,85,85,88,22,98,41,35,48,0,0,0,0,19,51,52,88,83,
-70,88,102,119,50,32,0,0,0,0,17,17,51,51,69,35,68,136,102,114,34,17,0,0,0,1,16,1,
-18,52,66,116,68,104,129,18,34,17,16,0,0,0,0,17,114,51,55,68,68,54,102,114,35,16,
-17,0,0,0,1,17,115,19,51,52,65,19,145,18,147,48,0,0,0,0,1,17,33,44,50,51,67,34,
-169,51,35,49,0,0,0,0,17,18,34,49,50,35,202,34,42,35,114,51,0,0,0,1,17,50,49,17,
-17,51,146,34,34,17,23,35,16,0,0,1,19,49,17,17,17,57,34,33,177,17,19,35,16,0,0,
-17,17,17,16,1,1,19,17,1,16,1,19,50,48,0,0,17,17,0,0,17,1,19,17,0,16,0,17,17,49,
-0,0,0,0,0,0,16,0,17,16,0,17,0,0,17,17,0,0,0,0,0,0,0,0,17,16,0,1,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0
+175,183,174,15,103,111,191,7,31,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,48,0,0,0,
+0,0,0,0,0,0,0,0,3,3,3,3,19,3,0,0,0,0,0,0,0,0,0,48,48,16,51,49,19,48,48,0,0,0,0,
+0,0,0,3,3,1,1,19,17,131,51,49,0,0,0,0,1,16,0,0,48,50,34,20,85,120,49,17,64,0,0,
+0,0,65,1,0,0,34,17,69,87,117,17,33,16,0,0,0,0,4,16,16,4,18,17,21,87,85,18,33,16,
+0,0,0,1,9,34,34,17,34,17,21,85,85,66,17,48,0,0,0,65,18,34,34,17,65,22,85,86,68,
+65,19,51,0,0,48,17,34,34,33,18,65,68,70,68,68,102,67,51,0,1,19,49,34,34,33,18,
+36,132,100,70,97,20,81,17,51,48,17,18,34,18,18,34,33,119,85,86,97,33,81,51,48,3,
+51,18,33,17,34,33,37,119,85,100,97,18,35,51,0,48,49,34,18,34,33,102,87,119,117,
+97,17,34,34,16,48,1,17,18,33,17,22,104,119,119,117,81,18,18,33,67,0,1,65,18,33,
+20,71,119,119,119,119,132,65,18,34,64,48,0,69,81,17,86,69,88,119,119,133,81,17,
+18,34,147,0,0,56,21,69,86,70,103,119,119,116,17,18,34,34,144,0,3,51,56,86,102,
+102,120,118,101,120,81,34,34,35,0,0,48,51,17,85,102,102,103,70,102,136,85,34,34,
+17,0,0,3,49,19,53,84,102,100,70,102,88,133,84,66,17,19,0,48,51,51,85,68,102,68,
+102,102,101,97,33,68,19,17,48,3,3,49,81,36,84,17,70,101,82,33,18,33,67,51,0,0,
+51,49,17,33,33,33,70,102,66,34,34,34,17,51,48,0,3,17,18,34,33,34,20,129,18,34,
+34,34,34,51,0,0,49,17,34,33,17,17,33,65,34,34,17,18,34,19,48,0,1,18,33,17,17,17,
+34,34,33,145,17,18,34,19,48,0,1,17,17,19,49,49,18,17,49,19,49,18,34,35,51,0,0,
+17,51,51,17,49,18,19,3,19,51,17,17,36,3,0,3,51,51,48,48,3,17,16,48,17,3,51,17,
+16,0,0,3,48,3,3,0,0,16,19,0,0,0,51,51,0,0,0,51,0,0,0,0,0,1,3,48,0,51,51,48,0,0
   },
   { // 1, fireball
 175,103,183,7,191,111,254,31,95,180,173,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/assets/effect_explosion.png b/assets/effect_explosion.png
index 3556569673e3b44bdac888d256fc21f88ebe9970..57d9ac6819af5051631a769fae93453933d4b059 100644
GIT binary patch
delta 859
zcmV-h1El=b2gL`FQwSCmGA2iq2~Lq)D1R+UL_t(o!<|<xlIt)G{$6LnLc>BIp@%3a
z3|QcU6yyj2J;ENqpun&oM|fc2gNA{I0iEdr|4Fve?Y_)plBS9E>61Q5#tJ-MKCR`~
z-~KP0c-i>W7@5d3$@q&P{;a?QKONQr-o$%t<JBABFvR;{`frSh-_fhE?rQ)j2!Bn$
z0PyDl3I^(m3M_*Jd6thct(A`5kA`mpF!9Bfk-wrYrZ*%R2l!gX2n<XKW&1MF83us;
zL|C{O9-`*keO^!3knA?SMg_8r-1xo$re`3)!k^=J{-fS^z?<;MIWQq6*e9@DUFR|L
zrsRP`KsBl_ju~g(lMuX#42%FKhkxbT)7^!bc$z`zSq@jHlFbm%Jb0D^hv>P2W8naR
z{cR|KJMXhJfoBZ#ATs?-0dr&^938)6!21cZDo9=6InWf0rJ<h2Gn@g16&{8$z<_-@
zY&zK00a~?)VJYt6+&@!TJL9c-plzpuome`l6dM^<KsFgRP*@S*ps<#Zh<{1zO$|XO
zL&CsfOqE*#vYaZN>wSQR?P-`z$%6tUF(CpP0kj>?gP*1A-G;|H;qmW2Jl6Z#oy#5K
znZN7SOxMal%KAk@dKeIn28tA#E-&!D)y1G@i{<1*26l!1v9J9!;nZxO)|JqJ%fHpd
za5d;;OIyI&1b}4!K9}KUp?`36@G$T&jiI=B%n8eY<UA-!(EWT6LqM_;%EBL8iN&O9
zpKDlnnAnVthJdnoe{*sf*Syy3nDo5qj8IPs7&zuVz8nH9LXoCWfc_3uic{MS$;jo;
zRbsiysd*?RmQ}a|uXedHwVkjqKxc)KGLVdivt`Cx?`f@<8dau!8GnE1qGLM~k{k#h
zC{)t!*4A}86EIJ211mlqfTknvXm17pb&VA2iz~*n*UKo3SJH9Vt`}ugOHNk?vOLlY
zUFVy7&$bSU1u+-8UeHXv#mhsLU@Nc9SRZ5%?Qp{90g2Xj%GJDCm4!DpFHZr8WBH9p
zi}r4B<XzEc`ach^(n#<rgf%OnAIVOXV&1#??#9U5u4d;%!R&3Uw9Lk@cE+!6K&AKS
l_rKnp3iINB9oC|i{Wq%-&{yDc#~%Oy002ovPDHLkV1hd_sHy+}

delta 875
zcmV-x1C;#52h|6VQwS9iA_65VlFN}>D1SXkL_t(o!>yO0lA}NnhQFjDR*poRK(364
z$OA+~oEQ;-SaBkc5HXK{$Ri+5A`nPK9sm&$x#9#8i9}r0o)`v($-r*1H&v+w7`p%d
z`|s|_qJ<BhU4?{w&Ue=GA!l>f{{=uH=MDRwJp#mIe>uC+-fUC-49JOh#sGZzbbnti
zBqS3~pJ2$(z<#SguAzj%c>>(>doU&l7x*oI06<X=K#Vin(b3tTaL<yxZ08Qk3vU@3
z1Lno696R4{p(v?#5MC@NYY*Lt1KI&FTZXk#`o|_88#$CTI}fD>ut}kDzR92H0|^9&
zcWR|5RcFM>w;<9$Y>E>NkXQ|X4SzEpkuSY!Z{q%TaCjfmaO|So<cKqfY>hZODcb1g
ztUJ-V(L3TCYrqANDatHo>uLh1PLhz6iU@(eFV4`M^fv%u3L^DXSw15|yUrc8*L6!!
z7c?i6g0=@BXlZ!qfsEFdQZS`jBdP@WwWc~5`qEwp+PMZHA_*!U(sq@z9e?pY1&LE`
z2i+6u>{aU_+tU0E5qL^2in`}&VBsnU9k^w>&pQA%DvxkV1>x^K?b}NivB&vY({Iw_
zrlMAgAdc^VEZRbTxV3zXApFtk5lNUuUHwn@b(4R0i7cg#ZkoL#6AaiDkc{(R?I4Uy
z+S5q@b~ONqi-cQFsbFh>AAdiqf(Z~NEk=ML=>!Wo4JqN->I3%5?yJCGhQ1bimDE35
z+P8t~kd%hp1Ed4t&X7-M!PM-w429=h8#h!}ATB8l`eTc(v?Dgn%_+sD*ZDplkecqd
z$$5DzMnK3a_>)rYEYV#wh@f~U!~!AI*ly=<HFEAdcB#1U1#X$ajeo`fT5bEYM7Yx9
zI*4NeGef@Iid{CWk=nQ5PT{>MBOu$3fR4uST23BF=8xsw<ZDvxTtu>W&RUMjj#!Q7
zM)s<;qvF{!;%YMb1lTZ+x@Sbf6~qk$Id!H87?0#&<IEBRa4o-3hNd0Q9kC3>zEX3~
zfo6|wvrC1)5lx+P%~*BZMPfTq9x)g49*ENq<~88X@4X``&vd&3tGa#bZYny*^VMV@
z_zajGo$@@J3S?G<bB-VR7yN*o#kc;R$4>N5tbdDgnV2?6K!gAQ002ovPDHLkV1iYY
Boe}^5

diff --git a/main.c b/main.c
index 26745f7..f5450dc 100755
--- a/main.c
+++ b/main.c
@@ -2263,9 +2263,13 @@ void SFG_draw()
       {
         // grow the explosion sprite as an animation
         spriteSize =
-          (SFG_GAME_RESOLUTION_Y *
-          (SFG_EXPLOSION_DURATION_DOUBLE_FRAMES - proj->doubleFramesToLive)) / 
-          SFG_EXPLOSION_DURATION_DOUBLE_FRAMES;
+          (
+            SFG_GAME_RESOLUTION_Y *
+            RCL_sinInt(          
+              ((SFG_EXPLOSION_DURATION_DOUBLE_FRAMES -
+               proj->doubleFramesToLive) * RCL_UNITS_PER_SQUARE / 4)
+               / SFG_EXPLOSION_DURATION_DOUBLE_FRAMES) 
+          ) / RCL_UNITS_PER_SQUARE;
       }
 
       if (p.depth > 0)
diff --git a/settings.h b/settings.h
index 2c65140..e07d55a 100644
--- a/settings.h
+++ b/settings.h
@@ -128,7 +128,7 @@
 /**
   Duration in ms of the explosion animation.
 */
-#define SFG_EXPLOSION_DURATION 100
+#define SFG_EXPLOSION_DURATION 120
 
 /**
   Specifies how quick some sprite animations are, in frames per second.