Afegits sons de caminar i de comptador de continuar

Afegits estats al joc i al jugador per a escenificar el inici de la partida
This commit is contained in:
2025-01-03 19:19:22 +01:00
parent 40dfc32e84
commit cc4acecc03
8 changed files with 223 additions and 77 deletions

View File

@@ -40,7 +40,7 @@ void Player::init()
pos_y_ = default_pos_y_;
walking_state_ = PlayerState::WALKING_STOP;
firing_state_ = PlayerState::FIRING_NONE;
playing_state_ = PlayerState::WAITING;
setPlayingState(PlayerState::WAITING);
invulnerable_ = true;
invulnerable_counter_ = INVULNERABLE_COUNTER_;
power_up_ = false;
@@ -206,6 +206,12 @@ void Player::move()
}
case PlayerState::LEAVING_SCREEN:
{
++step_counter_;
if (step_counter_ % 10 == 0)
{
JA_PlaySound(Resource::get()->getSound("walk.wav"));
}
switch (id_)
{
case 1:
@@ -224,7 +230,45 @@ void Player::move()
shiftSprite();
if (pos_x_ == min_x || pos_x_ == max_x)
{
setPlayingState(PlayerState::GAME_OVER);
}
break;
}
case PlayerState::ENTERING_SCREEN:
{
++step_counter_;
if (step_counter_ % 10 == 0)
{
JA_PlaySound(Resource::get()->getSound("walk.wav"));
}
switch (id_)
{
case 1:
setInputPlaying(InputType::RIGHT);
pos_x_ += vel_x_;
if (pos_x_ > default_pos_x_)
{
pos_x_ = default_pos_x_;
setPlayingState(PlayerState::PLAYING);
setInvulnerable(false);
}
break;
case 2:
setInputPlaying(InputType::LEFT);
pos_x_ += vel_x_;
if (pos_x_ < default_pos_x_)
{
pos_x_ = default_pos_x_;
setPlayingState(PlayerState::PLAYING);
setInvulnerable(false);
}
break;
default:
break;
}
shiftSprite();
break;
}
case PlayerState::CREDITS:
@@ -291,6 +335,7 @@ void Player::setAnimation()
{
case PlayerState::PLAYING:
case PlayerState::ENTERING_NAME_GAME_COMPLETED:
case PlayerState::ENTERING_SCREEN:
case PlayerState::LEAVING_SCREEN:
case PlayerState::CREDITS:
{
@@ -506,9 +551,29 @@ void Player::setPlayingState(PlayerState state)
}
case PlayerState::LEAVING_SCREEN:
{
step_counter_ = 0;
setScoreboardMode(ScoreboardMode::GAME_COMPLETED);
break;
}
case PlayerState::ENTERING_SCREEN:
{
step_counter_ = 0;
setScoreboardMode(ScoreboardMode::SCORE);
switch (id_)
{
case 1:
pos_x_ = param.game.game_area.rect.x - WIDTH_;
break;
case 2:
pos_x_ = param.game.game_area.rect.x + param.game.game_area.rect.w;
break;
default:
break;
}
break;
}
case PlayerState::CREDITS:
{
vel_x_ = (walking_state_ == PlayerState::WALKING_RIGHT) ? BASE_SPEED_ : -BASE_SPEED_;
@@ -648,6 +713,10 @@ void Player::decContinueCounter()
{
setPlayingState(PlayerState::GAME_OVER);
}
else
{
JA_PlaySound(Resource::get()->getSound("continue_clock.wav"));
}
}
// Decrementa el contador de entrar nombre