From 53d4281eb8fb78042298fb81b4cfda15b6445b41 Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Tue, 28 Dec 2021 21:01:20 +0100
Subject: [PATCH] improve HUD

---
 assets-cg/hud.png        | Bin 1371 -> 1316 bytes
 assets-cg/hud_life.png   | Bin 311 -> 315 bytes
 assets-cg/skillicons.png | Bin 555 -> 588 bytes
 src/render.c             |  21 ++++++++++++++-------
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/assets-cg/hud.png b/assets-cg/hud.png
index 177c380112cc7bbb4a6abdcfd3b16140bb1a47ca..8cfaaae7d2e7afd7ec3eef9500e6ba09fac72aa0 100644
GIT binary patch
delta 1284
zcmV+f1^fEj3Zx2<Fn<KzNkl<Zc%1E=v2GMG5QZm+20B7<L87DK$TJY7AaB3}q&lJ?
zk%9sWN(v|_h(rWe<pFpDC=m2?$)$iUQUEDOiG+}j0!?t7-COT^Y|mu>ue!Uv_58lE
z{ja^gT_6C!2`j5>Gxz<+5APOAX#qeR=nMeRf1~*R{oAR}2Y-VlB7$)MKm@}8J*Ubj
z*d(exgK>a9Q?&6vdT?*n{4E)tZ@&?*EA)qxLVpbNjKW8&aahkE^oOIR|6D9B;OqW=
z@)$R6-AYzA^f!}Ie_KLl6fW*@{tlN@+BmG|5Bi(Y)PIT_1`*NQ_n(q=y1RF7C%+1S
z{(5rg521@uFn@ept8rM*AN1FwrT;K03<H2v#2AH-cH;mbHAM|0$8;`b9O%~-$7f}A
zZ6;w9K264v%QUR#5Bhb*3E@J?;JMc3QpJIOU2*Cd43=mxSUNSZOTguE`MI&4Kj_yL
zCxoJg0RRBN4n+;a`jig(b;ao$*7FDby5fX@B`JmF=6{M~U4P%Po<Hc<6(<DT^j27I
zt~l29OER4v&pp1lcr}xfaIEJK`gO$#0o!UpZ)q}#y6<W<4*+ri!vMXbjZw@yAI1Ut
z1`GrAhFGJhE3d?sS^!FbZMC2mNdEsKXW0N~0)_$3Jvjz+m<H$rFbr_6kzR(<5(|J5
zz%T#+0DlAl!vFvP5QNw+snNz(>*uylzkHSo-$)mIO+bG*DfBmSa8TwCPr2%9J%7+2
zj)ea4>zC0_Q5M}++qQ%L{&qyyuV0gtP|4xp5&ifhKX^cY7^(DYC6`fI&mZ)MA))`~
zO_|4wh%HH#x|#z305Bh^@mXYsG1}Og9USb_WPh^P>bx6QE=z<DqOG<Npg)`x`kNRI
zmx<`?KeMHFGu4%stFG4b2mRs1>K_i5X|%C5i(QryU6N}3sD#-sIy^j*lyC+vKgnYp
zpudr%`U7Com`wJ>jHBv&j^iFrj`jROe<P*)kB^99U^xnCWHQ-18OSA!qsb_^d@Y?D
z0Dl*WaXR`Q2H(9evE%?i6O+l_skS*BE}vSenof^taq;ThL7tEE_x*CJ;sBrtZkw^Y
zt)jPCt*oxih`K!*;mYh+Z1`Y)E?g2X6Z*qRp+5wF_E0q=VCqbxX-46ab9P}pf6yO}
zgnoWV=Eo23I*<E!S}i!&_{&H<z_(qh(tl(W0F)wXhQYIouIsjKZaVIacTZk#j@D^s
zyi1#-_2BbUbm&n1RoeM=D9|rMn;A#Q@sjoGnm_lm&>U)PfBZfKE&3na9}yAJ_Ny@w
z<<&o(9-p-5uCol08Ah&7(`JCuhO6D}v{ve5T|W~#<M7dB6kTxh#CdZEGVS>7%zs+D
zW1}GYXBH*&OSIXdOHyqsuruDJCyyU?K3|$P@qO)2pS_^X(R$H3Sl1szlW{PbjUpz0
zUCNLqMt@y>a?(cs_N%cv{axt1OUhl2%7wM73Kv(q#lg1f3eVCNY90O#Dc<em?|N$5
zNu?b>f7Wv6&u}+K>-6;5i-L;UQGL~aO6cb{&Et1lqGuR6JCWrM>ucu@Yvn4#)z1yx
zn(57>?mrplt$svj?_*fN)$iVav63JE_vdB7-1=kVb-w8xvz@jJykEZVy=JPkGZyMl
ur{98hP~TUq^dal*uj+R$`P;{Aul)-Ut9lChYXtNF0000<MNUMnLSTZAAA_R+

delta 1340
zcmV-C1;hHJ3fl^hFn<LVNkl<Zc%1E=KWG#|6vkgfD?ubt)JCwoGYA&eAx%KA4n)$2
z6v7qhj*x$Z>ns8mVjm2o76cm+ON)TSy-v_VgXR#$O7Seh+nsE7?{;_I?7rFke$CzO
z?Y#ST-pqVAb9*yE0DzF0*}0+l`pxTC6IE#eKpW@`08nHUM}J3OPaVH@?K%;`H~=7m
zVSt8{WE5-?NylIupvj=|gGMsSDB{3405}1S9yE%qGYS*TH~=^SjU6<CB1RDh#sQiR
z8ab#n5=IdR#sQj&ipKr$!TsU*vx@Qj#Y^#Pgx&}jdZn0|of}FTMVvI_&}JIG<sW(@
zwDqs^RSRH#9Djckk9m3Os(4HWdfn=kMA|4Aj^`@AB);VzdUf_M6^6l;{qExzv6%O6
z-EfjbBIqS@s~5=PTmGR}Z~szZ7?-E6hLzK5-ytHRe(*kgo(1##e(*kw>jLO?s~5=P
zTmGR}Z~szZ7;(7rxZ<+F=jTb16wnKN!ngcGuO3twhJQKrvZ=Iql3Y(giJ-SG3<k#|
z-=CbEDoKevzU3c!&&Jh)3d4v`>GC);!)46!Wlce$*H6ZoMB2H&nTK!rhhDw?ONC*S
z;rxi}Ph8jJF^W;;eK8K-@{hP~<JzFYFaRh6Tcb#em$nBL0CnSB)dB!01DF4i(ER@k
z03?B7fPdOk#()mf08Idf0cwr(GL)9j0-y?D7ytkOG6BN?0058)vAd*}mOF)aZ2Wxi
zR!YVhY;>goy%8?-O409ssN{3C)roKUhu#QDz0aQRSnqr*dRuML4th~iL<|>$2J}W$
zH7ILFTb=lpf9Q>n(%Wj?7KtOaBxQ49e}Da!l7E4?HHZsj@h$&|D<4<NctmCxOUs>M
zzyE=P;IL5nyH_rS&y#j-%tBh3qMAkly%8?-O3`jl6Vcg!W=q}8lon50o%oi2=#7xl
z+ip+O(sE~LyDTNTBvpK?gg>F1+U(kB?h?uI+-%<fy>9i&!KM)ehhoN&RGvS_d|wZ~
z<$oV~we~L&!;oGVEK=!JZVe2*IthZqa3Gg3j&Vl8@wIjGIKJf{dS#Fpr>%cAH<zP|
zc9fgv{tyw-!S|oGazc2T`03vTv6u|>y45QQ5AI0=J2TEWvKobXt|olTKlIA$9Sn}C
z-JYga>$cV1Qr3nsGdnjVvfCPgE8GPx8-Iukpw|s~j3ce=sPY<(g7Gc?&>JDCmp93L
z^ZHfcaUZ+Yf=0jtIuG!9m#Ta;3IL?Bnqlzl!gk#@%Np|9W-olcwce$*%^q#7cgL1<
z(V@rbP14HG$Dv6tzaE9J17?;P$Ef#xy6(LBH;+}3f8W|`9=*No4I(1yuAV%WsehN3
zrHG2pGDKz=Wp$n`1FjZKt!5|GdJS>Cnzc$0pK+{h_Go`^H+&=_nqOEXBBK4hT`!Fy
z4`!}8_vS#Sjik1zxxKPc5M?(DX(ZaNiY2M67qYh5qbEC$bC;7Q%jd?mKI*K{lby$v
zXfC3c2MqIA9T`_Q`+K`Izp&_aJ%1F*KbwUQ?bZB3Rz;q&=<Tj<)S`bC{-?LO990&Y
zzd^(?wLa>soO;wqTyNcH7)kJqA_xw{c0Iqa*ob;Cud%niaq1hfM&dIf?d?^|44&IH
zkKcJI{2PYE-BEcM431AZdHl5|lC&}!HK*y-sMQrb1LQ|Owzb}^eLbZ0B{i*m%(wQM
yRF75Gt<Bw1-WUb|F5wPrc4VysCIB|r7{-4{UHDghi<GGV0000<MNUMnLSTYW{g$l&

diff --git a/assets-cg/hud_life.png b/assets-cg/hud_life.png
index 7c2106b1b46f0d9393946454260bbec7d3f3dd9e..c1087a5e12559479c3dcc3fede056453a383bee5 100644
GIT binary patch
delta 275
zcmV+u0qp*_0=oi`F@N<*L_t(YiS5=g4uUWg2H?M>i3iY4i5sIQaPbaqCLYej%{#bw
z0yo(RxXI|?gj2~A%WI!4i~4V+ukTA6AXO0NwB9y!ygclbWW9GWg+}QZ0PrYlG3+d|
zLET8;-bvSvXe2v+dnkcEf!jd{B!N{-$OqO#KqjUi?Vm&yJb&{2p!O{+@{*mOXK6U-
zLi%bs+zLt{ZoLiGw!&C3{W9_oZeN=FrHYEt(B8?=SQkxVA0w9{FMr^}|AWz^0pMEQ
z007h31aur4Tfg>-v0tnjt}qnZoR8`Si~)0yN$)jL0{cKtkb}GNfxJNumOx_A21_85
ZC!-0T0TbUjgA4!w002ovPDHLkV1ns-epvtj

delta 271
zcmV+q0r3920=EK?F@Nz%L_t(YiS5=g4uUWg2H?M>lbgmt;^+;yf}4q($8<As^9tO+
zk>FrpBW^gAJZpLFvt?2Lt@QPMX#=DR!koAJo{o2ylaj0tE~d~T&jA2UU5jCFkqfdT
zfk!8OJED>7`0b$t`UD;ZF^~jSDWMQpPXU>jezbp<R0zoTgMT`-uxl%Jel}mngFa-e
zmcyN(1mf1aVC^bQ71NLYgNK*q(X>f18rnOX8ne+X^)Yhk+Uf^B{6CmH8UXIMD*#}*
z+JKH@<LWnDF^)yibA_?cp)A!4m;&Y?lhJFU1P+0`AP3tCfr3E}mOx_A1xp~4C$RgU
VLfLsXCIA2c00>D%PDHLkV1kq+eoX)X

diff --git a/assets-cg/skillicons.png b/assets-cg/skillicons.png
index 74c71c324667e338262baa988f254033fa6cd70f..f6aa9c163174a0bc4a2d36b2b5234cc10258abc4 100644
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq004>r000*V1^@s6)PL9c00001b5ch_0Itp)
z=>Px%21!IgRA_<iT0xG3Fbo_czEBnQ1-pm+|3i9cU$A1ekI0@}McxDw$00N@Csc@S
z;>kFqrpxu_@P_#P`KHz}90?-;e0+WZ0G^Ng>skYU{PS@K08G;a0GQ|bb*+Ivex7Hw
zofA5Ye8EZP1Z%+KCD}O1B?;#7C1g9H#{iToi4RFO%jD*e%{jM8Nv-9_d8lDO7j(Ja
zT&a>s`1VSbM1t+b_9#5DL{xnb<0sM5Ux*xAyw4Jbmd@W9GMRf>`L!^vKk{Cvx$-0#
zd|$Fmv{rx^VuW6cw=1G-Rdz!5`L{hPOG->@bJtDj@h78ZvernrM<t;EV$a6rt{X)m
zBC4q<x#V-sxjm3ZvuHxGcS97Q-fGSzAd_|vWRd>0YTFf27?zvL(lWLOvRIVjZuTe)
z>(AEGB)29B$50wamx{6kjoRdvk}VJYQsS_{p@<Svn_RM_`qGjl=0j7$V$ZL=M`&Dk
zrANNx+WCg&Yo_G>(zqou_^PJ0oiaY=ze`1_E%~9+QX=!IYT=VU=N(hxJk-f-Z7dzx
z%loB%YW*FcwRISx#P%54iL*>*=&&$kujMA0xD`@%rfCqfVbPf;ZD?B|tyik`ImuE9
zYxxy50RNkfN+6q{Ec;O`nxInt@5r@hVaK-@gQcHbyh=~3jWGwY@fK~2XB%W&(AkB5
aA_aeH1erRtPQrKq0000<MNUMnLSTYHWEWTf

literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq0043T000vR1^@s6Om$g;00001b5ch_0Itp)
z=>Px$<w-<ARA_<iS~+gRKn$D}^aaC!E2ndc{Qn^??9QqJ1bM`!qChZvkb7A&JdFj3
zq$m!_z3dLhlg9?}`}6Id?Zcih1Hk3;3jlDxUDs<3xcvQg1pu7S9{_-5d92qOaQS6<
zMCH8q-Z|Ht<W_dQ_iJJF@H2*)E{GH&L<5qS<P#|=LL^8&Mm`0o7m4&+W1o}Q!kz^a
zV6Q|DNxrobIjrQjKq&Y_9cTo1IG((<5+%5PEg7WWbBvT^@v2EZv)Z-l=WM0y&7qrH
zL$9_PvPbuxQJI=|#$qw`a;g>h$F&S@E-6M%RQNk3VzM$8o3BXcoNHN;)?^qpVJS&c
z?%U>x1lm=HH6bX8Mvy7(TZ!ETk%XExT5Ve%L1vAQn;#<ywabKB5=OMw+_;#+t|~GG
zO|@EEWzS8B(0gj|5=2^dRQTjc11*U$o0_DFJ<s{c^>))*<;UjMd$}OgKId|p#L=!1
zIa0FneY>j2)-5j7IxW?zZP7gGQt}!<q6tICSn?D@gP4xy6hlJlXt(H6fwzo<Rz1>9
zEgM45dX2Xe@PFgm0=eN{v)5X(;ht(~CHj^?huUUnS7yXobZxD%BdHW(^0_0a5Nb|M
t<OIeVFw!pxbZ)FJ@uvjt{SSfHz#oXBp)Kkq)zkn0002ovPDHLkV1m@40C)fZ

diff --git a/src/render.c b/src/render.c
index 50637d4..4a0ded0 100644
--- a/src/render.c
+++ b/src/render.c
@@ -307,6 +307,9 @@ void render_game(game_t const *g, bool show_hitboxes)
 
     /* Render skill icons */
     extern bopti_image_t img_skillicons;
+    static const int skill_size = 23;
+    static const int skill_box_size = 27;
+
     for(int i = 0; i < 6; i++) {
         /* Activity and cooldown */
         fixed_t cooldown_total=0, cooldown_remaining=0;
@@ -319,17 +322,21 @@ void render_game(game_t const *g, bool show_hitboxes)
             cooldown_remaining = player_f->actions_cooldown[i-1];
         }
 
-        int x = 33 + 44*i + 84*(i>=3);
-        int y = DHEIGHT - 29;
+        int x = 31 + 48*i + 64*(i>=3);
+        int y = DHEIGHT - 33;
         int bg = (cooldown_remaining != 0);
-        dsubimage(x+2, y+2, &img_skillicons, 19*bg, 0, 19, 19, DIMAGE_NONE);
-        dsubimage(x+2, y+2, &img_skillicons, 19*(i+2), 0, 19, 19, DIMAGE_NONE);
+        dsubimage(x+2, y+2, &img_skillicons, skill_size * bg, 0, skill_size,
+            skill_size, DIMAGE_NONE);
+        dsubimage(x+2, y+2, &img_skillicons, skill_size * (i+2), 0, skill_size,
+            skill_size, DIMAGE_NONE);
 
         /* Darken the area representing remaining cooldown */
         if(cooldown_total != 0) {
-            int height = (cooldown_remaining * 23) / cooldown_total;
-            for(int y1 = y+23-height; y1 < y + 23; y1++) {
-                for(int x1 = x; x1 < x+23; x1++) {
+            int height = (cooldown_remaining*skill_box_size) / cooldown_total;
+            int ymin = y + skill_box_size - height;
+            int ymax = y + skill_box_size;
+            for(int y1 = ymin; y1 < ymax; y1++) {
+                for(int x1 = x; x1 < x + skill_box_size; x1++) {
                     int i = DWIDTH * y1 + x1;
                     gint_vram[i] = ~((~gint_vram[i] & 0xf7de) >> 1);
                 }