push per a enviar a revisió per Doc

This commit is contained in:
2025-06-30 19:03:49 +02:00
parent 129b4855bc
commit b15dfdc7e3
73 changed files with 24 additions and 9 deletions

View File

@@ -312,10 +312,15 @@ void Director::setFileList()
Asset::get()->add(prefix + "/data/sound/voice_get_ready.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/voice_no.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/voice_power_up.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/voice_thankyou.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/walk.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/debian_drop.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/debian_pickup.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/tabe_hit.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/jump.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/service_menu_move.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/service_menu_adjust.wav", AssetType::SOUND);
Asset::get()->add(prefix + "/data/sound/service_menu_select.wav", AssetType::SOUND);
// Shaders
Asset::get()->add(prefix + "/data/shaders/crtpi_256.glsl", AssetType::DATA);

View File

@@ -528,6 +528,7 @@ void Player::setPlayingState(PlayerState state)
continue_ticks_ = SDL_GetTicks();
continue_counter_ = 9;
setScoreboardMode(ScoreboardMode::CONTINUE);
Audio::get()->playSound("continue_clock.wav");
break;
}
case PlayerState::WAITING:
@@ -565,6 +566,7 @@ void Player::setPlayingState(PlayerState state)
player_sprite_->setAnimationSpeed(5);
setScoreboardMode(ScoreboardMode::GAME_OVER);
Audio::get()->playSound("voice_aw_aw_aw.wav");
Audio::get()->playSound("jump.wav");
break;
}
case PlayerState::GAME_OVER:
@@ -809,6 +811,7 @@ void Player::shiftSprite()
// Hace sonar un ruido al azar
void Player::playRandomBubbleSound()
{
const std::vector<std::string> sounds = {"bubble1.wav", "bubble2.wav", "bubble3.wav", "bubble4.wav"};
Audio::get()->playSound(sounds.at(rand() % sounds.size()));
// const std::vector<std::string> sounds = {"bubble1.wav", "bubble2.wav", "bubble3.wav", "bubble4.wav"};
// Audio::get()->playSound(sounds.at(rand() % sounds.size()));
Audio::get()->playSound("jump.wav");
}

View File

@@ -1533,6 +1533,7 @@ void Game::handlePlayerContinue(const std::shared_ptr<Player> &player)
{
player->setPlayingState(PlayerState::PLAYING);
player->addCredit();
Audio::get()->playSound("voice_thankyou.wav");
}
// Disminuye el contador de continuación si se presiona cualquier botón de disparo.

View File

@@ -83,7 +83,7 @@ void ServiceMenu::setSelectorUp()
if (display_options_.empty())
return;
selected_ = (selected_ > 0) ? selected_ - 1 : display_options_.size() - 1;
playMenuSound();
playMoveSound();
}
void ServiceMenu::setSelectorDown()
@@ -91,7 +91,7 @@ void ServiceMenu::setSelectorDown()
if (display_options_.empty())
return;
selected_ = (selected_ + 1) % display_options_.size();
playMenuSound();
playMoveSound();
}
void ServiceMenu::adjustOption(bool adjust_up)
@@ -103,7 +103,7 @@ void ServiceMenu::adjustOption(bool adjust_up)
{
selected_option->adjustValue(adjust_up);
applySettings();
playMenuSound();
playAdjustSound();
}
}
@@ -125,7 +125,7 @@ void ServiceMenu::selectOption()
{
selected_option->executeAction();
}
playMenuSound();
playSelectSound();
}
void ServiceMenu::moveBack()
@@ -138,7 +138,7 @@ void ServiceMenu::moveBack()
current_settings_group_ = previous_settings_group_;
selected_ = (current_settings_group_ == SettingsGroup::MAIN) ? main_menu_selected_ : 0;
updateMenu();
playMenuSound();
playBackSound();
}
// --- Lógica Interna ---
@@ -304,7 +304,10 @@ void ServiceMenu::AdjustListValues()
}
// Reproduce el sonido de navegación del menú
void ServiceMenu::playMenuSound() { Audio::get()->playSound("clock.wav"); }
void ServiceMenu::playAdjustSound() { Audio::get()->playSound("service_menu_adjust.wav"); }
void ServiceMenu::playMoveSound() { Audio::get()->playSound("service_menu_move.wav"); }
void ServiceMenu::playSelectSound() { Audio::get()->playSound("service_menu_select.wav"); }
void ServiceMenu::playBackSound() { Audio::get()->playSound("service_menu_select.wav"); }
// Devuelve el nombre del grupo como string para el título
std::string ServiceMenu::settingsGroupToString(SettingsGroup group) const

View File

@@ -93,7 +93,10 @@ private:
void applySettingsSettings();
MenuOption *getOptionByCaption(const std::string &caption) const;
void AdjustListValues();
void playMenuSound();
void playMoveSound();
void playAdjustSound();
void playSelectSound();
void playBackSound();
std::string settingsGroupToString(SettingsGroup group) const;
void setHiddenOptions();