From a9832690800373146903f74fd5bac430ffb7c6e8 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 15 Aug 2025 06:38:52 +0200 Subject: [PATCH] =?UTF-8?q?animacions=20noves=20de=20recuperaci=C3=B3=20pe?= =?UTF-8?q?r=20als=20jugadors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/gfx/player/player.ani | 16 ++++++++-------- data/gfx/player/player1.gif | Bin 14350 -> 16078 bytes data/gfx/player/player2.gif | Bin 14217 -> 14400 bytes source/player.cpp | 8 ++++---- source/player.h | 6 +++--- source/sections/game.cpp | 7 +++---- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/data/gfx/player/player.ani b/data/gfx/player/player.ani index b71632e..83facc3 100644 --- a/data/gfx/player/player.ani +++ b/data/gfx/player/player.ani @@ -113,13 +113,6 @@ loop=-1 frames=42,42,42,42,42,42,43,44,45,46,46,46,46,46,46,45,45,45,46,46,46,45,45,45,44,43,42,42,42 [/animation] -[animation] -name=thank_you -speed=3 -loop=-1 -frames=42,42,43,44,45,46,46,46,45,44 -[/animation] - [animation] name=dizzy speed=5 @@ -127,9 +120,16 @@ loop=0 frames=47,48,49,50,51,52,53 [/animation] +[animation] +name=recover +speed=3 +loop=-1 +frames=54,54,54,54,55,56,57,58,58,58,59,60,61,58,59,60,61,58,59,60,61,62,62,62,62 +[/animation] + [animation] name=hello speed=3 loop=-1 -frames=54,55,56,57,58,59,60,61,62,63,64,64,64,64,64,64,64,64,64,64,64,64,64,65,66,67,68,69,70,71,72,73,73,72,71,70,70,71,72,73,73,72,71,70,70,71,72,73,73,72,71,70,70,71,72,73,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54 +frames=63,64,65,66,67,68,69,70,71,72,73,73,73,73,73,73,73,73,73,73,73,73,73,74,75,76,77,78,79,80,81,82,82,81,80,79,79,80,81,82,82,81,80,79,79,80,81,82,82,81,80,79,79,80,81,82,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63 [/animation] \ No newline at end of file diff --git a/data/gfx/player/player1.gif b/data/gfx/player/player1.gif index 0c6ae164648bb01e0785b09800e0bd7587c2d68a..4766b3a0f9a9faa6e6075a38cb33a1f0bff25826 100644 GIT binary patch delta 4505 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 delta 2763 zcmV;+3N-c3eU5MmM@dFFH(`JPV37&t0bsH4fGmHjm*L1{s50Y5 zk`qs^jLA|YHHPud!AzMlhDn4r=jD{C@*GWU2AK#&xeuHsgGpB|-B{EZysAh|nv@}+ zo=Jas0b0WUsET#$R;~h$PK}1nPk^=so*0N57e)ZOQqkdP8{n;6xdrOhm6}#r-T-kG z7(lGpz~8UC3Lj1^8F6F5&n!2~%QrG-#*Vq|g)6!9-)@+LH5wU!fZWB4i+m21mvv;< zaS6m$lKNSJ-8EPD75(HbZp*WS`(@lacM^Z!&3d0EtQTt>0%MtLnr^cC^>NObLI0PR zEP3qN$&)pIZQA$W0k9TGkf4Ccw$Tg2mrq}S{fE(+;Q#?y@?jN#1osIz7J>C0IM_Bg zL=XXbZAlOT1gAkLVR;5x_@9HdL>R#Y6G%{Eg(g;rS%xB#Xkr8?M&RLxnm`bt5GsGD zU?K!Js{ha-H#J7UqmDfKI3qLx2AKkmIF`sGlNZWXqmwyGFr@@g8tKd#N^(hMmr4?V zWg%Ot&}EZlq8X-)S@PmU0XK5lUen7Q5EGyF|Fpj1{l0Wf)*D5`5XKuQ&QKkgtES%oxBx z!09~y=kHqu*sH+83_rub0uC=s>|6TAbul!EWejmM5_7Dau#91xalCzz>A}uDdfbJ_87Jxf$!g9EbOt%o(%0$heG>IwhM*3Bi(8%Bk=2%J3P|6^e*gEzW0Bz{F=jO#C#d( z5&s)Kd9XjV=2N>LbN#Z^GlL%S$%sGxF*Ls$+!Ge7uh*K4wcj5y0T+Dm-=P>xzrg~p zxqtp~twwrV_}~8w5I_$h24oM*703!Uu>~eW0Shp|#OU`H_25r}6jXo(OM{FAPRuVd zJ4OQ=*f9i7u!3?aPBMQOpg|Sh27`rInP1*V!x|#vh6c3Z4P`h(5!Nh+D2thlgabhN z<IDTPK~7wRhn%mnA#fDw!!Me+jN_r6gD}U3Ie&fIwe&D;+9A zkWFcfz?+#H95#RTMW}Cb(-k2IfxbYn&T-x=ny7GQI?E6ReU-^q^>jo&?S-RzCaZO+ z6X-Ju`m@(@OLu|P9rujE(1j{gc+2x6^voBGiiYub6ZO#cGFpg^`VpiY#i)lW+R$B? zl%gFi=}M7NK8qsnr6H9mM`=1W_=(VcHx-R?bb5^8#4mr1WdLeU%jk;w1+0JvJpUg7 z_h&%s{0FI0eQF-1s#K^l^@SYlm{6BcFs*j5t4jE43b)$RsJgJMVMQxgS18sbkadIf zgAH5N>ejl-^{zkF;SO)A!?z}Zrz->OzW7R500;o5IQ3~06$=-}1|zXbge>wLd&I+1 zhmQP_QD%SfxLNXD(X)p|Y-qFS(lZ{-sICwIYWXu-)}GO|oNcXYQSqKT!ZaASl@A@) zv|Bjlb{D_xtuopIzTytjUCS^oA(O#eHo|sIpdPT|JP$=@fj)?Ddo0-aB2IGH|_}ztmHOWdxZZp6C-S1KV2kc+> z5*QWwHJdyE@ZAK%4ZXywWq`?hUkK#Q!s8_zhJDE{=`uK1+|95tj>)(XI|Ia8@8X~OY=)fURcC12 z`58+Bs5ACF=Vkc$U4cH9L0N~;f~szyiMCxt8GSq9H5wTYm8kJlT4|PETGAVJDM>l) zJWm^Mq@O-UN->>1O;^;^!>j2_SzSI?M^S$imXWC+iOSX5&R4NL#dRTUz5naa;DBUO z@%06H-3O~Wb*XD^D*cq5UuFXktHB=5Mv&cXta?MiY0c|dvuf9FFT1VXo;Lgt5?2^r zup`2D#JSB%S8sFs-QoT=T``dyb8j1l@+S8Pw;))Q9roXS3AkZ#AaH~TTrRQUcfNm` zXW1oU_Th|`@)jhU9EcnIPb)--#WQwUyae0h_vox?yI0yOio(hAI(dBpbhsd|d~2db z$HALN+t=P4FDU-#%|Wd4cIBK2z2RwlhKonv3IMk{b2-eFV05fx7jdC@`qBZs;yFCG zUjH&i)_bO6HgBQpCW$&`#7;Ep7TJFhWbeq&%MkUqr(NxD=Wa0O{&tH0>qf$cFr+ju zJa@e3-S2b{ui(kP3;OyE!&iszdjB2_#83A>kRLpZ3*U5n4Vb&p(eHGV!FlU;7YUz# zdE2)zdcYq$^HLAxeU+u*zenf6sCR_yg(drD*nRbN2Yrfpk9*&{vc(%lMdW`OSKr=i z_Zc?sGR~B-{3SEv`SFrIm!ZFmEI$ML&d@%Sp^RnkYq`qV2mkn)zx^$j-}=hnJ~Pf7 zFZYuf&CY;-nj3s_ff}*{8UlaB+KI#0p-ea2 z-Rc-zzk$w!%^huY3?DiedV!wKH5}Ori&+I+U=tbSwbfM{~o+8qa z99jbx<1^CV{E68ZEzStoK@$Iw4g(&b R0X`!VAm9Rm<1+>U06RIRO5y+j diff --git a/data/gfx/player/player2.gif b/data/gfx/player/player2.gif index 6413de799417b553f2d283b257f74294fe1c64af..8692f37cf7c9d1cd3e38fc41cd0b1ecbc73e3880 100644 GIT binary patch delta 14290 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 A3IG5A delta 14106 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 Y9PWYSWgg`bB8Y(A2setFlip(flipMode); break; } - case State::THANK_YOU: - player_sprite_->setCurrentAnimation("thank_you"); + case State::RECOVER: + player_sprite_->setCurrentAnimation("recover"); break; case State::WAITING: case State::GAME_OVER: @@ -640,7 +640,7 @@ void Player::setPlayingState(State state) { playing_state_ = state; switch (playing_state_) { - case State::THANK_YOU: { + case State::RECOVER: { playSound("voice_thankyou.wav"); break; } diff --git a/source/player.h b/source/player.h index be50ad6..3c6ca7f 100644 --- a/source/player.h +++ b/source/player.h @@ -72,7 +72,7 @@ class Player { CREDITS, // Estado para mostrar los créditos del juego TITLE_ANIMATION, // Animacion para el titulo TITLE_HIDDEN, // Animacion para el titulo - THANK_YOU, // Al aceptar continuar + RECOVER, // Al aceptar continuar RESPAWNING, // Tras continuar y dar las gracias, otorga inmunidad y vuelve al juego }; @@ -115,8 +115,8 @@ class Player { // --- Puntuación y marcador --- void addScore(int score, int lowest_hi_score_entry); // Añade puntos - void incScoreMultiplier(); // Incrementa el multiplicador - void decScoreMultiplier(); // Decrementa el multiplicador + void incScoreMultiplier(); // Incrementa el multiplicador + void decScoreMultiplier(); // Decrementa el multiplicador // --- Estados de juego --- void setPlayingState(State state); // Cambia el estado de juego diff --git a/source/sections/game.cpp b/source/sections/game.cpp index 8ff0e80..b75c407 100644 --- a/source/sections/game.cpp +++ b/source/sections/game.cpp @@ -1402,12 +1402,12 @@ void Game::handleFireInputs(const std::shared_ptr &player, bool autofire // Maneja la continuación del jugador cuando no está jugando, permitiendo que continúe si se pulsa el botón de inicio. void Game::handlePlayerContinueInput(const std::shared_ptr &player) { if (input_->checkAction(Input::Action::START, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) { - player->setPlayingState(Player::State::THANK_YOU); + player->setPlayingState(Player::State::RECOVER); player->addCredit(); sendPlayerToTheFront(player); // Crea letrero de THANK_YOU - const auto X = player->getPosX() + (player->getWidth() - game_text_textures_.at(7)->getWidth()) / 2; - createItemText(X, game_text_textures_.at(7)); + //const auto X = player->getPosX() + (player->getWidth() - game_text_textures_.at(7)->getWidth()) / 2; + //createItemText(X, game_text_textures_.at(7)); } // Disminuye el contador de continuación si se presiona cualquier botón de disparo. @@ -1794,7 +1794,6 @@ void Game::updateMenace() { balloon_manager_->deployRandomFormation(stage_manager_->getCurrentStageIndex()); setMenace(); } - std::cout << "MT: " << menace_threshold_ << " | MC: " << menace_ << std::endl; } // Calcula y establece el valor de amenaza en funcion de los globos activos