diff --git a/Resources/Sounds/Fails/2.wav b/Resources/Sounds/Fails/2.wav new file mode 100644 index 0000000..a500c2c Binary files /dev/null and b/Resources/Sounds/Fails/2.wav differ diff --git a/Resources/Sounds/Fails/3.wav b/Resources/Sounds/Fails/3.wav new file mode 100644 index 0000000..4fc3992 Binary files /dev/null and b/Resources/Sounds/Fails/3.wav differ diff --git a/Resources/Sounds/Fails/4.wav b/Resources/Sounds/Fails/4.wav new file mode 100644 index 0000000..58b2e8a Binary files /dev/null and b/Resources/Sounds/Fails/4.wav differ diff --git a/Resources/Sounds/Fails/5.wav b/Resources/Sounds/Fails/5.wav new file mode 100644 index 0000000..7ddc5ca Binary files /dev/null and b/Resources/Sounds/Fails/5.wav differ diff --git a/Resources/Sounds/Fails/6.wav b/Resources/Sounds/Fails/6.wav new file mode 100644 index 0000000..166631a Binary files /dev/null and b/Resources/Sounds/Fails/6.wav differ diff --git a/Resources/Sounds/Notes/1.wav b/Resources/Sounds/Notes/1.wav new file mode 100644 index 0000000..e0b5ae6 Binary files /dev/null and b/Resources/Sounds/Notes/1.wav differ diff --git a/Resources/Sounds/Notes/2.wav b/Resources/Sounds/Notes/2.wav new file mode 100644 index 0000000..ae548d7 Binary files /dev/null and b/Resources/Sounds/Notes/2.wav differ diff --git a/Resources/Sounds/Notes/3.wav b/Resources/Sounds/Notes/3.wav new file mode 100644 index 0000000..3a581a4 Binary files /dev/null and b/Resources/Sounds/Notes/3.wav differ diff --git a/Resources/Sounds/Notes/4.wav b/Resources/Sounds/Notes/4.wav new file mode 100644 index 0000000..6e7d04b Binary files /dev/null and b/Resources/Sounds/Notes/4.wav differ diff --git a/VaporWaveWars/character.cpp b/VaporWaveWars/character.cpp index e17daa3..f35a19e 100644 --- a/VaporWaveWars/character.cpp +++ b/VaporWaveWars/character.cpp @@ -60,6 +60,9 @@ void Character::setState(PlayerState::playerState state){ std::cout << "i am hurt" << std::endl; indexX = 0; indexY = 2 + magicNumber; + std::string sample = "fail"+std::to_string(rand()%6+1); + SoundManager::playSound(sample); + std::cout << "playing sample " << sample << std::endl; } else if (state == PlayerState::success){ std::cout << "i am succeed!" << std::endl; diff --git a/VaporWaveWars/player.cpp b/VaporWaveWars/player.cpp index 866ec03..73adfc7 100644 --- a/VaporWaveWars/player.cpp +++ b/VaporWaveWars/player.cpp @@ -25,6 +25,9 @@ bool Player::event(sf::Event e, bool def) { switch(e.type) { case (sf::Event::KeyPressed): if(e.key.code == sf::Keyboard::C) { + std::string sample = "note"+std::to_string(rand()%4+1); + SoundManager::playSound(sample); + std::cout << "playing sample " << sample << std::endl; compas.start(); error = false; } diff --git a/VaporWaveWars/soundmanager.cpp b/VaporWaveWars/soundmanager.cpp index c9a61c9..8e251f7 100644 --- a/VaporWaveWars/soundmanager.cpp +++ b/VaporWaveWars/soundmanager.cpp @@ -29,7 +29,16 @@ sf::SoundBuffer SoundManager::atk17; sf::SoundBuffer SoundManager::atk18; sf::SoundBuffer SoundManager::atk19; sf::SoundBuffer SoundManager::atk20; - +sf::SoundBuffer SoundManager::fail1; +sf::SoundBuffer SoundManager::fail2; +sf::SoundBuffer SoundManager::fail3; +sf::SoundBuffer SoundManager::fail4; +sf::SoundBuffer SoundManager::fail5; +sf::SoundBuffer SoundManager::fail6; +sf::SoundBuffer SoundManager::note1; +sf::SoundBuffer SoundManager::note2; +sf::SoundBuffer SoundManager::note3; +sf::SoundBuffer SoundManager::note4; std::map SoundManager::soundMap; std::map SoundManager::musicMap; @@ -83,6 +92,26 @@ void SoundManager::load(){ soundMap["atk19"].setBuffer(atk19); ASSERT(atk20.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/20.wav")); soundMap["atk20"].setBuffer(atk20); + ASSERT(fail1.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/1.wav")); + soundMap["fail1"].setBuffer(fail1); + ASSERT(fail2.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/2.wav")); + soundMap["fail2"].setBuffer(fail2); + ASSERT(fail3.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/3.wav")); + soundMap["fail3"].setBuffer(fail3); + ASSERT(fail4.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/4.wav")); + soundMap["fail4"].setBuffer(fail4); + ASSERT(fail5.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/5.wav")); + soundMap["fail5"].setBuffer(fail5); + ASSERT(fail6.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/6.wav")); + soundMap["fail6"].setBuffer(fail6); + ASSERT(note1.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/1.wav")); + soundMap["note1"].setBuffer(note1); + ASSERT(note2.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/2.wav")); + soundMap["note2"].setBuffer(note2); + ASSERT(note3.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/3.wav")); + soundMap["note3"].setBuffer(note3); + ASSERT(note4.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/4.wav")); + soundMap["note4"].setBuffer(note4); } diff --git a/VaporWaveWars/soundmanager.hpp b/VaporWaveWars/soundmanager.hpp index 64492de..8aaae89 100644 --- a/VaporWaveWars/soundmanager.hpp +++ b/VaporWaveWars/soundmanager.hpp @@ -49,6 +49,16 @@ class SoundManager { static sf::SoundBuffer atk18; static sf::SoundBuffer atk19; static sf::SoundBuffer atk20; + static sf::SoundBuffer fail1; + static sf::SoundBuffer fail2; + static sf::SoundBuffer fail3; + static sf::SoundBuffer fail4; + static sf::SoundBuffer fail5; + static sf::SoundBuffer fail6; + static sf::SoundBuffer note1; + static sf::SoundBuffer note2; + static sf::SoundBuffer note3; + static sf::SoundBuffer note4;