diff --git a/Resources/Sounds/Bona/1.mp3 b/Resources/Sounds/Bona/1.mp3 new file mode 100644 index 0000000..e5758e3 Binary files /dev/null and b/Resources/Sounds/Bona/1.mp3 differ diff --git a/Resources/Sounds/Bona/1.ogg b/Resources/Sounds/Bona/1.ogg new file mode 100644 index 0000000..5e7be74 Binary files /dev/null and b/Resources/Sounds/Bona/1.ogg differ diff --git a/Resources/Sounds/Bona/2.mp3 b/Resources/Sounds/Bona/2.mp3 new file mode 100644 index 0000000..eb226a3 Binary files /dev/null and b/Resources/Sounds/Bona/2.mp3 differ diff --git a/Resources/Sounds/Bona/2.ogg b/Resources/Sounds/Bona/2.ogg new file mode 100644 index 0000000..2924b64 Binary files /dev/null and b/Resources/Sounds/Bona/2.ogg differ diff --git a/Resources/Sounds/Bona/3.mp3 b/Resources/Sounds/Bona/3.mp3 new file mode 100644 index 0000000..3da49e9 Binary files /dev/null and b/Resources/Sounds/Bona/3.mp3 differ diff --git a/Resources/Sounds/Bona/3.ogg b/Resources/Sounds/Bona/3.ogg new file mode 100644 index 0000000..d9360d6 Binary files /dev/null and b/Resources/Sounds/Bona/3.ogg differ diff --git a/Resources/Sounds/Bona/4.mp3 b/Resources/Sounds/Bona/4.mp3 new file mode 100644 index 0000000..a216902 Binary files /dev/null and b/Resources/Sounds/Bona/4.mp3 differ diff --git a/Resources/Sounds/Bona/4.ogg b/Resources/Sounds/Bona/4.ogg new file mode 100644 index 0000000..5f82a5b Binary files /dev/null and b/Resources/Sounds/Bona/4.ogg differ diff --git a/Resources/Sounds/Bona/5.mp3 b/Resources/Sounds/Bona/5.mp3 new file mode 100644 index 0000000..bdf256b Binary files /dev/null and b/Resources/Sounds/Bona/5.mp3 differ diff --git a/Resources/Sounds/Bona/5.ogg b/Resources/Sounds/Bona/5.ogg new file mode 100644 index 0000000..61e5644 Binary files /dev/null and b/Resources/Sounds/Bona/5.ogg differ diff --git a/Resources/Sounds/Bona/6.mp3 b/Resources/Sounds/Bona/6.mp3 new file mode 100644 index 0000000..6a67571 Binary files /dev/null and b/Resources/Sounds/Bona/6.mp3 differ diff --git a/Resources/Sounds/Bona/6.ogg b/Resources/Sounds/Bona/6.ogg new file mode 100644 index 0000000..5771536 Binary files /dev/null and b/Resources/Sounds/Bona/6.ogg differ diff --git a/Resources/Sounds/Bona/7.mp3 b/Resources/Sounds/Bona/7.mp3 new file mode 100644 index 0000000..425c0b0 Binary files /dev/null and b/Resources/Sounds/Bona/7.mp3 differ diff --git a/Resources/Sounds/Bona/7.ogg b/Resources/Sounds/Bona/7.ogg new file mode 100644 index 0000000..b21485c Binary files /dev/null and b/Resources/Sounds/Bona/7.ogg differ diff --git a/Resources/Sounds/Bona/8.mp3 b/Resources/Sounds/Bona/8.mp3 new file mode 100644 index 0000000..258b677 Binary files /dev/null and b/Resources/Sounds/Bona/8.mp3 differ diff --git a/Resources/Sounds/Bona/8.ogg b/Resources/Sounds/Bona/8.ogg new file mode 100644 index 0000000..d5012a1 Binary files /dev/null and b/Resources/Sounds/Bona/8.ogg differ diff --git a/Resources/Sounds/Fails/1.mp3 b/Resources/Sounds/Fails/1.mp3 new file mode 100644 index 0000000..f9dff48 Binary files /dev/null and b/Resources/Sounds/Fails/1.mp3 differ diff --git a/Resources/Sounds/Fails/1.ogg b/Resources/Sounds/Fails/1.ogg new file mode 100644 index 0000000..8cc9ba6 Binary files /dev/null and b/Resources/Sounds/Fails/1.ogg differ diff --git a/Resources/Sounds/Fails/1.wav b/Resources/Sounds/Fails/1.wav deleted file mode 100644 index 57a3998..0000000 Binary files a/Resources/Sounds/Fails/1.wav and /dev/null differ diff --git a/Resources/Sounds/Fails/2.mp3 b/Resources/Sounds/Fails/2.mp3 new file mode 100644 index 0000000..ce8e08b Binary files /dev/null and b/Resources/Sounds/Fails/2.mp3 differ diff --git a/Resources/Sounds/Fails/2.ogg b/Resources/Sounds/Fails/2.ogg new file mode 100644 index 0000000..e82498c Binary files /dev/null and b/Resources/Sounds/Fails/2.ogg differ diff --git a/Resources/Sounds/Fails/2.wav b/Resources/Sounds/Fails/2.wav deleted file mode 100644 index a500c2c..0000000 Binary files a/Resources/Sounds/Fails/2.wav and /dev/null differ diff --git a/Resources/Sounds/Fails/3.mp3 b/Resources/Sounds/Fails/3.mp3 new file mode 100644 index 0000000..94facc4 Binary files /dev/null and b/Resources/Sounds/Fails/3.mp3 differ diff --git a/Resources/Sounds/Fails/3.ogg b/Resources/Sounds/Fails/3.ogg new file mode 100644 index 0000000..3e0485f Binary files /dev/null and b/Resources/Sounds/Fails/3.ogg differ diff --git a/Resources/Sounds/Fails/3.wav b/Resources/Sounds/Fails/3.wav deleted file mode 100644 index 4fc3992..0000000 Binary files a/Resources/Sounds/Fails/3.wav and /dev/null differ diff --git a/Resources/Sounds/Fails/4.mp3 b/Resources/Sounds/Fails/4.mp3 new file mode 100644 index 0000000..ea02de5 Binary files /dev/null and b/Resources/Sounds/Fails/4.mp3 differ diff --git a/Resources/Sounds/Fails/4.ogg b/Resources/Sounds/Fails/4.ogg new file mode 100644 index 0000000..e1533d2 Binary files /dev/null and b/Resources/Sounds/Fails/4.ogg differ diff --git a/Resources/Sounds/Fails/4.wav b/Resources/Sounds/Fails/4.wav deleted file mode 100644 index 58b2e8a..0000000 Binary files a/Resources/Sounds/Fails/4.wav and /dev/null differ diff --git a/Resources/Sounds/Fails/5.mp3 b/Resources/Sounds/Fails/5.mp3 new file mode 100644 index 0000000..6a9a453 Binary files /dev/null and b/Resources/Sounds/Fails/5.mp3 differ diff --git a/Resources/Sounds/Fails/5.ogg b/Resources/Sounds/Fails/5.ogg new file mode 100644 index 0000000..0584e35 Binary files /dev/null and b/Resources/Sounds/Fails/5.ogg differ diff --git a/Resources/Sounds/Fails/5.wav b/Resources/Sounds/Fails/5.wav deleted file mode 100644 index 7ddc5ca..0000000 Binary files a/Resources/Sounds/Fails/5.wav and /dev/null differ diff --git a/Resources/Sounds/Fails/6.mp3 b/Resources/Sounds/Fails/6.mp3 new file mode 100644 index 0000000..102877a Binary files /dev/null and b/Resources/Sounds/Fails/6.mp3 differ diff --git a/Resources/Sounds/Fails/6.ogg b/Resources/Sounds/Fails/6.ogg new file mode 100644 index 0000000..cc3d180 Binary files /dev/null and b/Resources/Sounds/Fails/6.ogg differ diff --git a/Resources/Sounds/Fails/6.wav b/Resources/Sounds/Fails/6.wav deleted file mode 100644 index 166631a..0000000 Binary files a/Resources/Sounds/Fails/6.wav and /dev/null differ diff --git a/Resources/Sounds/Notes/1.mp3 b/Resources/Sounds/Notes/1.mp3 new file mode 100644 index 0000000..9915860 Binary files /dev/null and b/Resources/Sounds/Notes/1.mp3 differ diff --git a/Resources/Sounds/Notes/1.ogg b/Resources/Sounds/Notes/1.ogg new file mode 100644 index 0000000..e67f91b Binary files /dev/null and b/Resources/Sounds/Notes/1.ogg differ diff --git a/Resources/Sounds/Notes/1.wav b/Resources/Sounds/Notes/1.wav deleted file mode 100644 index 8504e63..0000000 Binary files a/Resources/Sounds/Notes/1.wav and /dev/null differ diff --git a/Resources/Sounds/Notes/2.mp3 b/Resources/Sounds/Notes/2.mp3 new file mode 100644 index 0000000..220e440 Binary files /dev/null and b/Resources/Sounds/Notes/2.mp3 differ diff --git a/Resources/Sounds/Notes/2.ogg b/Resources/Sounds/Notes/2.ogg new file mode 100644 index 0000000..48227af Binary files /dev/null and b/Resources/Sounds/Notes/2.ogg differ diff --git a/Resources/Sounds/Notes/2.wav b/Resources/Sounds/Notes/2.wav deleted file mode 100644 index 8a9bbed..0000000 Binary files a/Resources/Sounds/Notes/2.wav and /dev/null differ diff --git a/Resources/Sounds/Notes/3.mp3 b/Resources/Sounds/Notes/3.mp3 new file mode 100644 index 0000000..c510f76 Binary files /dev/null and b/Resources/Sounds/Notes/3.mp3 differ diff --git a/Resources/Sounds/Notes/3.ogg b/Resources/Sounds/Notes/3.ogg new file mode 100644 index 0000000..b112213 Binary files /dev/null and b/Resources/Sounds/Notes/3.ogg differ diff --git a/Resources/Sounds/Notes/3.wav b/Resources/Sounds/Notes/3.wav deleted file mode 100644 index e70445c..0000000 Binary files a/Resources/Sounds/Notes/3.wav and /dev/null differ diff --git a/Resources/Sounds/Notes/4.mp3 b/Resources/Sounds/Notes/4.mp3 new file mode 100644 index 0000000..37a7437 Binary files /dev/null and b/Resources/Sounds/Notes/4.mp3 differ diff --git a/Resources/Sounds/Notes/4.ogg b/Resources/Sounds/Notes/4.ogg new file mode 100644 index 0000000..6c3f98d Binary files /dev/null and b/Resources/Sounds/Notes/4.ogg differ diff --git a/Resources/Sounds/Notes/4.wav b/Resources/Sounds/Notes/4.wav deleted file mode 100644 index b45a307..0000000 Binary files a/Resources/Sounds/Notes/4.wav and /dev/null differ diff --git a/Resources/Sounds/NotesMod/1.mp3 b/Resources/Sounds/NotesMod/1.mp3 new file mode 100644 index 0000000..88c76ed Binary files /dev/null and b/Resources/Sounds/NotesMod/1.mp3 differ diff --git a/Resources/Sounds/NotesMod/1.ogg b/Resources/Sounds/NotesMod/1.ogg new file mode 100644 index 0000000..5462af3 Binary files /dev/null and b/Resources/Sounds/NotesMod/1.ogg differ diff --git a/Resources/Sounds/NotesMod/2.mp3 b/Resources/Sounds/NotesMod/2.mp3 new file mode 100644 index 0000000..f355ae1 Binary files /dev/null and b/Resources/Sounds/NotesMod/2.mp3 differ diff --git a/Resources/Sounds/NotesMod/2.ogg b/Resources/Sounds/NotesMod/2.ogg new file mode 100644 index 0000000..3123a6d Binary files /dev/null and b/Resources/Sounds/NotesMod/2.ogg differ diff --git a/Resources/Sounds/NotesMod/3.mp3 b/Resources/Sounds/NotesMod/3.mp3 new file mode 100644 index 0000000..262e4ab Binary files /dev/null and b/Resources/Sounds/NotesMod/3.mp3 differ diff --git a/Resources/Sounds/NotesMod/3.ogg b/Resources/Sounds/NotesMod/3.ogg new file mode 100644 index 0000000..8f20a17 Binary files /dev/null and b/Resources/Sounds/NotesMod/3.ogg differ diff --git a/Resources/Sounds/NotesMod/4.mp3 b/Resources/Sounds/NotesMod/4.mp3 new file mode 100644 index 0000000..db16c59 Binary files /dev/null and b/Resources/Sounds/NotesMod/4.mp3 differ diff --git a/Resources/Sounds/NotesMod/4.ogg b/Resources/Sounds/NotesMod/4.ogg new file mode 100644 index 0000000..e9ebba5 Binary files /dev/null and b/Resources/Sounds/NotesMod/4.ogg differ diff --git a/Resources/Sounds/Samples/1.mp3 b/Resources/Sounds/Samples/1.mp3 new file mode 100644 index 0000000..55b1690 Binary files /dev/null and b/Resources/Sounds/Samples/1.mp3 differ diff --git a/Resources/Sounds/Samples/1.ogg b/Resources/Sounds/Samples/1.ogg new file mode 100644 index 0000000..c242e83 Binary files /dev/null and b/Resources/Sounds/Samples/1.ogg differ diff --git a/Resources/Sounds/Samples/1.wav b/Resources/Sounds/Samples/1.wav deleted file mode 100644 index b536c93..0000000 Binary files a/Resources/Sounds/Samples/1.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/10.mp3 b/Resources/Sounds/Samples/10.mp3 new file mode 100644 index 0000000..cfd4b50 Binary files /dev/null and b/Resources/Sounds/Samples/10.mp3 differ diff --git a/Resources/Sounds/Samples/10.ogg b/Resources/Sounds/Samples/10.ogg new file mode 100644 index 0000000..7cb32d8 Binary files /dev/null and b/Resources/Sounds/Samples/10.ogg differ diff --git a/Resources/Sounds/Samples/10.wav b/Resources/Sounds/Samples/10.wav deleted file mode 100644 index 58b94a2..0000000 Binary files a/Resources/Sounds/Samples/10.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/11.mp3 b/Resources/Sounds/Samples/11.mp3 new file mode 100644 index 0000000..3c537fb Binary files /dev/null and b/Resources/Sounds/Samples/11.mp3 differ diff --git a/Resources/Sounds/Samples/11.ogg b/Resources/Sounds/Samples/11.ogg new file mode 100644 index 0000000..ed5eed7 Binary files /dev/null and b/Resources/Sounds/Samples/11.ogg differ diff --git a/Resources/Sounds/Samples/11.wav b/Resources/Sounds/Samples/11.wav deleted file mode 100644 index 36878c8..0000000 Binary files a/Resources/Sounds/Samples/11.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/12.mp3 b/Resources/Sounds/Samples/12.mp3 new file mode 100644 index 0000000..f8eb31d Binary files /dev/null and b/Resources/Sounds/Samples/12.mp3 differ diff --git a/Resources/Sounds/Samples/12.ogg b/Resources/Sounds/Samples/12.ogg new file mode 100644 index 0000000..64b56f1 Binary files /dev/null and b/Resources/Sounds/Samples/12.ogg differ diff --git a/Resources/Sounds/Samples/12.wav b/Resources/Sounds/Samples/12.wav deleted file mode 100644 index fb733b6..0000000 Binary files a/Resources/Sounds/Samples/12.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/13.mp3 b/Resources/Sounds/Samples/13.mp3 new file mode 100644 index 0000000..ed2d545 Binary files /dev/null and b/Resources/Sounds/Samples/13.mp3 differ diff --git a/Resources/Sounds/Samples/13.ogg b/Resources/Sounds/Samples/13.ogg new file mode 100644 index 0000000..a26b164 Binary files /dev/null and b/Resources/Sounds/Samples/13.ogg differ diff --git a/Resources/Sounds/Samples/13.wav b/Resources/Sounds/Samples/13.wav deleted file mode 100644 index eed1eb3..0000000 Binary files a/Resources/Sounds/Samples/13.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/14.mp3 b/Resources/Sounds/Samples/14.mp3 new file mode 100644 index 0000000..e89d5f0 Binary files /dev/null and b/Resources/Sounds/Samples/14.mp3 differ diff --git a/Resources/Sounds/Samples/14.ogg b/Resources/Sounds/Samples/14.ogg new file mode 100644 index 0000000..6bab9d1 Binary files /dev/null and b/Resources/Sounds/Samples/14.ogg differ diff --git a/Resources/Sounds/Samples/14.wav b/Resources/Sounds/Samples/14.wav deleted file mode 100644 index cefb93b..0000000 Binary files a/Resources/Sounds/Samples/14.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/15.mp3 b/Resources/Sounds/Samples/15.mp3 new file mode 100644 index 0000000..200e703 Binary files /dev/null and b/Resources/Sounds/Samples/15.mp3 differ diff --git a/Resources/Sounds/Samples/15.ogg b/Resources/Sounds/Samples/15.ogg new file mode 100644 index 0000000..c9d5750 Binary files /dev/null and b/Resources/Sounds/Samples/15.ogg differ diff --git a/Resources/Sounds/Samples/15.wav b/Resources/Sounds/Samples/15.wav deleted file mode 100644 index b005f74..0000000 Binary files a/Resources/Sounds/Samples/15.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/16.mp3 b/Resources/Sounds/Samples/16.mp3 new file mode 100644 index 0000000..c1a7218 Binary files /dev/null and b/Resources/Sounds/Samples/16.mp3 differ diff --git a/Resources/Sounds/Samples/16.ogg b/Resources/Sounds/Samples/16.ogg new file mode 100644 index 0000000..9326dc2 Binary files /dev/null and b/Resources/Sounds/Samples/16.ogg differ diff --git a/Resources/Sounds/Samples/16.wav b/Resources/Sounds/Samples/16.wav deleted file mode 100644 index 92d76f8..0000000 Binary files a/Resources/Sounds/Samples/16.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/17.mp3 b/Resources/Sounds/Samples/17.mp3 new file mode 100644 index 0000000..852ed9f Binary files /dev/null and b/Resources/Sounds/Samples/17.mp3 differ diff --git a/Resources/Sounds/Samples/17.ogg b/Resources/Sounds/Samples/17.ogg new file mode 100644 index 0000000..663b1a6 Binary files /dev/null and b/Resources/Sounds/Samples/17.ogg differ diff --git a/Resources/Sounds/Samples/17.wav b/Resources/Sounds/Samples/17.wav deleted file mode 100644 index ede0b8d..0000000 Binary files a/Resources/Sounds/Samples/17.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/18.mp3 b/Resources/Sounds/Samples/18.mp3 new file mode 100644 index 0000000..c8cb944 Binary files /dev/null and b/Resources/Sounds/Samples/18.mp3 differ diff --git a/Resources/Sounds/Samples/18.ogg b/Resources/Sounds/Samples/18.ogg new file mode 100644 index 0000000..14ee065 Binary files /dev/null and b/Resources/Sounds/Samples/18.ogg differ diff --git a/Resources/Sounds/Samples/18.wav b/Resources/Sounds/Samples/18.wav deleted file mode 100644 index fc20f13..0000000 Binary files a/Resources/Sounds/Samples/18.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/19.mp3 b/Resources/Sounds/Samples/19.mp3 new file mode 100644 index 0000000..8e5d8b3 Binary files /dev/null and b/Resources/Sounds/Samples/19.mp3 differ diff --git a/Resources/Sounds/Samples/19.ogg b/Resources/Sounds/Samples/19.ogg new file mode 100644 index 0000000..7c090e6 Binary files /dev/null and b/Resources/Sounds/Samples/19.ogg differ diff --git a/Resources/Sounds/Samples/19.wav b/Resources/Sounds/Samples/19.wav deleted file mode 100644 index efc9cf9..0000000 Binary files a/Resources/Sounds/Samples/19.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/2.mp3 b/Resources/Sounds/Samples/2.mp3 new file mode 100644 index 0000000..930c7d3 Binary files /dev/null and b/Resources/Sounds/Samples/2.mp3 differ diff --git a/Resources/Sounds/Samples/2.ogg b/Resources/Sounds/Samples/2.ogg new file mode 100644 index 0000000..0dce49c Binary files /dev/null and b/Resources/Sounds/Samples/2.ogg differ diff --git a/Resources/Sounds/Samples/2.wav b/Resources/Sounds/Samples/2.wav deleted file mode 100644 index ade2369..0000000 Binary files a/Resources/Sounds/Samples/2.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/20.mp3 b/Resources/Sounds/Samples/20.mp3 new file mode 100644 index 0000000..1458872 Binary files /dev/null and b/Resources/Sounds/Samples/20.mp3 differ diff --git a/Resources/Sounds/Samples/20.ogg b/Resources/Sounds/Samples/20.ogg new file mode 100644 index 0000000..6d88306 Binary files /dev/null and b/Resources/Sounds/Samples/20.ogg differ diff --git a/Resources/Sounds/Samples/20.wav b/Resources/Sounds/Samples/20.wav deleted file mode 100644 index eb2982f..0000000 Binary files a/Resources/Sounds/Samples/20.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/3.mp3 b/Resources/Sounds/Samples/3.mp3 new file mode 100644 index 0000000..610ea46 Binary files /dev/null and b/Resources/Sounds/Samples/3.mp3 differ diff --git a/Resources/Sounds/Samples/3.ogg b/Resources/Sounds/Samples/3.ogg new file mode 100644 index 0000000..672bc04 Binary files /dev/null and b/Resources/Sounds/Samples/3.ogg differ diff --git a/Resources/Sounds/Samples/3.wav b/Resources/Sounds/Samples/3.wav deleted file mode 100644 index d3127a5..0000000 Binary files a/Resources/Sounds/Samples/3.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/4.mp3 b/Resources/Sounds/Samples/4.mp3 new file mode 100644 index 0000000..cfd9a9a Binary files /dev/null and b/Resources/Sounds/Samples/4.mp3 differ diff --git a/Resources/Sounds/Samples/4.ogg b/Resources/Sounds/Samples/4.ogg new file mode 100644 index 0000000..641540d Binary files /dev/null and b/Resources/Sounds/Samples/4.ogg differ diff --git a/Resources/Sounds/Samples/4.wav b/Resources/Sounds/Samples/4.wav deleted file mode 100644 index b1d4624..0000000 Binary files a/Resources/Sounds/Samples/4.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/5.mp3 b/Resources/Sounds/Samples/5.mp3 new file mode 100644 index 0000000..df82756 Binary files /dev/null and b/Resources/Sounds/Samples/5.mp3 differ diff --git a/Resources/Sounds/Samples/5.ogg b/Resources/Sounds/Samples/5.ogg new file mode 100644 index 0000000..a9487d4 Binary files /dev/null and b/Resources/Sounds/Samples/5.ogg differ diff --git a/Resources/Sounds/Samples/5.wav b/Resources/Sounds/Samples/5.wav deleted file mode 100644 index fd0b946..0000000 Binary files a/Resources/Sounds/Samples/5.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/6.mp3 b/Resources/Sounds/Samples/6.mp3 new file mode 100644 index 0000000..b1e20f6 Binary files /dev/null and b/Resources/Sounds/Samples/6.mp3 differ diff --git a/Resources/Sounds/Samples/6.ogg b/Resources/Sounds/Samples/6.ogg new file mode 100644 index 0000000..507e50f Binary files /dev/null and b/Resources/Sounds/Samples/6.ogg differ diff --git a/Resources/Sounds/Samples/6.wav b/Resources/Sounds/Samples/6.wav deleted file mode 100644 index 49c3394..0000000 Binary files a/Resources/Sounds/Samples/6.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/7.mp3 b/Resources/Sounds/Samples/7.mp3 new file mode 100644 index 0000000..3a26644 Binary files /dev/null and b/Resources/Sounds/Samples/7.mp3 differ diff --git a/Resources/Sounds/Samples/7.ogg b/Resources/Sounds/Samples/7.ogg new file mode 100644 index 0000000..064814a Binary files /dev/null and b/Resources/Sounds/Samples/7.ogg differ diff --git a/Resources/Sounds/Samples/7.wav b/Resources/Sounds/Samples/7.wav deleted file mode 100644 index 89318b9..0000000 Binary files a/Resources/Sounds/Samples/7.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/8.mp3 b/Resources/Sounds/Samples/8.mp3 new file mode 100644 index 0000000..dab56c2 Binary files /dev/null and b/Resources/Sounds/Samples/8.mp3 differ diff --git a/Resources/Sounds/Samples/8.ogg b/Resources/Sounds/Samples/8.ogg new file mode 100644 index 0000000..3a100b0 Binary files /dev/null and b/Resources/Sounds/Samples/8.ogg differ diff --git a/Resources/Sounds/Samples/8.wav b/Resources/Sounds/Samples/8.wav deleted file mode 100644 index 7795784..0000000 Binary files a/Resources/Sounds/Samples/8.wav and /dev/null differ diff --git a/Resources/Sounds/Samples/9.mp3 b/Resources/Sounds/Samples/9.mp3 new file mode 100644 index 0000000..59e8c70 Binary files /dev/null and b/Resources/Sounds/Samples/9.mp3 differ diff --git a/Resources/Sounds/Samples/9.ogg b/Resources/Sounds/Samples/9.ogg new file mode 100644 index 0000000..8237f67 Binary files /dev/null and b/Resources/Sounds/Samples/9.ogg differ diff --git a/Resources/Sounds/Samples/9.wav b/Resources/Sounds/Samples/9.wav deleted file mode 100644 index a7953b0..0000000 Binary files a/Resources/Sounds/Samples/9.wav and /dev/null differ diff --git a/Resources/Sounds/clicks.mp3 b/Resources/Sounds/clicks.mp3 new file mode 100644 index 0000000..268df57 Binary files /dev/null and b/Resources/Sounds/clicks.mp3 differ diff --git a/Resources/Sounds/clicks.ogg b/Resources/Sounds/clicks.ogg new file mode 100644 index 0000000..58ae61e Binary files /dev/null and b/Resources/Sounds/clicks.ogg differ diff --git a/Resources/Sounds/intro.mp3 b/Resources/Sounds/intro.mp3 new file mode 100644 index 0000000..55f6aeb Binary files /dev/null and b/Resources/Sounds/intro.mp3 differ diff --git a/Resources/Sounds/intro.ogg b/Resources/Sounds/intro.ogg new file mode 100644 index 0000000..df0ecc5 Binary files /dev/null and b/Resources/Sounds/intro.ogg differ diff --git a/Resources/Sounds/clicks.wav b/Resources/Sounds/wavs/clicks.wav similarity index 100% rename from Resources/Sounds/clicks.wav rename to Resources/Sounds/wavs/clicks.wav diff --git a/Resources/Sounds/intro.wav b/Resources/Sounds/wavs/intro.wav similarity index 100% rename from Resources/Sounds/intro.wav rename to Resources/Sounds/wavs/intro.wav diff --git a/Resources/axis.png b/Resources/axis.png index f0e136f..bcfac47 100644 Binary files a/Resources/axis.png and b/Resources/axis.png differ diff --git a/Resources/pulsation.png b/Resources/pulsation.png index 8c9660c..b138ba2 100644 Binary files a/Resources/pulsation.png and b/Resources/pulsation.png differ diff --git a/VaporWaveWars/character.cpp b/VaporWaveWars/character.cpp index b351493..f32807c 100644 --- a/VaporWaveWars/character.cpp +++ b/VaporWaveWars/character.cpp @@ -51,23 +51,30 @@ void Character::setState(PlayerState::playerState state){ indexX = 0; indexY = 1 + magicNumber; std::string sample = "atk"+std::to_string(rand()%20+1); + SoundManager::setVolume(100,sample); + SoundManager::playSound(sample); //std::cout << "playing sample " << sample << std::endl; } else if (state == PlayerState::hurt){ - std::cout << "i am hurt" << std::endl; + //std::cout << "i am hurt" << std::endl; indexX = 0; indexY = 2 + magicNumber; std::string sample = "fail"+std::to_string(rand()%6+1); + SoundManager::setVolume(100,sample); + SoundManager::playSound(sample); //std::cout << "playing sample " << sample << std::endl; } else if (state == PlayerState::success){ - std::cout << "i am succeed!" << std::endl; + //std::cout << "i am succeed!" << std::endl; indexX = 0; indexY = 3 + magicNumber; - //std::string sample = "succeed"+std::to_string(rand()%6+1); - //SoundManager::playSound(sample); + std::string sample = "bona"+std::to_string(rand()%8+1); + SoundManager::setVolume(10,sample); + SoundManager::playSound(sample); + std::cout << "playing sample " << sample << std::endl; + } } diff --git a/VaporWaveWars/mygame.cpp b/VaporWaveWars/mygame.cpp index 3fb0d04..7b6a4e1 100644 --- a/VaporWaveWars/mygame.cpp +++ b/VaporWaveWars/mygame.cpp @@ -10,7 +10,6 @@ MyGame::MyGame() { _scenes[GameScene::credits] = _menu; std::cout << "in menu" << std::endl; SoundManager::load(); - SoundManager::setGlobalSoundVolumen(50); SoundManager::setLoop(true, "intro"); SoundManager::playMusic("intro"); } diff --git a/VaporWaveWars/player.cpp b/VaporWaveWars/player.cpp index ecc6786..0f9860e 100644 --- a/VaporWaveWars/player.cpp +++ b/VaporWaveWars/player.cpp @@ -26,6 +26,7 @@ bool Player::event(sf::Event e) { 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(); diff --git a/VaporWaveWars/soundmanager.cpp b/VaporWaveWars/soundmanager.cpp index 8e251f7..9f3eb36 100644 --- a/VaporWaveWars/soundmanager.cpp +++ b/VaporWaveWars/soundmanager.cpp @@ -39,6 +39,14 @@ sf::SoundBuffer SoundManager::note1; sf::SoundBuffer SoundManager::note2; sf::SoundBuffer SoundManager::note3; sf::SoundBuffer SoundManager::note4; +sf::SoundBuffer SoundManager::bona1; +sf::SoundBuffer SoundManager::bona2; +sf::SoundBuffer SoundManager::bona3; +sf::SoundBuffer SoundManager::bona4; +sf::SoundBuffer SoundManager::bona5; +sf::SoundBuffer SoundManager::bona6; +sf::SoundBuffer SoundManager::bona7; +sf::SoundBuffer SoundManager::bona8; std::map SoundManager::soundMap; std::map SoundManager::musicMap; @@ -50,68 +58,84 @@ void SoundManager::load(){ //LOAD HERE YOUR SOUNDS AND MUSIC /* Example: */ - musicMap["intro"].openFromFile(WORK_DIR+"Resources/Sounds/intro.wav"); - musicMap["clicks"].openFromFile(WORK_DIR+"Resources/Sounds/clicks.wav"); - ASSERT(atk1.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/1.wav")); + musicMap["intro"].openFromFile(WORK_DIR+"Resources/Sounds/intro.ogg"); + musicMap["clicks"].openFromFile(WORK_DIR+"Resources/Sounds/clicks.ogg"); + ASSERT(atk1.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/1.ogg")); soundMap["atk1"].setBuffer(atk1); - ASSERT(atk2.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/2.wav")); + ASSERT(atk2.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/2.ogg")); soundMap["atk2"].setBuffer(atk2); - ASSERT(atk3.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/3.wav")); + ASSERT(atk3.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/3.ogg")); soundMap["atk3"].setBuffer(atk3); - ASSERT(atk4.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/4.wav")); + ASSERT(atk4.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/4.ogg")); soundMap["atk4"].setBuffer(atk4); - ASSERT(atk5.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/5.wav")); + ASSERT(atk5.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/5.ogg")); soundMap["atk5"].setBuffer(atk5); - ASSERT(atk6.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/6.wav")); + ASSERT(atk6.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/6.ogg")); soundMap["atk6"].setBuffer(atk6); - ASSERT(atk7.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/7.wav")); + ASSERT(atk7.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/7.ogg")); soundMap["atk7"].setBuffer(atk7); - ASSERT(atk8.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/8.wav")); + ASSERT(atk8.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/8.ogg")); soundMap["atk8"].setBuffer(atk8); - ASSERT(atk9.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/9.wav")); + ASSERT(atk9.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/9.ogg")); soundMap["atk9"].setBuffer(atk9); - ASSERT(atk10.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/10.wav")); + ASSERT(atk10.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/10.ogg")); soundMap["atk10"].setBuffer(atk10); - ASSERT(atk11.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/11.wav")); + ASSERT(atk11.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/11.ogg")); soundMap["atk11"].setBuffer(atk11); - ASSERT(atk12.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/12.wav")); + ASSERT(atk12.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/12.ogg")); soundMap["atk12"].setBuffer(atk12); - ASSERT(atk13.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/13.wav")); + ASSERT(atk13.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/13.ogg")); soundMap["atk13"].setBuffer(atk13); - ASSERT(atk14.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/14.wav")); + ASSERT(atk14.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/14.ogg")); soundMap["atk14"].setBuffer(atk14); - ASSERT(atk15.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/15.wav")); + ASSERT(atk15.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/15.ogg")); soundMap["atk15"].setBuffer(atk15); - ASSERT(atk16.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/16.wav")); + ASSERT(atk16.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/16.ogg")); soundMap["atk16"].setBuffer(atk16); - ASSERT(atk17.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/17.wav")); + ASSERT(atk17.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/17.ogg")); soundMap["atk17"].setBuffer(atk17); - ASSERT(atk18.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/18.wav")); + ASSERT(atk18.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/18.ogg")); soundMap["atk18"].setBuffer(atk18); - ASSERT(atk19.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/19.wav")); + ASSERT(atk19.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/19.ogg")); soundMap["atk19"].setBuffer(atk19); - ASSERT(atk20.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/20.wav")); + ASSERT(atk20.loadFromFile(WORK_DIR+"Resources/Sounds/Samples/20.ogg")); soundMap["atk20"].setBuffer(atk20); - ASSERT(fail1.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/1.wav")); + ASSERT(fail1.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/1.ogg")); soundMap["fail1"].setBuffer(fail1); - ASSERT(fail2.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/2.wav")); + ASSERT(fail2.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/2.ogg")); soundMap["fail2"].setBuffer(fail2); - ASSERT(fail3.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/3.wav")); + ASSERT(fail3.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/3.ogg")); soundMap["fail3"].setBuffer(fail3); - ASSERT(fail4.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/4.wav")); + ASSERT(fail4.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/4.ogg")); soundMap["fail4"].setBuffer(fail4); - ASSERT(fail5.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/5.wav")); + ASSERT(fail5.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/5.ogg")); soundMap["fail5"].setBuffer(fail5); - ASSERT(fail6.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/6.wav")); + ASSERT(fail6.loadFromFile(WORK_DIR+"Resources/Sounds/Fails/6.ogg")); soundMap["fail6"].setBuffer(fail6); - ASSERT(note1.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/1.wav")); + ASSERT(note1.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/1.ogg")); soundMap["note1"].setBuffer(note1); - ASSERT(note2.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/2.wav")); + ASSERT(note2.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/2.ogg")); soundMap["note2"].setBuffer(note2); - ASSERT(note3.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/3.wav")); + ASSERT(note3.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/3.ogg")); soundMap["note3"].setBuffer(note3); - ASSERT(note4.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/4.wav")); + ASSERT(note4.loadFromFile(WORK_DIR+"Resources/Sounds/Notes/4.ogg")); soundMap["note4"].setBuffer(note4); + ASSERT(bona1.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/1.ogg")); + soundMap["bona1"].setBuffer(bona1); + ASSERT(bona2.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/2.ogg")); + soundMap["bona2"].setBuffer(bona2); + ASSERT(bona3.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/3.ogg")); + soundMap["bona3"].setBuffer(bona3); + ASSERT(bona4.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/4.ogg")); + soundMap["bona4"].setBuffer(bona4); + ASSERT(bona5.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/5.ogg")); + soundMap["bona5"].setBuffer(bona5); + ASSERT(bona6.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/6.ogg")); + soundMap["bona6"].setBuffer(bona6); + ASSERT(bona7.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/7.ogg")); + soundMap["bona7"].setBuffer(bona7); + ASSERT(bona8.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/8.ogg")); + soundMap["bona8"].setBuffer(bona8); } diff --git a/VaporWaveWars/soundmanager.hpp b/VaporWaveWars/soundmanager.hpp index 8aaae89..90bdb69 100644 --- a/VaporWaveWars/soundmanager.hpp +++ b/VaporWaveWars/soundmanager.hpp @@ -59,6 +59,14 @@ class SoundManager { static sf::SoundBuffer note2; static sf::SoundBuffer note3; static sf::SoundBuffer note4; + static sf::SoundBuffer bona1; + static sf::SoundBuffer bona2; + static sf::SoundBuffer bona3; + static sf::SoundBuffer bona4; + static sf::SoundBuffer bona5; + static sf::SoundBuffer bona6; + static sf::SoundBuffer bona7; + static sf::SoundBuffer bona8;