diff --git a/main.lua b/main.lua index 3a0456b8..794b0957 100644 --- a/main.lua +++ b/main.lua @@ -25,7 +25,7 @@ TIME=love.timer.getTime -- Global Vars & Settings SFXPACKS={'chiptune'} -VOCPACKS={'miya','mono','xiaoya','miku','zundamon'} +VOCPACKS={'miya','mono','xiaoya','flore','miku','zundamon'} FIRSTLAUNCH=false DAILYLAUNCH=false @@ -271,6 +271,7 @@ IMG.init{ monoCH='media/image/characters/mono.png', xiaoyaCH='media/image/characters/xiaoya.png', xiaoyaOmino='media/image/characters/xiaoya_Omino.png', + floreCH='media/image/characters/flore.png', mikuCH='media/image/characters/miku.png', zundamonCH='media/image/characters/zundamon.png', z={ @@ -351,7 +352,7 @@ BGM.init((function() end)()) VOC.init{ 'zspin','sspin','jspin','lspin','tspin','ospin','ispin','pspin','qspin','fspin','espin','uspin','vspin','wspin','xspin','rspin','yspin','nspin','hspin','cspin', - 'single','double','triple','techrash','pentacrash','hexacrash', + 'single','double','triple','techrash','pentacrash','hexacrash','heptacrash','octacrash','nonacrash','decacrash','undecacrash','dodecacrash','tridecacrash','tetradecacrash','pentadecacrash','hexadecacrash','heptadecacrash','octadecacrash','nonadecacrash','ultracrash','impossicrash', 'mini','b2b','b3b', 'perfect_clear','half_clear', 'win','lose','bye', diff --git a/media/image/characters/flore.png b/media/image/characters/flore.png new file mode 100644 index 00000000..923c330f Binary files /dev/null and b/media/image/characters/flore.png differ diff --git a/media/vocal/flore/b2b_1.ogg b/media/vocal/flore/b2b_1.ogg new file mode 100644 index 00000000..39771001 Binary files /dev/null and b/media/vocal/flore/b2b_1.ogg differ diff --git a/media/vocal/flore/b2b_2.ogg b/media/vocal/flore/b2b_2.ogg new file mode 100644 index 00000000..37e79559 Binary files /dev/null and b/media/vocal/flore/b2b_2.ogg differ diff --git a/media/vocal/flore/b2b_3.ogg b/media/vocal/flore/b2b_3.ogg new file mode 100644 index 00000000..b8682b78 Binary files /dev/null and b/media/vocal/flore/b2b_3.ogg differ diff --git a/media/vocal/flore/b3b_1.ogg b/media/vocal/flore/b3b_1.ogg new file mode 100644 index 00000000..cb2d7758 Binary files /dev/null and b/media/vocal/flore/b3b_1.ogg differ diff --git a/media/vocal/flore/b3b_2.ogg b/media/vocal/flore/b3b_2.ogg new file mode 100644 index 00000000..24ef6a62 Binary files /dev/null and b/media/vocal/flore/b3b_2.ogg differ diff --git a/media/vocal/flore/b3b_3.ogg b/media/vocal/flore/b3b_3.ogg new file mode 100644 index 00000000..24d80be7 Binary files /dev/null and b/media/vocal/flore/b3b_3.ogg differ diff --git a/media/vocal/flore/bye_1.ogg b/media/vocal/flore/bye_1.ogg new file mode 100644 index 00000000..17234bff Binary files /dev/null and b/media/vocal/flore/bye_1.ogg differ diff --git a/media/vocal/flore/bye_2.ogg b/media/vocal/flore/bye_2.ogg new file mode 100644 index 00000000..44608266 Binary files /dev/null and b/media/vocal/flore/bye_2.ogg differ diff --git a/media/vocal/flore/bye_3.ogg b/media/vocal/flore/bye_3.ogg new file mode 100644 index 00000000..c55ad2ff Binary files /dev/null and b/media/vocal/flore/bye_3.ogg differ diff --git a/media/vocal/flore/bye_4.ogg b/media/vocal/flore/bye_4.ogg new file mode 100644 index 00000000..8bd4d2e3 Binary files /dev/null and b/media/vocal/flore/bye_4.ogg differ diff --git a/media/vocal/flore/bye_5.ogg b/media/vocal/flore/bye_5.ogg new file mode 100644 index 00000000..f7dde565 Binary files /dev/null and b/media/vocal/flore/bye_5.ogg differ diff --git a/media/vocal/flore/bye_6.ogg b/media/vocal/flore/bye_6.ogg new file mode 100644 index 00000000..96ce043f Binary files /dev/null and b/media/vocal/flore/bye_6.ogg differ diff --git a/media/vocal/flore/cspin.ogg b/media/vocal/flore/cspin.ogg new file mode 100644 index 00000000..a0618211 Binary files /dev/null and b/media/vocal/flore/cspin.ogg differ diff --git a/media/vocal/flore/decacrash_1.ogg b/media/vocal/flore/decacrash_1.ogg new file mode 100644 index 00000000..a57b8332 Binary files /dev/null and b/media/vocal/flore/decacrash_1.ogg differ diff --git a/media/vocal/flore/decacrash_2.ogg b/media/vocal/flore/decacrash_2.ogg new file mode 100644 index 00000000..abb73925 Binary files /dev/null and b/media/vocal/flore/decacrash_2.ogg differ diff --git a/media/vocal/flore/dodecacrash_1.ogg b/media/vocal/flore/dodecacrash_1.ogg new file mode 100644 index 00000000..ba192c29 Binary files /dev/null and b/media/vocal/flore/dodecacrash_1.ogg differ diff --git a/media/vocal/flore/double_1.ogg b/media/vocal/flore/double_1.ogg new file mode 100644 index 00000000..f7c33ffc Binary files /dev/null and b/media/vocal/flore/double_1.ogg differ diff --git a/media/vocal/flore/double_2.ogg b/media/vocal/flore/double_2.ogg new file mode 100644 index 00000000..9817a2be Binary files /dev/null and b/media/vocal/flore/double_2.ogg differ diff --git a/media/vocal/flore/double_3.ogg b/media/vocal/flore/double_3.ogg new file mode 100644 index 00000000..dbe251eb Binary files /dev/null and b/media/vocal/flore/double_3.ogg differ diff --git a/media/vocal/flore/doubt_1.ogg b/media/vocal/flore/doubt_1.ogg new file mode 100644 index 00000000..9453f860 Binary files /dev/null and b/media/vocal/flore/doubt_1.ogg differ diff --git a/media/vocal/flore/doubt_2.ogg b/media/vocal/flore/doubt_2.ogg new file mode 100644 index 00000000..c615a521 Binary files /dev/null and b/media/vocal/flore/doubt_2.ogg differ diff --git a/media/vocal/flore/doubt_3.ogg b/media/vocal/flore/doubt_3.ogg new file mode 100644 index 00000000..bb67115b Binary files /dev/null and b/media/vocal/flore/doubt_3.ogg differ diff --git a/media/vocal/flore/espin.ogg b/media/vocal/flore/espin.ogg new file mode 100644 index 00000000..34ea1fe6 Binary files /dev/null and b/media/vocal/flore/espin.ogg differ diff --git a/media/vocal/flore/fspin.ogg b/media/vocal/flore/fspin.ogg new file mode 100644 index 00000000..e4647701 Binary files /dev/null and b/media/vocal/flore/fspin.ogg differ diff --git a/media/vocal/flore/half_clear_1.ogg b/media/vocal/flore/half_clear_1.ogg new file mode 100644 index 00000000..7ba62f7b Binary files /dev/null and b/media/vocal/flore/half_clear_1.ogg differ diff --git a/media/vocal/flore/half_clear_2.ogg b/media/vocal/flore/half_clear_2.ogg new file mode 100644 index 00000000..00dbd0c5 Binary files /dev/null and b/media/vocal/flore/half_clear_2.ogg differ diff --git a/media/vocal/flore/happy_1.ogg b/media/vocal/flore/happy_1.ogg new file mode 100644 index 00000000..925aa3f2 Binary files /dev/null and b/media/vocal/flore/happy_1.ogg differ diff --git a/media/vocal/flore/happy_2.ogg b/media/vocal/flore/happy_2.ogg new file mode 100644 index 00000000..aa283dac Binary files /dev/null and b/media/vocal/flore/happy_2.ogg differ diff --git a/media/vocal/flore/happy_3.ogg b/media/vocal/flore/happy_3.ogg new file mode 100644 index 00000000..bf653259 Binary files /dev/null and b/media/vocal/flore/happy_3.ogg differ diff --git a/media/vocal/flore/heptacrash_1.ogg b/media/vocal/flore/heptacrash_1.ogg new file mode 100644 index 00000000..8895a1da Binary files /dev/null and b/media/vocal/flore/heptacrash_1.ogg differ diff --git a/media/vocal/flore/heptacrash_2.ogg b/media/vocal/flore/heptacrash_2.ogg new file mode 100644 index 00000000..e8dea3b0 Binary files /dev/null and b/media/vocal/flore/heptacrash_2.ogg differ diff --git a/media/vocal/flore/heptadecacrash_1.ogg b/media/vocal/flore/heptadecacrash_1.ogg new file mode 100644 index 00000000..4e350a2a Binary files /dev/null and b/media/vocal/flore/heptadecacrash_1.ogg differ diff --git a/media/vocal/flore/hexacrash_1.ogg b/media/vocal/flore/hexacrash_1.ogg new file mode 100644 index 00000000..184074fc Binary files /dev/null and b/media/vocal/flore/hexacrash_1.ogg differ diff --git a/media/vocal/flore/hexacrash_2.ogg b/media/vocal/flore/hexacrash_2.ogg new file mode 100644 index 00000000..761057bf Binary files /dev/null and b/media/vocal/flore/hexacrash_2.ogg differ diff --git a/media/vocal/flore/hexacrash_3.ogg b/media/vocal/flore/hexacrash_3.ogg new file mode 100644 index 00000000..a5dfbb61 Binary files /dev/null and b/media/vocal/flore/hexacrash_3.ogg differ diff --git a/media/vocal/flore/hexadecacrash_1.ogg b/media/vocal/flore/hexadecacrash_1.ogg new file mode 100644 index 00000000..34e1be53 Binary files /dev/null and b/media/vocal/flore/hexadecacrash_1.ogg differ diff --git a/media/vocal/flore/hspin.ogg b/media/vocal/flore/hspin.ogg new file mode 100644 index 00000000..49d212da Binary files /dev/null and b/media/vocal/flore/hspin.ogg differ diff --git a/media/vocal/flore/impossicrash_1.ogg b/media/vocal/flore/impossicrash_1.ogg new file mode 100644 index 00000000..ae159a37 Binary files /dev/null and b/media/vocal/flore/impossicrash_1.ogg differ diff --git a/media/vocal/flore/ispin_1.ogg b/media/vocal/flore/ispin_1.ogg new file mode 100644 index 00000000..003f7f53 Binary files /dev/null and b/media/vocal/flore/ispin_1.ogg differ diff --git a/media/vocal/flore/ispin_2.ogg b/media/vocal/flore/ispin_2.ogg new file mode 100644 index 00000000..fd0ca1b8 Binary files /dev/null and b/media/vocal/flore/ispin_2.ogg differ diff --git a/media/vocal/flore/jspin_1.ogg b/media/vocal/flore/jspin_1.ogg new file mode 100644 index 00000000..1b37611e Binary files /dev/null and b/media/vocal/flore/jspin_1.ogg differ diff --git a/media/vocal/flore/jspin_2.ogg b/media/vocal/flore/jspin_2.ogg new file mode 100644 index 00000000..197c61c1 Binary files /dev/null and b/media/vocal/flore/jspin_2.ogg differ diff --git a/media/vocal/flore/lose_1.ogg b/media/vocal/flore/lose_1.ogg new file mode 100644 index 00000000..0032572d Binary files /dev/null and b/media/vocal/flore/lose_1.ogg differ diff --git a/media/vocal/flore/lose_2.ogg b/media/vocal/flore/lose_2.ogg new file mode 100644 index 00000000..80d86e2b Binary files /dev/null and b/media/vocal/flore/lose_2.ogg differ diff --git a/media/vocal/flore/lose_3.ogg b/media/vocal/flore/lose_3.ogg new file mode 100644 index 00000000..1fa9164e Binary files /dev/null and b/media/vocal/flore/lose_3.ogg differ diff --git a/media/vocal/flore/lose_4.ogg b/media/vocal/flore/lose_4.ogg new file mode 100644 index 00000000..06b8f33a Binary files /dev/null and b/media/vocal/flore/lose_4.ogg differ diff --git a/media/vocal/flore/lose_5.ogg b/media/vocal/flore/lose_5.ogg new file mode 100644 index 00000000..427ed6b6 Binary files /dev/null and b/media/vocal/flore/lose_5.ogg differ diff --git a/media/vocal/flore/lose_6.ogg b/media/vocal/flore/lose_6.ogg new file mode 100644 index 00000000..cb134001 Binary files /dev/null and b/media/vocal/flore/lose_6.ogg differ diff --git a/media/vocal/flore/lspin_1.ogg b/media/vocal/flore/lspin_1.ogg new file mode 100644 index 00000000..fdb09d7d Binary files /dev/null and b/media/vocal/flore/lspin_1.ogg differ diff --git a/media/vocal/flore/lspin_2.ogg b/media/vocal/flore/lspin_2.ogg new file mode 100644 index 00000000..e949a8f6 Binary files /dev/null and b/media/vocal/flore/lspin_2.ogg differ diff --git a/media/vocal/flore/mini_1.ogg b/media/vocal/flore/mini_1.ogg new file mode 100644 index 00000000..00c0fae2 Binary files /dev/null and b/media/vocal/flore/mini_1.ogg differ diff --git a/media/vocal/flore/mini_2.ogg b/media/vocal/flore/mini_2.ogg new file mode 100644 index 00000000..e416a566 Binary files /dev/null and b/media/vocal/flore/mini_2.ogg differ diff --git a/media/vocal/flore/mini_3.ogg b/media/vocal/flore/mini_3.ogg new file mode 100644 index 00000000..36d827d7 Binary files /dev/null and b/media/vocal/flore/mini_3.ogg differ diff --git a/media/vocal/flore/nonacrash_1.ogg b/media/vocal/flore/nonacrash_1.ogg new file mode 100644 index 00000000..2f9e8a52 Binary files /dev/null and b/media/vocal/flore/nonacrash_1.ogg differ diff --git a/media/vocal/flore/nonacrash_2.ogg b/media/vocal/flore/nonacrash_2.ogg new file mode 100644 index 00000000..6f2c159d Binary files /dev/null and b/media/vocal/flore/nonacrash_2.ogg differ diff --git a/media/vocal/flore/nonadecacrash_1.ogg b/media/vocal/flore/nonadecacrash_1.ogg new file mode 100644 index 00000000..5e2f5cc9 Binary files /dev/null and b/media/vocal/flore/nonadecacrash_1.ogg differ diff --git a/media/vocal/flore/nspin.ogg b/media/vocal/flore/nspin.ogg new file mode 100644 index 00000000..11b7f6fa Binary files /dev/null and b/media/vocal/flore/nspin.ogg differ diff --git a/media/vocal/flore/octacrash_1.ogg b/media/vocal/flore/octacrash_1.ogg new file mode 100644 index 00000000..a41ae17c Binary files /dev/null and b/media/vocal/flore/octacrash_1.ogg differ diff --git a/media/vocal/flore/octacrash_2.ogg b/media/vocal/flore/octacrash_2.ogg new file mode 100644 index 00000000..97d357c0 Binary files /dev/null and b/media/vocal/flore/octacrash_2.ogg differ diff --git a/media/vocal/flore/octadecacrash_1.ogg b/media/vocal/flore/octadecacrash_1.ogg new file mode 100644 index 00000000..da9273b5 Binary files /dev/null and b/media/vocal/flore/octadecacrash_1.ogg differ diff --git a/media/vocal/flore/ospin.ogg b/media/vocal/flore/ospin.ogg new file mode 100644 index 00000000..437a1a89 Binary files /dev/null and b/media/vocal/flore/ospin.ogg differ diff --git a/media/vocal/flore/ospin_1.ogg b/media/vocal/flore/ospin_1.ogg new file mode 100644 index 00000000..042de6a2 Binary files /dev/null and b/media/vocal/flore/ospin_1.ogg differ diff --git a/media/vocal/flore/pentacrash_1.ogg b/media/vocal/flore/pentacrash_1.ogg new file mode 100644 index 00000000..45b96ce7 Binary files /dev/null and b/media/vocal/flore/pentacrash_1.ogg differ diff --git a/media/vocal/flore/pentacrash_2.ogg b/media/vocal/flore/pentacrash_2.ogg new file mode 100644 index 00000000..71c94804 Binary files /dev/null and b/media/vocal/flore/pentacrash_2.ogg differ diff --git a/media/vocal/flore/pentacrash_3.ogg b/media/vocal/flore/pentacrash_3.ogg new file mode 100644 index 00000000..c16f7918 Binary files /dev/null and b/media/vocal/flore/pentacrash_3.ogg differ diff --git a/media/vocal/flore/pentadecacrash_1.ogg b/media/vocal/flore/pentadecacrash_1.ogg new file mode 100644 index 00000000..187af33f Binary files /dev/null and b/media/vocal/flore/pentadecacrash_1.ogg differ diff --git a/media/vocal/flore/perfect_clear_1.ogg b/media/vocal/flore/perfect_clear_1.ogg new file mode 100644 index 00000000..769c66af Binary files /dev/null and b/media/vocal/flore/perfect_clear_1.ogg differ diff --git a/media/vocal/flore/perfect_clear_2.ogg b/media/vocal/flore/perfect_clear_2.ogg new file mode 100644 index 00000000..5aafb828 Binary files /dev/null and b/media/vocal/flore/perfect_clear_2.ogg differ diff --git a/media/vocal/flore/pspin.ogg b/media/vocal/flore/pspin.ogg new file mode 100644 index 00000000..0995e507 Binary files /dev/null and b/media/vocal/flore/pspin.ogg differ diff --git a/media/vocal/flore/qspin.ogg b/media/vocal/flore/qspin.ogg new file mode 100644 index 00000000..1a2b466b Binary files /dev/null and b/media/vocal/flore/qspin.ogg differ diff --git a/media/vocal/flore/rspin.ogg b/media/vocal/flore/rspin.ogg new file mode 100644 index 00000000..0d4c65c2 Binary files /dev/null and b/media/vocal/flore/rspin.ogg differ diff --git a/media/vocal/flore/single_1.ogg b/media/vocal/flore/single_1.ogg new file mode 100644 index 00000000..392b5a89 Binary files /dev/null and b/media/vocal/flore/single_1.ogg differ diff --git a/media/vocal/flore/single_2.ogg b/media/vocal/flore/single_2.ogg new file mode 100644 index 00000000..eb8554f0 Binary files /dev/null and b/media/vocal/flore/single_2.ogg differ diff --git a/media/vocal/flore/single_3.ogg b/media/vocal/flore/single_3.ogg new file mode 100644 index 00000000..048f871f Binary files /dev/null and b/media/vocal/flore/single_3.ogg differ diff --git a/media/vocal/flore/sspin_1.ogg b/media/vocal/flore/sspin_1.ogg new file mode 100644 index 00000000..670e3047 Binary files /dev/null and b/media/vocal/flore/sspin_1.ogg differ diff --git a/media/vocal/flore/sspin_2.ogg b/media/vocal/flore/sspin_2.ogg new file mode 100644 index 00000000..61125ae6 Binary files /dev/null and b/media/vocal/flore/sspin_2.ogg differ diff --git a/media/vocal/flore/techrash_1.ogg b/media/vocal/flore/techrash_1.ogg new file mode 100644 index 00000000..2cfe9e43 Binary files /dev/null and b/media/vocal/flore/techrash_1.ogg differ diff --git a/media/vocal/flore/techrash_2.ogg b/media/vocal/flore/techrash_2.ogg new file mode 100644 index 00000000..c760b6d1 Binary files /dev/null and b/media/vocal/flore/techrash_2.ogg differ diff --git a/media/vocal/flore/techrash_3.ogg b/media/vocal/flore/techrash_3.ogg new file mode 100644 index 00000000..6c74f938 Binary files /dev/null and b/media/vocal/flore/techrash_3.ogg differ diff --git a/media/vocal/flore/test_1.ogg b/media/vocal/flore/test_1.ogg new file mode 100644 index 00000000..37fb7073 Binary files /dev/null and b/media/vocal/flore/test_1.ogg differ diff --git a/media/vocal/flore/test_2.ogg b/media/vocal/flore/test_2.ogg new file mode 100644 index 00000000..9d608c75 Binary files /dev/null and b/media/vocal/flore/test_2.ogg differ diff --git a/media/vocal/flore/test_3.ogg b/media/vocal/flore/test_3.ogg new file mode 100644 index 00000000..966a4b8b Binary files /dev/null and b/media/vocal/flore/test_3.ogg differ diff --git a/media/vocal/flore/test_4.ogg b/media/vocal/flore/test_4.ogg new file mode 100644 index 00000000..31d4f420 Binary files /dev/null and b/media/vocal/flore/test_4.ogg differ diff --git a/media/vocal/flore/tetradecacrash_1.ogg b/media/vocal/flore/tetradecacrash_1.ogg new file mode 100644 index 00000000..23a0cf12 Binary files /dev/null and b/media/vocal/flore/tetradecacrash_1.ogg differ diff --git a/media/vocal/flore/tridecacrash_1.ogg b/media/vocal/flore/tridecacrash_1.ogg new file mode 100644 index 00000000..8dd702d5 Binary files /dev/null and b/media/vocal/flore/tridecacrash_1.ogg differ diff --git a/media/vocal/flore/triple_1.ogg b/media/vocal/flore/triple_1.ogg new file mode 100644 index 00000000..d8c99d6f Binary files /dev/null and b/media/vocal/flore/triple_1.ogg differ diff --git a/media/vocal/flore/triple_2.ogg b/media/vocal/flore/triple_2.ogg new file mode 100644 index 00000000..45b349e1 Binary files /dev/null and b/media/vocal/flore/triple_2.ogg differ diff --git a/media/vocal/flore/triple_3.ogg b/media/vocal/flore/triple_3.ogg new file mode 100644 index 00000000..42756d34 Binary files /dev/null and b/media/vocal/flore/triple_3.ogg differ diff --git a/media/vocal/flore/tspin_1.ogg b/media/vocal/flore/tspin_1.ogg new file mode 100644 index 00000000..95f65ce4 Binary files /dev/null and b/media/vocal/flore/tspin_1.ogg differ diff --git a/media/vocal/flore/tspin_2.ogg b/media/vocal/flore/tspin_2.ogg new file mode 100644 index 00000000..d2a9919e Binary files /dev/null and b/media/vocal/flore/tspin_2.ogg differ diff --git a/media/vocal/flore/ultracrash_1.ogg b/media/vocal/flore/ultracrash_1.ogg new file mode 100644 index 00000000..17216343 Binary files /dev/null and b/media/vocal/flore/ultracrash_1.ogg differ diff --git a/media/vocal/flore/undecacrash_1.ogg b/media/vocal/flore/undecacrash_1.ogg new file mode 100644 index 00000000..9d7aab01 Binary files /dev/null and b/media/vocal/flore/undecacrash_1.ogg differ diff --git a/media/vocal/flore/uspin.ogg b/media/vocal/flore/uspin.ogg new file mode 100644 index 00000000..cea69dd9 Binary files /dev/null and b/media/vocal/flore/uspin.ogg differ diff --git a/media/vocal/flore/vspin.ogg b/media/vocal/flore/vspin.ogg new file mode 100644 index 00000000..f20235df Binary files /dev/null and b/media/vocal/flore/vspin.ogg differ diff --git a/media/vocal/flore/welcome_1.ogg b/media/vocal/flore/welcome_1.ogg new file mode 100644 index 00000000..28dd481a Binary files /dev/null and b/media/vocal/flore/welcome_1.ogg differ diff --git a/media/vocal/flore/welcome_2.ogg b/media/vocal/flore/welcome_2.ogg new file mode 100644 index 00000000..a1eec9b6 Binary files /dev/null and b/media/vocal/flore/welcome_2.ogg differ diff --git a/media/vocal/flore/welcome_3.ogg b/media/vocal/flore/welcome_3.ogg new file mode 100644 index 00000000..9093d478 Binary files /dev/null and b/media/vocal/flore/welcome_3.ogg differ diff --git a/media/vocal/flore/welcome_4.ogg b/media/vocal/flore/welcome_4.ogg new file mode 100644 index 00000000..4da82cd5 Binary files /dev/null and b/media/vocal/flore/welcome_4.ogg differ diff --git a/media/vocal/flore/welcome_5.ogg b/media/vocal/flore/welcome_5.ogg new file mode 100644 index 00000000..795c3b03 Binary files /dev/null and b/media/vocal/flore/welcome_5.ogg differ diff --git a/media/vocal/flore/welcome_6.ogg b/media/vocal/flore/welcome_6.ogg new file mode 100644 index 00000000..90921af2 Binary files /dev/null and b/media/vocal/flore/welcome_6.ogg differ diff --git a/media/vocal/flore/win_1.ogg b/media/vocal/flore/win_1.ogg new file mode 100644 index 00000000..574f33a3 Binary files /dev/null and b/media/vocal/flore/win_1.ogg differ diff --git a/media/vocal/flore/win_2.ogg b/media/vocal/flore/win_2.ogg new file mode 100644 index 00000000..aa2c8a0f Binary files /dev/null and b/media/vocal/flore/win_2.ogg differ diff --git a/media/vocal/flore/win_3.ogg b/media/vocal/flore/win_3.ogg new file mode 100644 index 00000000..336e321a Binary files /dev/null and b/media/vocal/flore/win_3.ogg differ diff --git a/media/vocal/flore/win_4.ogg b/media/vocal/flore/win_4.ogg new file mode 100644 index 00000000..5c4db48b Binary files /dev/null and b/media/vocal/flore/win_4.ogg differ diff --git a/media/vocal/flore/win_5.ogg b/media/vocal/flore/win_5.ogg new file mode 100644 index 00000000..c5be6be1 Binary files /dev/null and b/media/vocal/flore/win_5.ogg differ diff --git a/media/vocal/flore/win_6.ogg b/media/vocal/flore/win_6.ogg new file mode 100644 index 00000000..d58806c4 Binary files /dev/null and b/media/vocal/flore/win_6.ogg differ diff --git a/media/vocal/flore/wspin.ogg b/media/vocal/flore/wspin.ogg new file mode 100644 index 00000000..ccf3a750 Binary files /dev/null and b/media/vocal/flore/wspin.ogg differ diff --git a/media/vocal/flore/xspin.ogg b/media/vocal/flore/xspin.ogg new file mode 100644 index 00000000..c3ef14e8 Binary files /dev/null and b/media/vocal/flore/xspin.ogg differ diff --git a/media/vocal/flore/yspin.ogg b/media/vocal/flore/yspin.ogg new file mode 100644 index 00000000..11e0c91f Binary files /dev/null and b/media/vocal/flore/yspin.ogg differ diff --git a/media/vocal/flore/zspin_1.ogg b/media/vocal/flore/zspin_1.ogg new file mode 100644 index 00000000..8c75a541 Binary files /dev/null and b/media/vocal/flore/zspin_1.ogg differ diff --git a/media/vocal/flore/zspin_2.ogg b/media/vocal/flore/zspin_2.ogg new file mode 100644 index 00000000..90ed0f6d Binary files /dev/null and b/media/vocal/flore/zspin_2.ogg differ diff --git a/parts/eventsets/stack_u.lua b/parts/eventsets/stack_u.lua index e9877d83..c04a389f 100644 --- a/parts/eventsets/stack_u.lua +++ b/parts/eventsets/stack_u.lua @@ -26,6 +26,7 @@ return { P.garbageBeneath=P.garbageBeneath-bonus end end + P:freshBlock('push') end end, } \ No newline at end of file diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index 103c3cb5..a79828d1 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -250,7 +250,7 @@ end function royaleLevelup() GAME.stage=GAME.stage+1 local spd - TEXT.show(text.royale_remain:gsub("$1",#PLY_ALIVE),640,200,40,'beat',.3) + TEXT.show(text.royale_remain:repD(#PLY_ALIVE),640,200,40,'beat',.3) if GAME.stage==2 then spd=30 elseif GAME.stage==3 then diff --git a/parts/player/player.lua b/parts/player/player.lua index 3b1878fb..34f70158 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -67,7 +67,7 @@ function Player:popScore(score) end end function Player:stageComplete(stage) - self:_showText(text.stage:gsub("$1",stage),0,-120,60,'fly',1.26) + self:_showText(text.stage:repD(stage),0,-120,60,'fly',1.26) end function Player:createLockFX() if self.gameEnv.lockFX then @@ -1505,7 +1505,7 @@ do local reDef={0,1,1,2,3,3,4,4,5} local spinVoice={'zspin','sspin','jspin','lspin','tspin','ospin','ispin','zspin','sspin','pspin','qspin','fspin','espin','tspin','uspin','vspin','wspin','xspin','jspin','lspin','rspin','yspin','nspin','hspin','ispin','ispin','cspin','ispin','ospin'} - local clearVoice={'single','double','triple','techrash','pentacrash','hexacrash'} + local clearVoice={'single','double','triple','techrash','pentacrash','hexacrash','heptacrash','octacrash','nonacrash','decacrash','undecacrash','dodecacrash','tridecacrash','tetradecacrash','pentadecacrash','hexadecacrash','heptadecacrash','octadecacrash','nonadecacrash','ultracrash','impossicrash'} local spinSFX={[0]='spin_0','spin_1','spin_2'} local renSFX={} for i=1,11 do renSFX[i]='ren_'..i end local finesseList={ @@ -2106,8 +2106,11 @@ do local _cc,_gbcc=self:_checkClear(self.field,start,height) if _cc>0 then playClearSFX(_cc) + if self.sound then + VOC.play(clearVoice[min(_cc,21)],VOC.getFreeChannel()) + end self:showText(text.clear[min(_cc,21)],0,0,75,'beat',.4) - if _cc>6 then self:showText(text.cleared:gsub("$1",_cc),0,55,30,'zoomout',.4) end + if _cc>6 then self:showText(text.cleared:repD(_cc),0,55,30,'zoomout',.4) end self:_removeClearedLines() self:_updateFalling(self.gameEnv.fall) if _cc>=4 then diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 1683784f..d82dd610 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -46,10 +46,11 @@ end function scene.draw() gc.setColor(1,1,1) gc.push('transform') + local clickTime=TIME()-last1 if vocPack=="miya" then gc.translate(780,340+6*sin(TIME()*.5)) gc.draw(IMG.miyaGlow,-4,-4) - if TIME()-last1<1 then + if clickTime<1 then if TIME()%60>30 then gc.draw(IMG.miyaCH3) else @@ -61,16 +62,19 @@ function scene.draw() gc.draw(IMG.miyaCH2) end gc.translate(0,-6*sin(TIME()*.5)) - gc.setColor(1,1,1,1-(TIME()-last1)) + gc.setColor(1,1,1,1-(clickTime)) gc.draw(IMG.miyaHeart,162,52,nil,.3) elseif vocPack=="mono" then - local jump=math.max(30-(TIME()-last1)*60,0)%10 + local jump=math.max(30-(clickTime)*60,0)%10 gc.translate(730,340+6*sin(TIME()*.5)+(jump-10)*jump*.3) gc.draw(IMG.monoCH) elseif vocPack=="xiaoya" then gc.translate(770,340+4*sin(TIME()*.5)) gc.draw(IMG.xiaoyaCH) - gc.draw(IMG.xiaoyaOmino,16,168,26/(1+TIME()-last1),.36,.36,33,37) + gc.draw(IMG.xiaoyaOmino,16,168,26/(1+clickTime),.36,.36,33,37) + elseif vocPack=="flore" then + gc.translate(770+56*sin(clickTime*26)/(clickTime+.56)^2/20,300+12*sin(TIME()*.5)) + gc.draw(IMG.floreCH,nil,nil,nil) elseif vocPack=="miku" then gc.translate(700,320+12*sin(TIME()*.5)) gc.draw(IMG.mikuCH,nil,nil,nil,.8)