diff --git a/data/sound - copia/balloon.wav b/data/sound - copia/balloon.wav new file mode 100644 index 0000000..e4fd892 Binary files /dev/null and b/data/sound - copia/balloon.wav differ diff --git a/data/sound - copia/bubble1.wav b/data/sound - copia/bubble1.wav new file mode 100644 index 0000000..876ce1d Binary files /dev/null and b/data/sound - copia/bubble1.wav differ diff --git a/data/sound - copia/bubble2.wav b/data/sound - copia/bubble2.wav new file mode 100644 index 0000000..a44743e Binary files /dev/null and b/data/sound - copia/bubble2.wav differ diff --git a/data/sound - copia/bubble3.wav b/data/sound - copia/bubble3.wav new file mode 100644 index 0000000..fdda857 Binary files /dev/null and b/data/sound - copia/bubble3.wav differ diff --git a/data/sound - copia/bubble4.wav b/data/sound - copia/bubble4.wav new file mode 100644 index 0000000..90c7472 Binary files /dev/null and b/data/sound - copia/bubble4.wav differ diff --git a/data/sound - copia/bullet.wav b/data/sound - copia/bullet.wav new file mode 100644 index 0000000..9d241ff Binary files /dev/null and b/data/sound - copia/bullet.wav differ diff --git a/data/sound - copia/clock.wav b/data/sound - copia/clock.wav new file mode 100644 index 0000000..3e277c8 Binary files /dev/null and b/data/sound - copia/clock.wav differ diff --git a/data/sound - copia/coffee_out.wav b/data/sound - copia/coffee_out.wav new file mode 100644 index 0000000..1e3c4ff Binary files /dev/null and b/data/sound - copia/coffee_out.wav differ diff --git a/data/sound - copia/continue_clock.wav b/data/sound - copia/continue_clock.wav new file mode 100644 index 0000000..6542f67 Binary files /dev/null and b/data/sound - copia/continue_clock.wav differ diff --git a/data/sound - copia/debian_drop.wav b/data/sound - copia/debian_drop.wav new file mode 100644 index 0000000..75a3390 Binary files /dev/null and b/data/sound - copia/debian_drop.wav differ diff --git a/data/sound - copia/debian_pickup.wav b/data/sound - copia/debian_pickup.wav new file mode 100644 index 0000000..1ef21e8 Binary files /dev/null and b/data/sound - copia/debian_pickup.wav differ diff --git a/data/sound - copia/game_start.wav b/data/sound - copia/game_start.wav new file mode 100644 index 0000000..96093f2 Binary files /dev/null and b/data/sound - copia/game_start.wav differ diff --git a/data/sound - copia/hi_score_achieved.wav b/data/sound - copia/hi_score_achieved.wav new file mode 100644 index 0000000..87ba9ad Binary files /dev/null and b/data/sound - copia/hi_score_achieved.wav differ diff --git a/data/sound - copia/item_drop.wav b/data/sound - copia/item_drop.wav new file mode 100644 index 0000000..820ca68 Binary files /dev/null and b/data/sound - copia/item_drop.wav differ diff --git a/data/sound - copia/item_pickup.wav b/data/sound - copia/item_pickup.wav new file mode 100644 index 0000000..1f9c387 Binary files /dev/null and b/data/sound - copia/item_pickup.wav differ diff --git a/data/sound - copia/jump.wav b/data/sound - copia/jump.wav new file mode 100644 index 0000000..e234306 Binary files /dev/null and b/data/sound - copia/jump.wav differ diff --git a/data/sound - copia/logo.wav b/data/sound - copia/logo.wav new file mode 100644 index 0000000..92c9b21 Binary files /dev/null and b/data/sound - copia/logo.wav differ diff --git a/data/sound - copia/notify.wav b/data/sound - copia/notify.wav new file mode 100644 index 0000000..ddb57c0 Binary files /dev/null and b/data/sound - copia/notify.wav differ diff --git a/data/sound - copia/player_collision.wav b/data/sound - copia/player_collision.wav new file mode 100644 index 0000000..e3748a6 Binary files /dev/null and b/data/sound - copia/player_collision.wav differ diff --git a/data/sound - copia/power_ball_explosion.wav b/data/sound - copia/power_ball_explosion.wav new file mode 100644 index 0000000..d401237 Binary files /dev/null and b/data/sound - copia/power_ball_explosion.wav differ diff --git a/data/sound - copia/service_menu_adjust.wav b/data/sound - copia/service_menu_adjust.wav new file mode 100644 index 0000000..dab8ae9 Binary files /dev/null and b/data/sound - copia/service_menu_adjust.wav differ diff --git a/data/sound - copia/service_menu_move.wav b/data/sound - copia/service_menu_move.wav new file mode 100644 index 0000000..c7ea14d Binary files /dev/null and b/data/sound - copia/service_menu_move.wav differ diff --git a/data/sound - copia/service_menu_select.wav b/data/sound - copia/service_menu_select.wav new file mode 100644 index 0000000..66a88c8 Binary files /dev/null and b/data/sound - copia/service_menu_select.wav differ diff --git a/data/sound - copia/stage_change.wav b/data/sound - copia/stage_change.wav new file mode 100644 index 0000000..007d4be Binary files /dev/null and b/data/sound - copia/stage_change.wav differ diff --git a/data/sound - copia/tabe.wav b/data/sound - copia/tabe.wav new file mode 100644 index 0000000..242a32c Binary files /dev/null and b/data/sound - copia/tabe.wav differ diff --git a/data/sound - copia/tabe_hit.wav b/data/sound - copia/tabe_hit.wav new file mode 100644 index 0000000..f4c1581 Binary files /dev/null and b/data/sound - copia/tabe_hit.wav differ diff --git a/data/sound - copia/title.wav b/data/sound - copia/title.wav new file mode 100644 index 0000000..3ad8006 Binary files /dev/null and b/data/sound - copia/title.wav differ diff --git a/data/sound - copia/voice_aw_aw_aw.wav b/data/sound - copia/voice_aw_aw_aw.wav new file mode 100644 index 0000000..6eba8f5 Binary files /dev/null and b/data/sound - copia/voice_aw_aw_aw.wav differ diff --git a/data/sound - copia/voice_coffee.wav b/data/sound - copia/voice_coffee.wav new file mode 100644 index 0000000..97eb47f Binary files /dev/null and b/data/sound - copia/voice_coffee.wav differ diff --git a/data/sound - copia/voice_get_ready.wav b/data/sound - copia/voice_get_ready.wav new file mode 100644 index 0000000..0453f0a Binary files /dev/null and b/data/sound - copia/voice_get_ready.wav differ diff --git a/data/sound - copia/voice_no.wav b/data/sound - copia/voice_no.wav new file mode 100644 index 0000000..2bd8157 Binary files /dev/null and b/data/sound - copia/voice_no.wav differ diff --git a/data/sound - copia/voice_power_up.wav b/data/sound - copia/voice_power_up.wav new file mode 100644 index 0000000..9b68270 Binary files /dev/null and b/data/sound - copia/voice_power_up.wav differ diff --git a/data/sound - copia/voice_thankyou.wav b/data/sound - copia/voice_thankyou.wav new file mode 100644 index 0000000..0b67f27 Binary files /dev/null and b/data/sound - copia/voice_thankyou.wav differ diff --git a/data/sound - copia/walk.wav b/data/sound - copia/walk.wav new file mode 100644 index 0000000..2a386ce Binary files /dev/null and b/data/sound - copia/walk.wav differ diff --git a/data/sound/balloon.wav b/data/sound/balloon.wav index e4fd892..7153e8f 100644 Binary files a/data/sound/balloon.wav and b/data/sound/balloon.wav differ diff --git a/data/sound/bubble1.wav b/data/sound/bubble1.wav index 876ce1d..5b858e4 100644 Binary files a/data/sound/bubble1.wav and b/data/sound/bubble1.wav differ diff --git a/data/sound/bubble2.wav b/data/sound/bubble2.wav index a44743e..f524c6d 100644 Binary files a/data/sound/bubble2.wav and b/data/sound/bubble2.wav differ diff --git a/data/sound/bubble3.wav b/data/sound/bubble3.wav index fdda857..e22173a 100644 Binary files a/data/sound/bubble3.wav and b/data/sound/bubble3.wav differ diff --git a/data/sound/bubble4.wav b/data/sound/bubble4.wav index 90c7472..a5df665 100644 Binary files a/data/sound/bubble4.wav and b/data/sound/bubble4.wav differ diff --git a/data/sound/bullet.wav b/data/sound/bullet.wav index 9d241ff..4cd58b0 100644 Binary files a/data/sound/bullet.wav and b/data/sound/bullet.wav differ diff --git a/data/sound/clock.wav b/data/sound/clock.wav index 3e277c8..8ec03de 100644 Binary files a/data/sound/clock.wav and b/data/sound/clock.wav differ diff --git a/data/sound/coffee_out.wav b/data/sound/coffee_out.wav index 1e3c4ff..3604c13 100644 Binary files a/data/sound/coffee_out.wav and b/data/sound/coffee_out.wav differ diff --git a/data/sound/continue_clock.wav b/data/sound/continue_clock.wav index 6542f67..d6cd9f3 100644 Binary files a/data/sound/continue_clock.wav and b/data/sound/continue_clock.wav differ diff --git a/data/sound/debian_drop.wav b/data/sound/debian_drop.wav index 75a3390..2eeabf8 100644 Binary files a/data/sound/debian_drop.wav and b/data/sound/debian_drop.wav differ diff --git a/data/sound/debian_pickup.wav b/data/sound/debian_pickup.wav index 1ef21e8..deebd12 100644 Binary files a/data/sound/debian_pickup.wav and b/data/sound/debian_pickup.wav differ diff --git a/data/sound/game_start.wav b/data/sound/game_start.wav index 96093f2..4413164 100644 Binary files a/data/sound/game_start.wav and b/data/sound/game_start.wav differ diff --git a/data/sound/hi_score_achieved.wav b/data/sound/hi_score_achieved.wav index 87ba9ad..08822b0 100644 Binary files a/data/sound/hi_score_achieved.wav and b/data/sound/hi_score_achieved.wav differ diff --git a/data/sound/item_drop.wav b/data/sound/item_drop.wav index 820ca68..6731c38 100644 Binary files a/data/sound/item_drop.wav and b/data/sound/item_drop.wav differ diff --git a/data/sound/item_pickup.wav b/data/sound/item_pickup.wav index 1f9c387..e4aa64e 100644 Binary files a/data/sound/item_pickup.wav and b/data/sound/item_pickup.wav differ diff --git a/data/sound/jump.wav b/data/sound/jump.wav new file mode 100644 index 0000000..8c1db37 Binary files /dev/null and b/data/sound/jump.wav differ diff --git a/data/sound/logo.wav b/data/sound/logo.wav index 92c9b21..3509a20 100644 Binary files a/data/sound/logo.wav and b/data/sound/logo.wav differ diff --git a/data/sound/notify.wav b/data/sound/notify.wav index ddb57c0..dec199b 100644 Binary files a/data/sound/notify.wav and b/data/sound/notify.wav differ diff --git a/data/sound/player_collision.wav b/data/sound/player_collision.wav index e3748a6..c945a2a 100644 Binary files a/data/sound/player_collision.wav and b/data/sound/player_collision.wav differ diff --git a/data/sound/power_ball_explosion.wav b/data/sound/power_ball_explosion.wav index d401237..583015f 100644 Binary files a/data/sound/power_ball_explosion.wav and b/data/sound/power_ball_explosion.wav differ diff --git a/data/sound/service_menu_adjust.wav b/data/sound/service_menu_adjust.wav new file mode 100644 index 0000000..7279754 Binary files /dev/null and b/data/sound/service_menu_adjust.wav differ diff --git a/data/sound/service_menu_move.wav b/data/sound/service_menu_move.wav new file mode 100644 index 0000000..1ca933c Binary files /dev/null and b/data/sound/service_menu_move.wav differ diff --git a/data/sound/service_menu_select.wav b/data/sound/service_menu_select.wav new file mode 100644 index 0000000..399471e Binary files /dev/null and b/data/sound/service_menu_select.wav differ diff --git a/data/sound/stage_change.wav b/data/sound/stage_change.wav index 007d4be..e7058ee 100644 Binary files a/data/sound/stage_change.wav and b/data/sound/stage_change.wav differ diff --git a/data/sound/tabe.wav b/data/sound/tabe.wav index 242a32c..7b6a2f1 100644 Binary files a/data/sound/tabe.wav and b/data/sound/tabe.wav differ diff --git a/data/sound/tabe_hit.wav b/data/sound/tabe_hit.wav index f4c1581..35ebc70 100644 Binary files a/data/sound/tabe_hit.wav and b/data/sound/tabe_hit.wav differ diff --git a/data/sound/title.wav b/data/sound/title.wav index 3ad8006..944021c 100644 Binary files a/data/sound/title.wav and b/data/sound/title.wav differ diff --git a/data/sound/voice_aw_aw_aw.wav b/data/sound/voice_aw_aw_aw.wav index 6eba8f5..5bd9ae9 100644 Binary files a/data/sound/voice_aw_aw_aw.wav and b/data/sound/voice_aw_aw_aw.wav differ diff --git a/data/sound/voice_coffee.wav b/data/sound/voice_coffee.wav index 97eb47f..8cc1ec9 100644 Binary files a/data/sound/voice_coffee.wav and b/data/sound/voice_coffee.wav differ diff --git a/data/sound/voice_get_ready.wav b/data/sound/voice_get_ready.wav index 0453f0a..36ccec1 100644 Binary files a/data/sound/voice_get_ready.wav and b/data/sound/voice_get_ready.wav differ diff --git a/data/sound/voice_no.wav b/data/sound/voice_no.wav index 2bd8157..073dc0c 100644 Binary files a/data/sound/voice_no.wav and b/data/sound/voice_no.wav differ diff --git a/data/sound/voice_power_up.wav b/data/sound/voice_power_up.wav index 9b68270..2e5c3a6 100644 Binary files a/data/sound/voice_power_up.wav and b/data/sound/voice_power_up.wav differ diff --git a/data/sound/voice_thankyou.wav b/data/sound/voice_thankyou.wav new file mode 100644 index 0000000..c45b73a Binary files /dev/null and b/data/sound/voice_thankyou.wav differ diff --git a/data/sound/walk.wav b/data/sound/walk.wav index 2a386ce..4a997a4 100644 Binary files a/data/sound/walk.wav and b/data/sound/walk.wav differ diff --git a/source/director.cpp b/source/director.cpp index bf26a90..75709ca 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -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); diff --git a/source/player.cpp b/source/player.cpp index e47b4ea..ba8701d 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -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 sounds = {"bubble1.wav", "bubble2.wav", "bubble3.wav", "bubble4.wav"}; - Audio::get()->playSound(sounds.at(rand() % sounds.size())); + // const std::vector sounds = {"bubble1.wav", "bubble2.wav", "bubble3.wav", "bubble4.wav"}; + // Audio::get()->playSound(sounds.at(rand() % sounds.size())); + Audio::get()->playSound("jump.wav"); } \ No newline at end of file diff --git a/source/sections/game.cpp b/source/sections/game.cpp index 4433412..5bab735 100644 --- a/source/sections/game.cpp +++ b/source/sections/game.cpp @@ -1533,6 +1533,7 @@ void Game::handlePlayerContinue(const std::shared_ptr &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. diff --git a/source/ui/service_menu.cpp b/source/ui/service_menu.cpp index ba0b64a..acc0443 100644 --- a/source/ui/service_menu.cpp +++ b/source/ui/service_menu.cpp @@ -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 diff --git a/source/ui/service_menu.h b/source/ui/service_menu.h index d148405..db4ae2c 100644 --- a/source/ui/service_menu.h +++ b/source/ui/service_menu.h @@ -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();