From f9346f3e87232b7c9a1c92d55b51829e042a28c7 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Sat, 4 Apr 2026 20:50:00 -0400 Subject: [PATCH] Make a little crossed swords combat indicator show up. --- assets/animation.json | 2 +- assets/config.json | 5 +++++ assets/sprites/combat_active.png | Bin 0 -> 5619 bytes src/gui/fsm.cpp | 4 ++-- src/gui/main_ui.cpp | 8 ++++++++ src/gui/main_ui.hpp | 2 ++ 6 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 assets/sprites/combat_active.png diff --git a/assets/animation.json b/assets/animation.json index aa01bef..e09d5fd 100644 --- a/assets/animation.json +++ b/assets/animation.json @@ -72,7 +72,7 @@ "frame_height": 341 }, "sequences": { - "idle": {"frames": [0, 1, 2], "durations": [25, 5, 20] } + "idle": {"frames": [0, 1, 2], "durations": [10, 5, 15] } }, "transforms": { "basic": { diff --git a/assets/config.json b/assets/config.json index 0882342..e0ba13b 100644 --- a/assets/config.json +++ b/assets/config.json @@ -95,6 +95,11 @@ {"path": "assets/stories/win_story.png", "frame_width": 1280, "frame_height": 720 + }, + "combat_active": + {"path": "assets/sprites/combat_active.png", + "frame_width": 170, + "frame_height": 170 } }, "worldgen": { diff --git a/assets/sprites/combat_active.png b/assets/sprites/combat_active.png new file mode 100644 index 0000000000000000000000000000000000000000..cc72bd05a181ce05540c7779154274d1f6cc24f6 GIT binary patch literal 5619 zcmb7IXH?V8vj(I{5Y*75C@qNw5UC;}RgnAw1V};&y%!Ns=^{m{6cK>{p@Z})y@Mh( zfJlF7f=H7fO)zvWzW;ka+;8{J*=OgO+1Z)>uxIC-4cA7gF@iWj6ciMU073k}iEojbd`lkq-D+LA9=f9xrb}6tv zce1&u8n|IxY~4I9p4(7pTR1qoiJ(-myiy`!W^)popQP zpgvz06_*gD%=}NzzwtDg|H%`3&i@M4c^0aFBhfPV&e?zO5)&2uyK0pK>p-JU`Y9+_ z@&FYjte5GpG=>uH30%NLDUdw=XQ1!4^RHlP(N3L^;wj(li=C>$6nud>EQ0UiFBS#s z0Rq%4Am9p|CMORZf=<7Bbzvysbr?ektU54Ol4-RTf_joUQEDPXv-2Fy*%Uo+mgaN1 zJ?T0~NSjS-^06hK<(NrSHIX;^W#*1o`uho!=@!>Q|Nq13Lzfn#K;M|YnQxYcNZfw$ zv`gDb)kY^hCcB_yq<0Bt6-%xBN2O;v36>Ng5qCPgf=Innfw2tgkOAL`*%u720h85_ z3Dij+n5hBPFK0WEtmKz#41Q%3P0IswlhaL}cdD2Z-DAz_QB-{XxP|+sG3^%Z-$;4w z7_dKNI|IDAL}SH|rKc2A*gDN1tLJ;|e-HDaW8z+w+vyPyMj4N;9R7rOg>-m>U3N#l zEi72N9R2yF+q3g?XGaLyQ|5`#XjWXNuPlf^(nW71@~&2O^N>zRC!R;1M>6CYSD*Ye zKU)_E2ZhMGdiI+aHMeu>)fVO;sF7vJ6TN^-q^fli)EWO(ZZ_D71A_0>dTb_%SH%zV z9GkI^SjT3!!@|q0U_CZmK2bq=W||Uxaqx`l`lE zkByx9ltFLhPTaxlP3*$OwY0I~xvIr+yPxQIc3t~sd?)5KN||7{*ChN5`Dolt1d9Xj zbVNdW3W9s@%a^$muS>$MhxfQl7ZVc>qD|&xYZ9E+vXy5|uQ!t|=;PcUp!ipLfgc)0 zh(~*_adyMm@*DX8r0QETvCMRwCuTqCJPicx$9+!*u!zZd278l)oYXQL?LMw1CpgL! zY^s6c!N-M5xqi(hO%QpgSPiVek+<*n{UOthx|Cs#a~#rW?DMIC%#UWY0!^Oz#P&8H(*JszX&XIh&<*o(Xtj(Y4yG zPLvtuN{Qdj#AuH^n9|Ryp<=OikDz`O@4iN3z|X(NDBhsiq~B1fNspwZF>58xL=dIU z$`ROnq&YS2ZEtX2*&_wrhG@8hSh)Ex9R?IjMYAni?mebHqr65@%+$-B-y3`;Rr>1| zXl`*ZHAh>SrcHGLW}R#9TKPy*Cj`rM!5|tbdf(Am2@QW=BrByJt4uG{aX*IU+PmM8 z%`qg9y%I9F-r;p~SV^y|D|^&>Q9!dP>>^>VLDJ6(7tP7e?(3zcx^sl&AYE^mKO>S%!Ak*k=L^**X-CJA!U2Bt!kFx z1PkjWIpzJzjymK^DTeC-BU&|@avx^7XS>z*tN7t=PD|3rr$O^K3hUW-lnuNEixS1d z&-$k!-?}xvTQ|uPg>T%;T{V2P#I`o5-Ynt1SA^2;^k0^SnD$3$W1+;up&0>tqu4Lh zCUQ={o4}VBt(^>%xbaULSotDi#?*;JEzI#wg^nATx-ee&CJmwb_asYW>s2j;uy$cg z@hHoy{+Z~3xVBr7Tk}qqUP|5(-`H?>qy^iYjofBG%l|Bq+7mMwC?FERH_-(5E7n4T zTI$UjmVyM`s)CElU*4^u60L4PLvWJ?uTC1c4Y%8iq4l5LvkAH?EtCMkB^JO0whOC+ zs;Vu-*$ZK-N-yW*V_0nUM$4p6_!N-rnPps8u=YGk(gAeF zyrd$}3zh(>=lX2W9Bka(_PosWz4W~H_x_a}5fO|X>jGf!F(M4=Ad->?858ii>?t`a zKV{99G}iLr&$g6dFWh3OgHaoywIlxYud!Y<{Z&t4%Q-#q&O-a434$AgZqtZ zsqcFKeP8Y%}1@C{61|@{OaaPyMEFLw`qs9Ys zK}6ou)6gFX3lV6D_vBMDwUR9iTAb)MAFvXNV_DWiC)K_23@oiJfdfA_0~>$89}0+T zNMKnmrC@`cs#+SQmBcW6#FRK8K&GP&>{!Cs2u3D7-n@D=ededooz?RC5bEZ(XFne0 zP58itrefk@3Q{j!z7baBYHPW)yWa_@$v0bk4&{lTBqO-v_p3XkfqIJ<;@5G*yjDhc z8I#EE*NO)@xBS8#bt_YI4*g!bFel~g8N8~72xauqgJ3_s46=kJ5=vk{*Ccw)5=A)D z2VO|Dl{H(fh_HVz7yjKhA%hh^y-Twxuu8-3yjPyu4snWR{URQJ0k;PsU z>ad@p{nPkDSd7kuu&}VP_wMQtlvO-lk_J~@ruBGYqx-Y?W7?m^@)cIy(SzKw9_tIT z8}&gebXbDqM$--Xm-U_t9j<9n+e30EL$aI4u5F8=fZ9jU?I7-6*V)t3SYYnU&Mn{J z)l8s5oQKl!kl731Fc#NFALha>0cn?pk0J9SBG*1!_;{-DI{cak7s%=t`J(UG@q{ro zsx=!YrEjwxLzi3zrVgp7W|+$v;}&pLQZm%ToBX6{1L>vF!soLal!_35yjW7%}n z0FASarM^n{CLm%?tCtgeTslsJVZLiw_Vy4%sE$s}L85wi9bwzDbkAGcwMug%lZ}0BgEyCo?v6wZU1Dsqymho3l$NYjcU_Df$n`vpoaKex)@a@2f8qsF+P5 zfn;LdR7U?RVF3i^^Q@9cqs!NJeZ_R{uJDqO^yAR!2+4qqV7r@^#IuDuhKO7Sj=ja@ z+wApQ1gNgegQHyo4rK34PpGfQ*$a*zYNLsgwy3~ScRkjE9r+?o34`s%&s zUD-`km(?5GAq00 zkdF=s{&GSikBQd&x4P+Q6WLUxe$qa_{!e8nim8Kp@PzQbgUrqJV|(Bi90V}AUIxK7{0$F%e(ys z+^G&q>nli)la)@JHER1+<5$r(mt4fHDkQ&}n1D31#qXWeufNn~9zd~eMiq)*G-GH) zr4^G!Y_T^TUh6$7dX9EeM1SpHV^jHu^#t*&oVfcz#eG>3Kpa|zqhR?WWo{V-K1>RF z*Y~=!y9l~MdaJ`85+2{x`5!|q|8c=PwSQzl)1eHRQlb?AnHEFapK*Rbc4J$yklXF| zWj&mTVogJlxZxR3ZS=Tn8nu?C&kbL_fij)88m(b3yYtTOAMa(%e`cgYGXm8S0(!Ig zp6M%QRld$VI5w2V$d5)Mi3i#nmWne-J&y-ez>kE7d~uH_dv>FwovbcC-sGBLxc**f zvQvs|G-&AE-Fw=dc-io?h~g!j&1|E4OMZr5Bg1rG?~70&excaV0m<@b0#GgOe6t{R!?tu=(mKfA{sQb8_ZV zN;$0W$6{59Yj!p}ru5F=;pxLErzJUxpTa`S!pdh@eP;qQMSAj#cNPQafX~+>`?3Up zi6;_m2Lf$u(r|ZZ{TxF_CcZ7_`*vua#>B3zm@Zi{Ge9v# z1-hO4^194LZ9s3b?EEe2@!37O*2JAH9A zUar-_V@n*-F&ERUE;`i{AZ{xgajE! z5Ss10D>Am`G22Uhze}$Pc&Dqpt4yd=MkU<~$^+@W-MFw;`{~3?@Ii3I1m>Qy1AfQQ zVYz{E>ZnpPn=@lj?{E+fjNgUOkIE%DeUsq{i&jV|E*xYx$)I6lA5TG^khK(h7?>t3&9uc9&hvg5G59+q!v}00CtX92#KN85o*bA_7vt|??7wQM+3toPQ&rdA*XgB=XIg7)ecbgV3 zb<;jZ*i`VD@xmtL8{hV$@It!@2YqcltiMU)!dtRmbZLHV`UX<*hIrdBOjR2(;e= z?&lV?&yN>hJ1C#+Tm*Mvt<&~DVKD&wTAbUM7lPmW18pJOmx<{+fJQDfIj7))*29CA zaRc8Nr_G%wu8Up^?AGmH6$c8KnLW_ickk;LWzZ*cSh;6DX&7y6h6Mk%VCVg$g?LI< z+8-t9+KpMyk4B`|C&*Q}1krLoAY{g=kyb)epvN zc|9LGX2GSEhUnGbe}s0Q&v%lJ{K10v8zq5!wYh*ySauh?)-`I#7Vpw#qWQkLBS)RP z*h^Tch-N4kvuV>ZH*7__Mp0wfvd3fO%HCF9;z6zr`p4Cm2`6{ya~NInIS6`31uvi> zPa-mTj=w52P2jZ+K^K6lqmbJXt*wp`+F$M!zwk0Xx~yK!53hzl#xGCC7|rcbl7r=z zrIeY^l+!R9RiQ7kw-Y#`4ZmW{j(RqVfh~_(9t&wkMlcdry zB4sESXB#G@Iv7j8DJkl{AvGYcaL_xSIBwtc)_^gKD>!lLuwb@*tQ?d~qTO#?0-Sfb z3}q6hJVx3=@lTR)Moyej;ZMCyW{Ey@$48gEyp^+A0exoLsmfU0p7erOnVl{H6;w_q z^|JHMrCNlQ?sxR1B+OgNO^Vd5QooEFZlBq{JV=>_>z!H>hG?+k6Y5*dW5tkrmk*Hi zUG>A8DTEE