diff --git a/Resources/Sounds/NotesMod/2.ogg b/Resources/Sounds/NotesMod/2.ogg index 37c63d5..3065ccd 100644 Binary files a/Resources/Sounds/NotesMod/2.ogg and b/Resources/Sounds/NotesMod/2.ogg differ diff --git a/Resources/Sounds/NotesMod/3.ogg b/Resources/Sounds/NotesMod/3.ogg deleted file mode 100644 index 119263e..0000000 Binary files a/Resources/Sounds/NotesMod/3.ogg and /dev/null differ diff --git a/Resources/Sounds/NotesMod/4.ogg b/Resources/Sounds/NotesMod/4.ogg deleted file mode 100644 index 3065ccd..0000000 Binary files a/Resources/Sounds/NotesMod/4.ogg and /dev/null differ diff --git a/VaporWaveWars/game.cpp b/VaporWaveWars/game.cpp index 3a24f06..da0043e 100644 --- a/VaporWaveWars/game.cpp +++ b/VaporWaveWars/game.cpp @@ -20,7 +20,7 @@ Game* Game::i() { // Main game loop void Game::run() { sf::Clock c; - sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "( ( ( Radio Waves ) ) )", sf::Style::Close); + sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "( ( ( Radio Wave ) ) )", sf::Style::Close); window.setFramerateLimit(25); window.setKeyRepeatEnabled(false); diff --git a/VaporWaveWars/player.cpp b/VaporWaveWars/player.cpp index 0f9860e..778855e 100644 --- a/VaporWaveWars/player.cpp +++ b/VaporWaveWars/player.cpp @@ -4,20 +4,26 @@ Player::Player(int num) : Actor(num) { compas = Compas(); error = false; time = 0; + mod = false; } Player::Player() : Actor() { compas = Compas(); error = false; time = 0; + mod = false; } bool Player::updateLogic(float deltaTime, sf::RenderWindow *window) { time += deltaTime; + clock += deltaTime; if (time > BLACKVALUE) { compas.incraeseTime(); time = 0; } + if (clock >= 89.15) clock = 0.0; + if (!mod && clock > 38.10 && clock < 64) mod = true; + else if (mod && clock < 38.10 || clock > 64) mod = false; return false; } @@ -25,8 +31,9 @@ bool Player::event(sf::Event e) { switch(e.type) { case (sf::Event::KeyPressed): if(e.key.code == sf::Keyboard::C) { - std::string sample = "note"+std::to_string(rand()%4+1); + std::string sample = "mod"+std::to_string(rand()%2+1); + if(!mod) sample = "note"+std::to_string(rand()%4+1); SoundManager::playSound(sample); std::cout << "playing sample " << sample << std::endl; compas.start(); diff --git a/VaporWaveWars/player.hpp b/VaporWaveWars/player.hpp index 3286532..0c19e16 100644 --- a/VaporWaveWars/player.hpp +++ b/VaporWaveWars/player.hpp @@ -11,10 +11,11 @@ public: bool event(sf::Event e) final override; protected: bool updateLogic(float deltaTime, sf::RenderWindow *window); - private: float time; bool error; + bool mod; + float clock = 0.0; }; #endif // PLAYER_H diff --git a/VaporWaveWars/soundmanager.cpp b/VaporWaveWars/soundmanager.cpp index 9f3eb36..109f83b 100644 --- a/VaporWaveWars/soundmanager.cpp +++ b/VaporWaveWars/soundmanager.cpp @@ -47,6 +47,8 @@ sf::SoundBuffer SoundManager::bona5; sf::SoundBuffer SoundManager::bona6; sf::SoundBuffer SoundManager::bona7; sf::SoundBuffer SoundManager::bona8; +sf::SoundBuffer SoundManager::mod1; +sf::SoundBuffer SoundManager::mod2; std::map SoundManager::soundMap; std::map SoundManager::musicMap; @@ -136,6 +138,10 @@ void SoundManager::load(){ soundMap["bona7"].setBuffer(bona7); ASSERT(bona8.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/8.ogg")); soundMap["bona8"].setBuffer(bona8); + ASSERT(mod1.loadFromFile(WORK_DIR+"Resources/Sounds/NotesMod/1.ogg")); + soundMap["mod1"].setBuffer(mod1); + ASSERT(mod2.loadFromFile(WORK_DIR+"Resources/Sounds/NotesMod/2.ogg")); + soundMap["mod2"].setBuffer(mod2); } diff --git a/VaporWaveWars/soundmanager.hpp b/VaporWaveWars/soundmanager.hpp index 90bdb69..aaca2f8 100644 --- a/VaporWaveWars/soundmanager.hpp +++ b/VaporWaveWars/soundmanager.hpp @@ -67,6 +67,8 @@ class SoundManager { static sf::SoundBuffer bona6; static sf::SoundBuffer bona7; static sf::SoundBuffer bona8; + static sf::SoundBuffer mod1; + static sf::SoundBuffer mod2;