From d77757853d2624c25461e674b5346d64b5dc74d9 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 9 Oct 2022 12:01:28 +0200 Subject: [PATCH] =?UTF-8?q?Quitadas=20las=20cabezas=20rojas=20de=20powerup?= =?UTF-8?q?=20y=20acelerada=20la=20animaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/gfx/player_arounder_head.png | Bin 2837 -> 1608 bytes data/gfx/player_bal1_head.png | Bin 2809 -> 1602 bytes data/gfx/player_body.ani | 42 ++++++++++++++++++++++++++++++ data/gfx/player_head.ani | 24 ++++++++--------- source/game.cpp | 24 +---------------- source/player.cpp | 8 +++--- todo.txt | 3 ++- 7 files changed, 61 insertions(+), 40 deletions(-) diff --git a/data/gfx/player_arounder_head.png b/data/gfx/player_arounder_head.png index de58b3a9beeed29d2c7a8b6f3a7ceecca32fc826..211f28743394ab890179735421d4688ef803ff43 100644 GIT binary patch literal 1608 zcmYk5dpy%?7{FKjh$YdokZ5&6#iHgCVKTQamdK@;(nYExm*~RAx;V8HQ=$%Ih3GO; zSW8TyP|4gT#T1*w8jan@`R(YB^L{?><$0g?d7k%q-tT)AyW2}g+ejM%f#~>nd-#KM z1lSuEX@H~r($QXUS`hE=lXvRPvtYkKzc@WrvI zUe<>M&xAkd^#Vw4XOcB~d^{7rsuV$=Jsq>fBsl)0?)0P54VW2Y%^@YpJd*wW+9jkO zV@9XikJ`(I=w;D4G{0OmdEXl`Ke$kK^t7q7Q;d>vTPxe0!}xheJbvl`E=+?E+*TqG zPUzo(l@-?u4b5yr-oE$le|x3R@1f(gtMtcc+Fu+{??Y6Vd#X*ZBjLmhbN^$hfXo#H@ldcr52M@D=}S`jwMg zF}Vfstk(O_1gOmXext}O;TfWVG2JnXmIpK|&tZrp;qfQRi7=I<@iFzaO(=bBN~oQC z(v!I86W3S{5YMyqAm7-VU)xISA-kG(fHTPGvvmvzuuN8T^2EMybS=r=MV(%Z1W+^K{C;CNa z_`>70q!8Em=n|2RG*_YG7XLU)Y>EixZU>M z&S@_nYxlRz@I^40(YlUKIl%B{pbYP2;;?Ha04fznHkSbBQgK+96a`V8Nu7{MfWTCq zmiq7NkQXV4+HV`IN=`3U5GSDzlM+RGjbreUr-!aqo^LIoS$Ym{ZlL4V6<4fNSvLqa zOsb1^@oGXTjy%3Wic;x8I6mPWb~Q~rk{MV8FhvR{DX{HqqBY3n&fz^9t?T+|js3!y z1H_4}Gam|8^s-IgNu@CeTT8OzpQN#iISQwc9PXr0uXVp!o{`Y+8yxl&&l3r4x(k@> z%|n?;*Fs0a^mw5Qv)32Sq=1~EMg=QVpLN}QwI*xo-7SK_Z0I$Uxs`xzcLCuE4%@bm z1QK;;A^%IU75VDHLiP;;3eJi%DATPP)t%3=Ll@&>Ek0;|^Jcab`O>K0D=j(9)7@?a z#l<@ahD=;2pEOnbbarHUI0Nw;fx=<%;K) z9~zzX4`*JmroYwPLkQfyU3COhCoVZwc;6{Kw=4X108VOu{=xagsu4ktvC%TB)`fj9 z@#18jjodkKzb{Q{Z;h^*L;qMvp%g5BZ!nnb_u<~EJn~0K=r80q_~B{3(C$$#HbqAY z7eZ}cN|ok}=MuC1oMfjuL9Qu*+|%RqYm!t^RD~K5OhDU0sF>J&L4ua%=Jb&l)jYv~ z@joxzj+&fVzPblR4HY7J@NUh1q2_!gf?Xz|`U+zH5ImrglOa+}LD%OqyO1qM#Qyy; zr8+v&B-`=ZbMjz>eh-FInc}#OhelO z&1%CU<4+OZxHY0qJ<8o9i2nllStDQo literal 2837 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 m4}fT22^FOA~83M@iNZ>7>k;b7*Xq)gd>zIYJy` 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.enabled = demo; this->numPlayers = numPlayers; - this->currentStage = 9; // currentStage; + this->currentStage = 9;//currentStage; lastStageReached = currentStage; if (numPlayers == 1) { // Si solo juega un jugador, permite jugar tanto con teclado como con mando @@ -3705,28 +3705,6 @@ void Game::checkEventHandler() reloadTextures(); break; - case SDL_SCANCODE_P: - createPowerBall(); - break; - - case SDL_SCANCODE_O: - stopAllBalloons(200); - break; - - case SDL_SCANCODE_I: - static bool toogle = true; - if (toogle) - { - players.at(0)->setPlayerTextures(player1Textures); - toogle = !toogle; - } - else - { - players.at(0)->setPlayerTextures(player2Textures); - toogle = !toogle; - } - break; - default: break; } diff --git a/source/player.cpp b/source/player.cpp index 85d5fbd..f1b894d 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -235,8 +235,8 @@ void Player::setAnimation() aHeadCoffees = "_1C"; } - //const std::string aPowerUp = powerUp ? "_pwr" : ""; - const std::string aPowerUp = ""; + const std::string aPowerUp = powerUp ? "_pwr" : ""; + //const std::string aPowerUp = ""; const std::string aWalking = statusWalking == PLAYER_STATUS_WALKING_STOP ? "stand" : "walk"; const std::string aFiring = statusFiring == PLAYER_STATUS_FIRING_UP ? "centershoot" : "sideshoot"; @@ -248,14 +248,14 @@ void Player::setAnimation() legsSprite->setFlip(flipWalk); if (statusFiring == PLAYER_STATUS_FIRING_NO) { // No esta disparando - bodySprite->setCurrentAnimation(aWalking + aBodyCoffees); + bodySprite->setCurrentAnimation(aWalking + aBodyCoffees + aPowerUp); bodySprite->setFlip(flipWalk); headSprite->setCurrentAnimation(aWalking + aHeadCoffees + aPowerUp); headSprite->setFlip(flipWalk); } else { // Está disparando - bodySprite->setCurrentAnimation(aFiring + aBodyCoffees); + bodySprite->setCurrentAnimation(aFiring + aBodyCoffees + aPowerUp); bodySprite->setFlip(flipFire); headSprite->setCurrentAnimation(aFiring + aHeadCoffees + aPowerUp); headSprite->setFlip(flipFire); diff --git a/todo.txt b/todo.txt index bb42cd1..46597b1 100644 --- a/todo.txt +++ b/todo.txt @@ -25,4 +25,5 @@ x poner un dibujito en la pantalla de game over al terminar el juego x y quizas otro en la propia pantalla de game over x que las nubes al final se vuelva a frenar quitar las cabezas powerup -x el modo 2P no arranca \ No newline at end of file +x el modo 2P no arranca +arreglar el menu de gameover cuando has completado el juego \ No newline at end of file