Estandaritzats els noms dels fitxers de audio
Eliminat el soroll de TNT que feia ANYS que no existía
This commit is contained in:
Binary file not shown.
@@ -321,7 +321,7 @@ int BalloonManager::destroyAllBalloons()
|
|||||||
}
|
}
|
||||||
|
|
||||||
balloon_deploy_counter_ = 300;
|
balloon_deploy_counter_ = 300;
|
||||||
JA_PlaySound(Resource::get()->getSound("powerball.wav"));
|
JA_PlaySound(Resource::get()->getSound("power_ball_explosion.wav"));
|
||||||
Screen::get()->flash(flash_color, 3);
|
Screen::get()->flash(flash_color, 3);
|
||||||
Screen::get()->shake();
|
Screen::get()->shake();
|
||||||
|
|
||||||
|
|||||||
@@ -397,16 +397,16 @@ void Director::setFileList()
|
|||||||
Asset::get()->add(prefix + "/data/sound/bubble4.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/bubble4.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/bullet.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/bullet.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/clock.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/clock.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/coffeeout.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/coffee_out.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/continue_clock.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/continue_clock.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/game_start.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/game_start.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/hiscore.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/hi_score_achieved.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/itemdrop.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/item_drop.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/itempickup.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/item_pickup.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/logo.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/logo.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/notify.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/notify.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/player_collision.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/player_collision.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/powerball.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/power_ball_explosion.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/stage_change.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/stage_change.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/tabe.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/tabe.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/title.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/title.wav", AssetType::SOUND);
|
||||||
@@ -416,7 +416,7 @@ void Director::setFileList()
|
|||||||
Asset::get()->add(prefix + "/data/sound/voice_power_up.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/voice_power_up.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/walk.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_drop.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/debian_pick.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/tabe_hit.wav", AssetType::SOUND);
|
||||||
|
|
||||||
// Shaders
|
// Shaders
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ void Game::updateHiScore()
|
|||||||
if (hi_score_achieved_ == false)
|
if (hi_score_achieved_ == false)
|
||||||
{
|
{
|
||||||
hi_score_achieved_ = true;
|
hi_score_achieved_ = true;
|
||||||
JA_PlaySound(Resource::get()->getSound("hiscore.wav"));
|
JA_PlaySound(Resource::get()->getSound("hi_score_achieved.wav"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -467,7 +467,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
|
|||||||
player->addScore(1000);
|
player->addScore(1000);
|
||||||
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(0)->getWidth()) / 2;
|
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(0)->getWidth()) / 2;
|
||||||
createItemText(x, game_text_textures_.at(0));
|
createItemText(x, game_text_textures_.at(0));
|
||||||
JA_PlaySound(Resource::get()->getSound("itempickup.wav"));
|
JA_PlaySound(Resource::get()->getSound("item_pickup.wav"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ItemType::GAVINA:
|
case ItemType::GAVINA:
|
||||||
@@ -475,7 +475,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
|
|||||||
player->addScore(2500);
|
player->addScore(2500);
|
||||||
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(1)->getWidth()) / 2;
|
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(1)->getWidth()) / 2;
|
||||||
createItemText(x, game_text_textures_.at(1));
|
createItemText(x, game_text_textures_.at(1));
|
||||||
JA_PlaySound(Resource::get()->getSound("itempickup.wav"));
|
JA_PlaySound(Resource::get()->getSound("item_pickup.wav"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ItemType::PACMAR:
|
case ItemType::PACMAR:
|
||||||
@@ -483,7 +483,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
|
|||||||
player->addScore(5000);
|
player->addScore(5000);
|
||||||
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(2)->getWidth()) / 2;
|
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(2)->getWidth()) / 2;
|
||||||
createItemText(x, game_text_textures_.at(2));
|
createItemText(x, game_text_textures_.at(2));
|
||||||
JA_PlaySound(Resource::get()->getSound("itempickup.wav"));
|
JA_PlaySound(Resource::get()->getSound("item_pickup.wav"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ItemType::DEBIAN:
|
case ItemType::DEBIAN:
|
||||||
@@ -491,7 +491,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
|
|||||||
player->addScore(100000);
|
player->addScore(100000);
|
||||||
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(6)->getWidth()) / 2;
|
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(6)->getWidth()) / 2;
|
||||||
createItemText(x, game_text_textures_.at(6));
|
createItemText(x, game_text_textures_.at(6));
|
||||||
JA_PlaySound(Resource::get()->getSound("debian_pick.wav"));
|
JA_PlaySound(Resource::get()->getSound("debian_pickup.wav"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ItemType::CLOCK:
|
case ItemType::CLOCK:
|
||||||
@@ -499,7 +499,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
|
|||||||
enableTimeStopItem();
|
enableTimeStopItem();
|
||||||
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(5)->getWidth()) / 2;
|
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(5)->getWidth()) / 2;
|
||||||
createItemText(x, game_text_textures_.at(5));
|
createItemText(x, game_text_textures_.at(5));
|
||||||
JA_PlaySound(Resource::get()->getSound("itempickup.wav"));
|
JA_PlaySound(Resource::get()->getSound("item_pickup.wav"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ItemType::COFFEE:
|
case ItemType::COFFEE:
|
||||||
@@ -561,7 +561,7 @@ void Game::checkBulletCollision()
|
|||||||
if (rand() % 3 == 0)
|
if (rand() % 3 == 0)
|
||||||
{
|
{
|
||||||
createItem(ItemType::COFFEE, pos.x, pos.y);
|
createItem(ItemType::COFFEE, pos.x, pos.y);
|
||||||
// JA_PlaySound(Resource::get()->getSound("itemdrop.wav"));
|
// JA_PlaySound(Resource::get()->getSound("item_drop.wav"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -589,7 +589,7 @@ void Game::checkBulletCollision()
|
|||||||
if (dropped_item != ItemType::COFFEE_MACHINE)
|
if (dropped_item != ItemType::COFFEE_MACHINE)
|
||||||
{
|
{
|
||||||
createItem(dropped_item, balloon->getPosX(), balloon->getPosY());
|
createItem(dropped_item, balloon->getPosX(), balloon->getPosY());
|
||||||
JA_PlaySound(Resource::get()->getSound("itemdrop.wav"));
|
JA_PlaySound(Resource::get()->getSound("item_drop.wav"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -894,7 +894,7 @@ void Game::killPlayer(std::shared_ptr<Player> &player)
|
|||||||
// Lo pierde
|
// Lo pierde
|
||||||
player->removeExtraHit();
|
player->removeExtraHit();
|
||||||
throwCoffee(player->getPosX() + (player->getWidth() / 2), player->getPosY() + (player->getHeight() / 2));
|
throwCoffee(player->getPosX() + (player->getWidth() / 2), player->getPosY() + (player->getHeight() / 2));
|
||||||
JA_PlaySound(Resource::get()->getSound("coffeeout.wav"));
|
JA_PlaySound(Resource::get()->getSound("coffee_out.wav"));
|
||||||
screen_->shake();
|
screen_->shake();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user