diff --git a/data/gfx/balloon/balloon1.png b/data/gfx/balloon/balloon1.png index d17d16a..6e4128a 100644 Binary files a/data/gfx/balloon/balloon1.png and b/data/gfx/balloon/balloon1.png differ diff --git a/data/gfx/balloon/balloon2.png b/data/gfx/balloon/balloon2.png index 7dfff30..abc4290 100644 Binary files a/data/gfx/balloon/balloon2.png and b/data/gfx/balloon/balloon2.png differ diff --git a/data/gfx/balloon/balloon3.png b/data/gfx/balloon/balloon3.png index 2eedfb4..360fec6 100644 Binary files a/data/gfx/balloon/balloon3.png and b/data/gfx/balloon/balloon3.png differ diff --git a/data/gfx/balloon/balloon4.png b/data/gfx/balloon/balloon4.png index 4e0fadf..445a857 100644 Binary files a/data/gfx/balloon/balloon4.png and b/data/gfx/balloon/balloon4.png differ diff --git a/data/gfx/balloon/powerball.png b/data/gfx/balloon/powerball.png index 8557acf..e0fbc0d 100644 Binary files a/data/gfx/balloon/powerball.png and b/data/gfx/balloon/powerball.png differ diff --git a/data/gfx/item/item_clock.png b/data/gfx/item/item_clock.png index 7c87437..91c8cc0 100644 Binary files a/data/gfx/item/item_clock.png and b/data/gfx/item/item_clock.png differ diff --git a/data/gfx/item/item_coffee.png b/data/gfx/item/item_coffee.png index e51cdb1..6f11045 100644 Binary files a/data/gfx/item/item_coffee.png and b/data/gfx/item/item_coffee.png differ diff --git a/data/gfx/item/item_coffee_machine.png b/data/gfx/item/item_coffee_machine.png index ac67691..e69cb9f 100644 Binary files a/data/gfx/item/item_coffee_machine.png and b/data/gfx/item/item_coffee_machine.png differ diff --git a/data/gfx/item/item_debian.png b/data/gfx/item/item_debian.png index 3e52ae7..0799496 100644 Binary files a/data/gfx/item/item_debian.png and b/data/gfx/item/item_debian.png differ diff --git a/data/gfx/item/item_points1_disk.png b/data/gfx/item/item_points1_disk.png index 06fc5e5..f7be60a 100644 Binary files a/data/gfx/item/item_points1_disk.png and b/data/gfx/item/item_points1_disk.png differ diff --git a/data/gfx/item/item_points2_gavina.png b/data/gfx/item/item_points2_gavina.png index 59b382a..8778f49 100644 Binary files a/data/gfx/item/item_points2_gavina.png and b/data/gfx/item/item_points2_gavina.png differ diff --git a/data/gfx/item/item_points3_pacmar.png b/data/gfx/item/item_points3_pacmar.png index 19d5466..6c15f40 100644 Binary files a/data/gfx/item/item_points3_pacmar.png and b/data/gfx/item/item_points3_pacmar.png differ diff --git a/data/sound/balloon.wav b/data/sound/balloon.wav deleted file mode 100644 index 7153e8f..0000000 Binary files a/data/sound/balloon.wav and /dev/null differ diff --git a/data/sound/balloon1.wav b/data/sound/balloon1.wav new file mode 100644 index 0000000..8ab7eb5 Binary files /dev/null and b/data/sound/balloon1.wav differ diff --git a/data/sound/balloon2.wav b/data/sound/balloon2.wav new file mode 100644 index 0000000..08ff008 Binary files /dev/null and b/data/sound/balloon2.wav differ diff --git a/data/sound/balloon3.wav b/data/sound/balloon3.wav new file mode 100644 index 0000000..5669334 Binary files /dev/null and b/data/sound/balloon3.wav differ diff --git a/data/sound/balloon4.wav b/data/sound/balloon4.wav new file mode 100644 index 0000000..45fa816 Binary files /dev/null and b/data/sound/balloon4.wav differ diff --git a/data/sound/bullet.wav b/data/sound/bullet.wav index 4cd58b0..27f1ceb 100644 Binary files a/data/sound/bullet.wav and b/data/sound/bullet.wav differ diff --git a/source/director.cpp b/source/director.cpp index a010e06..6f36cbe 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -287,7 +287,10 @@ void Director::setFileList() Asset::get()->add(prefix + "/data/music/credits.ogg", AssetType::MUSIC); // Sonidos - Asset::get()->add(prefix + "/data/sound/balloon.wav", AssetType::SOUND); + Asset::get()->add(prefix + "/data/sound/balloon1.wav", AssetType::SOUND); + Asset::get()->add(prefix + "/data/sound/balloon2.wav", AssetType::SOUND); + Asset::get()->add(prefix + "/data/sound/balloon3.wav", AssetType::SOUND); + Asset::get()->add(prefix + "/data/sound/balloon4.wav", AssetType::SOUND); Asset::get()->add(prefix + "/data/sound/bubble1.wav", AssetType::SOUND); Asset::get()->add(prefix + "/data/sound/bubble2.wav", AssetType::SOUND); Asset::get()->add(prefix + "/data/sound/bubble3.wav", AssetType::SOUND); diff --git a/source/sections/game.cpp b/source/sections/game.cpp index cb65141..1890cbd 100644 --- a/source/sections/game.cpp +++ b/source/sections/game.cpp @@ -602,19 +602,37 @@ void Game::checkBulletCollision() } // Explota el globo - const auto score = balloon_manager_->popBalloon(balloon); + const auto SIZE = balloon->getSize(); + const auto SCORE = balloon_manager_->popBalloon(balloon); evaluateAndSetMenace(); // Otorga los puntos al jugador que disparó la bala if (player->isPlaying()) { - player->addScore(score * player->getScoreMultiplier() * difficulty_score_multiplier_); + player->addScore(SCORE * player->getScoreMultiplier() * difficulty_score_multiplier_); player->incScoreMultiplier(); } updateHiScore(); // Sonido de explosión - playSound("balloon.wav"); + switch (SIZE) + { + case BalloonSize::SIZE1: + playSound("balloon1.wav"); + break; + case BalloonSize::SIZE2: + playSound("balloon2.wav"); + break; + case BalloonSize::SIZE3: + playSound("balloon3.wav"); + break; + case BalloonSize::SIZE4: + playSound("balloon4.wav"); + break; + default: + playSound("balloon1.wav"); + break; + } // Deshabilita la bala bullet->disable();