From ebbe84da64e736dd1bf3d4863aa220400dcdbb4c Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 13 Jul 2024 12:02:55 +0200 Subject: [PATCH] afegits els grafics nous per al jugador --- data/gfx/player_bal1_body.png | Bin 4739 -> 6260 bytes data/gfx/player_bal1_death.png | Bin 1355 -> 1473 bytes data/gfx/player_bal1_fire.png | Bin 835 -> 1216 bytes data/gfx/player_bal1_head.png | Bin 1602 -> 2248 bytes data/gfx/player_bal1_legs.png | Bin 529 -> 1029 bytes data/gfx/player_body.ani | 4 ++-- data/gfx/player_death.ani | 4 ++-- data/gfx/player_fire.ani | 4 ++-- data/gfx/player_head.ani | 4 ++-- data/gfx/player_legs.ani | 4 ++-- source/game.cpp | 4 ++-- source/game.h | 1 - source/player.cpp | 25 +++++++++---------------- 13 files changed, 21 insertions(+), 29 deletions(-) diff --git a/data/gfx/player_bal1_body.png b/data/gfx/player_bal1_body.png index 2c4246c02fde79101ccfb97ba6594c78d4ac3b3f..c9ca6c863030dc3ad7bbf639f3b44ed8f69144dc 100644 GIT binary patch literal 6260 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 A;s5{u literal 4739 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 Idd@Nb0n6wt{Qv*} diff --git a/data/gfx/player_bal1_death.png b/data/gfx/player_bal1_death.png index c169ba1497400c9013c77ad44891c1802ba9274e..0cda9ea81ddd90250687943ff875ca8acf9fb64f 100644 GIT binary patch literal 1473 zcmV;y1wQ(TP)Px)dr3q=RA_2J|&AB)!qIPMaNHi|?A__Qx;N)wPCjJLZ zL3IWE1Ez_aARjseDNe~MqKSl%OV_6e3e#X+kpfGWEM(Xe%Ui#lot+=+^@U=(Z@6DSx17ygMAwz~Iikz;(!OEKV>g6-z2CuH~@yp-8YulX$gQJ>P*g8zTkBueA z6U&Z2yV8C(mK^Vg;zFow*7Ht+Ig?6P*Y{S>uYti)&7)r$?Ga)8N9D4*0C3(P;k-Wr zFgtRmonPLh(yN!xaCLoe{G27Km4*l01n+5CG7yM6S-uB=IOjvRFRubtCm` z+tz_Rl0R?1Y`(syBsos@#uiL?z54}!zW*-vJt@xnBMgpe-katN0FMH$_yXqSKDeh? zeSV2mfmBjLnk0`4l0bCRbIy8b3_(3Kw3a2pR3UvOL!jJoB#UtghY`W;)-VvDNG5+z zYQ3QWJqne(NDim}5x_)aMejo8(~!%-i51H@(Ke6;rCdS73UCS6Jq`LKl7Wd4_;QjH z9N8w3|EH&|d!zbdJ1WptLpnf-fK8T+X(D=B5@dagW1Fw|H&@s?%<=U_H4*BY zATAwAELcab$|c*9EE^wJQm(u@jC)-awhnW$tXpUejtkF$%g}nq1xp|cCLwKOvRAcD zEyh`~&6;Ox!6La2?rFp|0sva!GPk%HSszV;E?HuTD=8V0OxD1o@;7}ssrm~M92cIu zkCW8}QEqV)^UUg!?p5=pvXtaGXFVd|IG9G!6Q#bv_G8&ya|f%>F9E36`*v#xr~eV3 zn%yAMKdIjUb-zuOQrmi%2Nq~?=$15T6fK75bIv;cLb!2Rhuq(bdsS0#Hy1Z4AgbZw zcFoj+3tNXdBKZT}1xmTPvgUDedF(-bQp8U3I;oqdP;FDYadOC)%0Nf)e{mnqI{Uf1 z=8koTKr(VSmK<+zRFiIv;_$~ma`y%#kD~dwd0@G?yb%0kfu-$yb!)K7Jp;mCywdOn zM>S7&Fro~ybR^4=l-#&)vUS&Fziqn)%PfuumK?IcQq_*>__&gC<<)^3g(yqyaUqec z3veFX)5LBWn4IPSlLY>_*Nv<(ZgCU9gk;f@#7ve6h!lF-9r50p=7#KG#SKGIqTD;5Q&{I`T0^g(dmkxfr;L65|Ly( zG7Zu=JV}DMy}5~8MMX0bj+j#xg&LQ;mUWm0bmN&8bkWe}no`>Hw7t<02dxDktgLxI zzyDWRhrWvzs5&K@7PGWm09NFt4N-xoiEXt0oWINN{19xeoIZ6trK`fTx+0t*Lxv0) b{&)NbDctx9^b$^W00000NkvXXu0mjfwfx3t literal 1355 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 N002ovPDHLkV1hi_kGB8- diff --git a/data/gfx/player_bal1_head.png b/data/gfx/player_bal1_head.png index d35d3a0cdcb69d0e4ab4d4bef11cfe76fd149d3c..1cd7395b4721d3fb013129a851a337d79874b9f5 100644 GIT binary patch literal 2248 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 literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^2|#SX!3HGXiPfJ6QjEnx?oJHr&dIz4vQK-uIEGZr zd3$T4H&dVt`-k?bFHlwF5TCrP;DTa7 zMoAgRAy2&i*;}e@?!UkH`|rKGMf?g%NMMn`r$}!-qj?&p zVp8w-M_rUY+B4y3Pk~O%6se%UX{?=-*VJ75bR_)xqAL@+_11Xq4*Ibm4e z++VrA-39t_3=HXKlb>v!mb3S+8bki2_2u>(e%eZgzc&>QR8#iiwR~5;n8!3|_R4$N zYPY5~-Ldz%S-bU>07JmO2zG`offL;M{fp0A&)=F-RDC|L|99+;+gj;rW$l|8g6AIO z*jd6AzW)3%g>Ahdg z1>Ub8mnF>>V&jlp%CYS0i_fz|7Z^-4tVaqWC8b3(YW4>ovn>*A`54Q-IpgP~y1DAv z?=`ypcgL>gvwa)ZGuwFId2Nk1GsP8d?UX$>-@uO1aru)y&#b>6`Vnk@{l0s)(+clD Qz&K{`boFyt=akR{0B+*y0{{R3 diff --git a/data/gfx/player_body.ani b/data/gfx/player_body.ani index dd893e7..3ad853d 100644 --- a/data/gfx/player_body.ani +++ b/data/gfx/player_body.ani @@ -1,5 +1,5 @@ -frameWidth=24 -frameHeight=24 +frameWidth=30 +frameHeight=30 [animation] name=walk diff --git a/data/gfx/player_death.ani b/data/gfx/player_death.ani index 2567468..63a7677 100644 --- a/data/gfx/player_death.ani +++ b/data/gfx/player_death.ani @@ -1,5 +1,5 @@ -frameWidth=24 -frameHeight=24 +frameWidth=30 +frameHeight=30 [animation] name=default diff --git a/data/gfx/player_fire.ani b/data/gfx/player_fire.ani index 8552ba5..cdf07d5 100644 --- a/data/gfx/player_fire.ani +++ b/data/gfx/player_fire.ani @@ -1,5 +1,5 @@ -frameWidth=28 -frameHeight=32 +frameWidth=35 +frameHeight=40 [animation] name=default diff --git a/data/gfx/player_head.ani b/data/gfx/player_head.ani index 52fc8e0..2409022 100644 --- a/data/gfx/player_head.ani +++ b/data/gfx/player_head.ani @@ -1,5 +1,5 @@ -frameWidth=24 -frameHeight=24 +frameWidth=30 +frameHeight=30 [animation] name=walk diff --git a/data/gfx/player_legs.ani b/data/gfx/player_legs.ani index 9cd6905..1eb5c11 100644 --- a/data/gfx/player_legs.ani +++ b/data/gfx/player_legs.ani @@ -1,5 +1,5 @@ -frameWidth=24 -frameHeight=24 +frameWidth=30 +frameHeight=30 [animation] name=walk diff --git a/source/game.cpp b/source/game.cpp index cb49473..ae5a28f 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -179,10 +179,10 @@ void Game::init(int playerID) players.clear(); // Crea los dos jugadores - Player *player1 = new Player((PLAY_AREA_CENTER_FIRST_QUARTER_X * ((0 * 2) + 1)) - 11, PLAY_AREA_BOTTOM - 24, renderer, playerTextures[0], playerAnimations); + Player *player1 = new Player((PLAY_AREA_CENTER_FIRST_QUARTER_X * ((0 * 2) + 1)) - 11, PLAY_AREA_BOTTOM - 30, renderer, playerTextures[0], playerAnimations); players.push_back(player1); - Player *player2 = new Player((PLAY_AREA_CENTER_FIRST_QUARTER_X * ((1 * 2) + 1)) - 11, PLAY_AREA_BOTTOM - 24, renderer, playerTextures[1], playerAnimations); + Player *player2 = new Player((PLAY_AREA_CENTER_FIRST_QUARTER_X * ((1 * 2) + 1)) - 11, PLAY_AREA_BOTTOM - 30, renderer, playerTextures[1], playerAnimations); players.push_back(player2); // Habilita el jugador seleccionado. playerID es player 1 o player 2 diff --git a/source/game.h b/source/game.h index 41aba01..faeac79 100644 --- a/source/game.h +++ b/source/game.h @@ -240,7 +240,6 @@ private: // Guarda el fichero de datos para la demo bool saveDemoFile(); #endif - // Inicializa las formaciones enemigas void initEnemyFormations(); diff --git a/source/player.cpp b/source/player.cpp index ccbb400..eb34958 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -52,11 +52,11 @@ void Player::init() input = true; // Establece la altura y el ancho del jugador - width = 24; - height = 24; + width = 30; + height = 30; // Establece el tamaño del circulo de colisión - collider.r = 7; + collider.r = 9; // Actualiza la posición del circulo de colisión shiftColliders(); @@ -153,7 +153,7 @@ void Player::move() headSprite->setPosY(posY); fireSprite->setPosX(getPosX() - 2); - fireSprite->setPosY(posY - 8); + fireSprite->setPosY(posY - 10); } else { @@ -179,7 +179,7 @@ void Player::render() { if (invulnerable) { - if ((invulnerableCounter % 10) > 4) + if ((invulnerableCounter % 6) > 2) { if (powerUp) { @@ -528,10 +528,12 @@ void Player::removeExtraHit() { coffees--; } + if (coffees == 0) { extraHit = false; } + invulnerable = true; invulnerableCounter = PLAYER_INVULNERABLE_COUNTER; } @@ -576,27 +578,18 @@ Texture *Player::getDeadTexture() // Actualiza el valor de la variable void Player::updatePowerUpHeadOffset() { - if (!powerUp) - { - // powerUpHeadOffset = 0; - } - else - { - // powerUpHeadOffset = 96; + if (powerUp) if (powerUpCounter < 300) { - if (powerUpCounter % 10 > 4) + if (powerUpCounter % 6 > 2) { - // powerUpHeadOffset = 96; fireSprite->setEnabled(false); } else { - // powerUpHeadOffset = 0; fireSprite->setEnabled(true); } } - } } // Pone las texturas del jugador