From 33cfc7ee999f1b87865c07904853f2c23aab75c4 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Tue, 2 Jul 2024 14:04:01 +0200 Subject: [PATCH] - Comencem a treballar en els skills --- data/objectes.gif | Bin 2378 -> 2464 bytes source/main.cpp | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/data/objectes.gif b/data/objectes.gif index 247009ff477e03da016b0c86825d7caee6eb33ba..a17b4fe00fe1fc477cf5f7de1c4a4fda84fe1024 100644 GIT binary patch delta 2345 zcmV+^3D)+?5}*^1kbglv-*~R?e1F!0pv^}t8jna*KnN5BlF+Dh`eW9XPO5gx)nS89 z@bmftgJtF*I^Au1!|AK|nG%P;0@nQc)u;b%fi6u>cvx~-CwGfWSSp2lkxP$%l`&^G zm@}G1O@wxko+gZ>j*60~lZutBE}&{dx`lDOalyXJ%gE2qsNToMbde<&BTk$W=s36asD}1tOf)7?#{WiV?xbCB}`V-T!yBJ?GkX z)G^Z?Q-9DP2AYA6!C(+8HDi|qGqhoDT1HI!YD0pQaWmGPE{y`Ags0ug;1?=+zS{U-HQIwEV?xk8zN{g422uEtDfzXDlv)TZfOsZ!UYAA1IvT56>?$~0V49m)T zZzX#bq)eDtZQ1CEME>h;!wKO~k7^5dN~cb7f2=)bMqpI~%Kr}KJn^Z5GaFm(>x=Xg&&)K2(}p?Yi^zi9c5 z(!rGnXzmejJhru0ocA2ng(Ys~q@QBUVALDb;BvzYPWSP3cfa!YzZTEE(|k*rvni+R zW{t{UJDm97cQLO8gnq{hpW~p%Jb%6&jW4}%i+8L?F`5iUeRrDOwCF=W{5h{mEjw3g z2*s@RsRDrG$lf(FxH#n5u2(f%3bh(Tx~}*EgelXB38V3o3#x8=+2Y{s(9@9e_02X= zb0FY!rlu2}u!8PTA%r~VnG1!Eh%z+T5z&ShOX2W|-Pxg-0w~4*08ueaK7TSBPOx~0 z$obEPXPTZ4DVVMRawuYFL<|bmwHWX0QKwvv5+NVM!!F)*(vjeTY?rZShw%w{_Cnb3@;G^a_;YFd+;8tI)TubE2- z!fR&{J0LfQl{)_U4LmO#r>^wJ&bzDxbn4udc{ayORl(C+pn8;;xcLeUZZL@VRApLN z3ClVbGznQyVnTb#$_p|EX$Bl96tg+TO$zjpNLc72o}k1y&i^wcM1LWhx%Md0iLS7B zBh7(E_Y@c@-0?S9lApQ)SkV=NacSb*1VN>6k2xaDD$(?bwU>gAY7zaE?>>67=GmpJ$%`5f<-?_kF-eaIdJ~UW z!?e{MHD#?);6+kIHGdrqBTiWgBaP4?*RRsGhy9Y-pd6#t0s#pWQ85pJ0ykNN9n?+U ztSVTa^2Hz0bv3w2pLt?rS<;SHwAUbPW`Vj{3yzR4$k`!3aO$V8PK%R8VV?|dYg?to zb+vQdn`;%6qu6pWCA3Wl?P@cL<5Q;kt+3*W%fk|>b{PuhctugmWG-_T{vy<;o>I+%SdjsD2j^%>){gV2 zbF1WhW`yaPRb*>(?UMOtE{K_D#~^f}!^JwZ>}1hyh=2bbXWtCzDbzE-^{Dik5$9$r zQ(DundLB5xGDuKUAv0e7vZ+tKu&>=^)mtE9s?7xJQzx*8X|8pB8m(PjNBYoP_H~>) zJv3q0YRbk=wz8Ma>}EUr+0c%*w5Lt&YFqo-*v_`Lx6SQtd;8nq4!5|+P404=``qYG zx4PHO?tgZ>``z%4x4a9@<9YuHuJ#tlO!D1Uy7D`ydy_Z7`NUOl4_rMh?)JgegYR+U zj^S@9c(&sU@w%WJJ_!HD#ku&|+HBm3CJb!3!J5QFe*BQv5jnX@UYRwW{E!HLIe&~K zbHC91+$@hSYid4>nB&|?J~wyHW9o67=X~f1=OXsP9a*0AZx6h+0;ev9^BpyY@jFQq PY`VK!E%B%)JOltcbH<>2 delta 2258 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 diff --git a/source/main.cpp b/source/main.cpp index b1bcba7..3e807c0 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -380,10 +380,19 @@ bool game::loop() draw::print2("b", 7, 26, col2, FONT_ZOOM_NONE); draw::print2("c", 10, 26, col3, FONT_ZOOM_NONE); - draw::print2(actor::hero::getBoostJump(), 2, 3, 28, col3, FONT_ZOOM_NONE); - draw::print2(actor::hero::getBoostGod()/2, 2, 6, 28, col1, FONT_ZOOM_NONE); - draw::print2(actor::hero::getBoostRun()/2, 2, 9, 28, col2, FONT_ZOOM_NONE); + draw::print2(actor::hero::getBoostJump(), 2, 3, 27, col3, FONT_ZOOM_NONE); + draw::print2(actor::hero::getBoostGod()/2, 2, 6, 27, col1, FONT_ZOOM_NONE); + draw::print2(actor::hero::getBoostRun()/2, 2, 9, 27, col2, FONT_ZOOM_NONE); + draw::setSource(draw::getSurface("objectes.gif")); + draw::swapcol(1, actor::hero::getSkills()&SKILL_SHOES ? WHITE : BLUE); + draw::draw(276,166, 28, 22, 162, 0); + draw::swapcol(1, actor::hero::getSkills()&SKILL_PANTS ? WHITE : BLUE); + draw::draw(250,183, 18, 23, 167, 22); + draw::swapcol(1, actor::hero::getSkills()&SKILL_GLOVES ? WHITE : BLUE); + draw::draw(222,200, 21, 22, 165, 45); + draw::swapcol(1, actor::hero::getSkills()&SKILL_BAG ? WHITE : BLUE); + draw::draw(279,200, 20, 25, 145, 41); /* print(0,0,input::mouseX()); print(0,20,input::mouseY());