diff --git a/main.lua b/main.lua index f8df9ae3..3793b7ba 100644 --- a/main.lua +++ b/main.lua @@ -246,7 +246,7 @@ VOC.init{ 'mini','b2b','b3b', 'perfect_clear','half_clear', 'win','lose','bye', - 'test','happy','doubt','sad','egg', + 'test','happy','doubt', 'welcome_voc', } diff --git a/media/vocal/miku/egg.ogg b/media/vocal/miku/egg.ogg deleted file mode 100644 index 0f0a2d10..00000000 Binary files a/media/vocal/miku/egg.ogg and /dev/null differ diff --git a/media/vocal/miku/sad.ogg b/media/vocal/miku/sad.ogg deleted file mode 100644 index c23a7275..00000000 Binary files a/media/vocal/miku/sad.ogg and /dev/null differ diff --git a/media/vocal/miya/egg_1.ogg b/media/vocal/miya/egg_1.ogg deleted file mode 100644 index c91ce691..00000000 Binary files a/media/vocal/miya/egg_1.ogg and /dev/null differ diff --git a/media/vocal/miya/egg_2.ogg b/media/vocal/miya/egg_2.ogg deleted file mode 100644 index a7765e94..00000000 Binary files a/media/vocal/miya/egg_2.ogg and /dev/null differ diff --git a/media/vocal/miya/sad.ogg b/media/vocal/miya/sad.ogg deleted file mode 100644 index 4270f18c..00000000 Binary files a/media/vocal/miya/sad.ogg and /dev/null differ diff --git a/media/vocal/naki/b2b_1.ogg b/media/vocal/mono/b2b_1.ogg similarity index 100% rename from media/vocal/naki/b2b_1.ogg rename to media/vocal/mono/b2b_1.ogg diff --git a/media/vocal/naki/b2b_2.ogg b/media/vocal/mono/b2b_2.ogg similarity index 100% rename from media/vocal/naki/b2b_2.ogg rename to media/vocal/mono/b2b_2.ogg diff --git a/media/vocal/naki/b3b_1.ogg b/media/vocal/mono/b3b_1.ogg similarity index 100% rename from media/vocal/naki/b3b_1.ogg rename to media/vocal/mono/b3b_1.ogg diff --git a/media/vocal/naki/b3b_2.ogg b/media/vocal/mono/b3b_2.ogg similarity index 100% rename from media/vocal/naki/b3b_2.ogg rename to media/vocal/mono/b3b_2.ogg diff --git a/media/vocal/naki/double.ogg b/media/vocal/mono/double.ogg similarity index 100% rename from media/vocal/naki/double.ogg rename to media/vocal/mono/double.ogg diff --git a/media/vocal/naki/half_clear_1.ogg b/media/vocal/mono/half_clear_1.ogg similarity index 100% rename from media/vocal/naki/half_clear_1.ogg rename to media/vocal/mono/half_clear_1.ogg diff --git a/media/vocal/naki/ispin_1.ogg b/media/vocal/mono/ispin_1.ogg similarity index 100% rename from media/vocal/naki/ispin_1.ogg rename to media/vocal/mono/ispin_1.ogg diff --git a/media/vocal/naki/ispin_2.ogg b/media/vocal/mono/ispin_2.ogg similarity index 100% rename from media/vocal/naki/ispin_2.ogg rename to media/vocal/mono/ispin_2.ogg diff --git a/media/vocal/naki/ispin_3.ogg b/media/vocal/mono/ispin_3.ogg similarity index 100% rename from media/vocal/naki/ispin_3.ogg rename to media/vocal/mono/ispin_3.ogg diff --git a/media/vocal/naki/ispin_4.ogg b/media/vocal/mono/ispin_4.ogg similarity index 100% rename from media/vocal/naki/ispin_4.ogg rename to media/vocal/mono/ispin_4.ogg diff --git a/media/vocal/naki/jspin_1.ogg b/media/vocal/mono/jspin_1.ogg similarity index 100% rename from media/vocal/naki/jspin_1.ogg rename to media/vocal/mono/jspin_1.ogg diff --git a/media/vocal/naki/jspin_2.ogg b/media/vocal/mono/jspin_2.ogg similarity index 100% rename from media/vocal/naki/jspin_2.ogg rename to media/vocal/mono/jspin_2.ogg diff --git a/media/vocal/naki/jspin_3.ogg b/media/vocal/mono/jspin_3.ogg similarity index 100% rename from media/vocal/naki/jspin_3.ogg rename to media/vocal/mono/jspin_3.ogg diff --git a/media/vocal/naki/jspin_4.ogg b/media/vocal/mono/jspin_4.ogg similarity index 100% rename from media/vocal/naki/jspin_4.ogg rename to media/vocal/mono/jspin_4.ogg diff --git a/media/vocal/naki/lose_1.ogg b/media/vocal/mono/lose_1.ogg similarity index 100% rename from media/vocal/naki/lose_1.ogg rename to media/vocal/mono/lose_1.ogg diff --git a/media/vocal/naki/lose_2.ogg b/media/vocal/mono/lose_2.ogg similarity index 100% rename from media/vocal/naki/lose_2.ogg rename to media/vocal/mono/lose_2.ogg diff --git a/media/vocal/naki/lose_3.ogg b/media/vocal/mono/lose_3.ogg similarity index 100% rename from media/vocal/naki/lose_3.ogg rename to media/vocal/mono/lose_3.ogg diff --git a/media/vocal/naki/lspin_1.ogg b/media/vocal/mono/lspin_1.ogg similarity index 100% rename from media/vocal/naki/lspin_1.ogg rename to media/vocal/mono/lspin_1.ogg diff --git a/media/vocal/naki/lspin_2.ogg b/media/vocal/mono/lspin_2.ogg similarity index 100% rename from media/vocal/naki/lspin_2.ogg rename to media/vocal/mono/lspin_2.ogg diff --git a/media/vocal/naki/lspin_3.ogg b/media/vocal/mono/lspin_3.ogg similarity index 100% rename from media/vocal/naki/lspin_3.ogg rename to media/vocal/mono/lspin_3.ogg diff --git a/media/vocal/naki/mini_1.ogg b/media/vocal/mono/mini_1.ogg similarity index 100% rename from media/vocal/naki/mini_1.ogg rename to media/vocal/mono/mini_1.ogg diff --git a/media/vocal/naki/mini_2.ogg b/media/vocal/mono/mini_2.ogg similarity index 100% rename from media/vocal/naki/mini_2.ogg rename to media/vocal/mono/mini_2.ogg diff --git a/media/vocal/naki/mini_3.ogg b/media/vocal/mono/mini_3.ogg similarity index 100% rename from media/vocal/naki/mini_3.ogg rename to media/vocal/mono/mini_3.ogg diff --git a/media/vocal/naki/ospin_1.ogg b/media/vocal/mono/ospin_1.ogg similarity index 100% rename from media/vocal/naki/ospin_1.ogg rename to media/vocal/mono/ospin_1.ogg diff --git a/media/vocal/naki/ospin_2.ogg b/media/vocal/mono/ospin_2.ogg similarity index 100% rename from media/vocal/naki/ospin_2.ogg rename to media/vocal/mono/ospin_2.ogg diff --git a/media/vocal/naki/ospin_3.ogg b/media/vocal/mono/ospin_3.ogg similarity index 100% rename from media/vocal/naki/ospin_3.ogg rename to media/vocal/mono/ospin_3.ogg diff --git a/media/vocal/naki/perfect_clear.ogg b/media/vocal/mono/perfect_clear.ogg similarity index 100% rename from media/vocal/naki/perfect_clear.ogg rename to media/vocal/mono/perfect_clear.ogg diff --git a/media/vocal/naki/single_1.ogg b/media/vocal/mono/single_1.ogg similarity index 100% rename from media/vocal/naki/single_1.ogg rename to media/vocal/mono/single_1.ogg diff --git a/media/vocal/naki/single_2.ogg b/media/vocal/mono/single_2.ogg similarity index 100% rename from media/vocal/naki/single_2.ogg rename to media/vocal/mono/single_2.ogg diff --git a/media/vocal/naki/sspin_1.ogg b/media/vocal/mono/sspin_1.ogg similarity index 100% rename from media/vocal/naki/sspin_1.ogg rename to media/vocal/mono/sspin_1.ogg diff --git a/media/vocal/naki/sspin_2.ogg b/media/vocal/mono/sspin_2.ogg similarity index 100% rename from media/vocal/naki/sspin_2.ogg rename to media/vocal/mono/sspin_2.ogg diff --git a/media/vocal/naki/sspin_3.ogg b/media/vocal/mono/sspin_3.ogg similarity index 100% rename from media/vocal/naki/sspin_3.ogg rename to media/vocal/mono/sspin_3.ogg diff --git a/media/vocal/naki/techrash_1.ogg b/media/vocal/mono/techrash_1.ogg similarity index 100% rename from media/vocal/naki/techrash_1.ogg rename to media/vocal/mono/techrash_1.ogg diff --git a/media/vocal/naki/techrash_2.ogg b/media/vocal/mono/techrash_2.ogg similarity index 100% rename from media/vocal/naki/techrash_2.ogg rename to media/vocal/mono/techrash_2.ogg diff --git a/media/vocal/naki/test_1.ogg b/media/vocal/mono/test_1.ogg similarity index 100% rename from media/vocal/naki/test_1.ogg rename to media/vocal/mono/test_1.ogg diff --git a/media/vocal/naki/test_2.ogg b/media/vocal/mono/test_2.ogg similarity index 100% rename from media/vocal/naki/test_2.ogg rename to media/vocal/mono/test_2.ogg diff --git a/media/vocal/naki/triple.ogg b/media/vocal/mono/triple.ogg similarity index 100% rename from media/vocal/naki/triple.ogg rename to media/vocal/mono/triple.ogg diff --git a/media/vocal/naki/triple_1.ogg b/media/vocal/mono/triple_1.ogg similarity index 100% rename from media/vocal/naki/triple_1.ogg rename to media/vocal/mono/triple_1.ogg diff --git a/media/vocal/naki/tspin_1.ogg b/media/vocal/mono/tspin_1.ogg similarity index 100% rename from media/vocal/naki/tspin_1.ogg rename to media/vocal/mono/tspin_1.ogg diff --git a/media/vocal/naki/tspin_2.ogg b/media/vocal/mono/tspin_2.ogg similarity index 100% rename from media/vocal/naki/tspin_2.ogg rename to media/vocal/mono/tspin_2.ogg diff --git a/media/vocal/naki/tspin_3.ogg b/media/vocal/mono/tspin_3.ogg similarity index 100% rename from media/vocal/naki/tspin_3.ogg rename to media/vocal/mono/tspin_3.ogg diff --git a/media/vocal/naki/welcome_voc_1.ogg b/media/vocal/mono/welcome_voc_1.ogg similarity index 100% rename from media/vocal/naki/welcome_voc_1.ogg rename to media/vocal/mono/welcome_voc_1.ogg diff --git a/media/vocal/naki/welcome_voc_2.ogg b/media/vocal/mono/welcome_voc_2.ogg similarity index 100% rename from media/vocal/naki/welcome_voc_2.ogg rename to media/vocal/mono/welcome_voc_2.ogg diff --git a/media/vocal/naki/welcome_voc_3.ogg b/media/vocal/mono/welcome_voc_3.ogg similarity index 100% rename from media/vocal/naki/welcome_voc_3.ogg rename to media/vocal/mono/welcome_voc_3.ogg diff --git a/media/vocal/naki/win_1.ogg b/media/vocal/mono/win_1.ogg similarity index 100% rename from media/vocal/naki/win_1.ogg rename to media/vocal/mono/win_1.ogg diff --git a/media/vocal/naki/win_2.ogg b/media/vocal/mono/win_2.ogg similarity index 100% rename from media/vocal/naki/win_2.ogg rename to media/vocal/mono/win_2.ogg diff --git a/media/vocal/naki/win_3.ogg b/media/vocal/mono/win_3.ogg similarity index 100% rename from media/vocal/naki/win_3.ogg rename to media/vocal/mono/win_3.ogg diff --git a/media/vocal/naki/zspin_1.ogg b/media/vocal/mono/zspin_1.ogg similarity index 100% rename from media/vocal/naki/zspin_1.ogg rename to media/vocal/mono/zspin_1.ogg diff --git a/media/vocal/naki/zspin_2.ogg b/media/vocal/mono/zspin_2.ogg similarity index 100% rename from media/vocal/naki/zspin_2.ogg rename to media/vocal/mono/zspin_2.ogg diff --git a/media/vocal/naki/zspin_3.ogg b/media/vocal/mono/zspin_3.ogg similarity index 100% rename from media/vocal/naki/zspin_3.ogg rename to media/vocal/mono/zspin_3.ogg diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index abf0faf5..3367b596 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -1,7 +1,6 @@ local gc=love.graphics local sin=math.sin -local rnd=math.random local scene={} @@ -30,11 +29,7 @@ function scene.mouseDown(x,y) if t>2.6 and t<3 and not GAME.playing then loadGame('sprintSmooth',true) else - VOC.play( - (t<1.5 or t>15)and"doubt"or - rnd()<.8 and"happy"or - "egg" - ) + VOC.play((t<1.26 or t>6.26)and'doubt'or'happy') last=TIME() end end