diff --git a/main.lua b/main.lua index 562fbee7..1fe1620a 100644 --- a/main.lua +++ b/main.lua @@ -211,7 +211,7 @@ BGM.init((function() return L end)()) VOC.init{ - 'zspin','sspin','lspin','jspin','tspin','ospin','ispin', + 'zspin','sspin','jspin','lspin','tspin','ospin','ispin','pspin','qspin','fspin','espin','uspin','vspin','wspin','xspin','rspin','yspin','nspin','hspin', 'single','double','triple','techrash', 'mini','b2b','b3b', 'perfect_clear','half_clear', @@ -238,7 +238,7 @@ LANG.init( { block={ "Z","S","J","L","T","O","I", - "Z5","S5","Q","P","F","E", + "Z5","S5","P","Q","F","E", "T5","U","V","W","X", "J5","L5","R","Y","N","H","I5", "I3","C","I2","O1" diff --git a/media/VOICE/miku/b2b.ogg b/media/VOICE/miku/b2b.ogg new file mode 100644 index 00000000..535a6bde Binary files /dev/null and b/media/VOICE/miku/b2b.ogg differ diff --git a/media/VOICE/miku/b3b.ogg b/media/VOICE/miku/b3b.ogg new file mode 100644 index 00000000..bc9d8c63 Binary files /dev/null and b/media/VOICE/miku/b3b.ogg differ diff --git a/media/VOICE/miku/bye.ogg b/media/VOICE/miku/bye.ogg new file mode 100644 index 00000000..fdc7125d Binary files /dev/null and b/media/VOICE/miku/bye.ogg differ diff --git a/media/VOICE/miku/cspin.ogg b/media/VOICE/miku/cspin.ogg new file mode 100644 index 00000000..270146a5 Binary files /dev/null and b/media/VOICE/miku/cspin.ogg differ diff --git a/media/VOICE/miku/double.ogg b/media/VOICE/miku/double.ogg new file mode 100644 index 00000000..9b96d72f Binary files /dev/null and b/media/VOICE/miku/double.ogg differ diff --git a/media/VOICE/miku/doubt_1.ogg b/media/VOICE/miku/doubt_1.ogg new file mode 100644 index 00000000..38c8aaa2 Binary files /dev/null and b/media/VOICE/miku/doubt_1.ogg differ diff --git a/media/VOICE/miku/doubt_2.ogg b/media/VOICE/miku/doubt_2.ogg new file mode 100644 index 00000000..74af7888 Binary files /dev/null and b/media/VOICE/miku/doubt_2.ogg differ diff --git a/media/VOICE/miku/egg.ogg b/media/VOICE/miku/egg.ogg new file mode 100644 index 00000000..0f0a2d10 Binary files /dev/null and b/media/VOICE/miku/egg.ogg differ diff --git a/media/VOICE/miku/espin.ogg b/media/VOICE/miku/espin.ogg new file mode 100644 index 00000000..0a1f29df Binary files /dev/null and b/media/VOICE/miku/espin.ogg differ diff --git a/media/VOICE/miku/fspin.ogg b/media/VOICE/miku/fspin.ogg new file mode 100644 index 00000000..6c6f1767 Binary files /dev/null and b/media/VOICE/miku/fspin.ogg differ diff --git a/media/VOICE/miku/half_clear.ogg b/media/VOICE/miku/half_clear.ogg new file mode 100644 index 00000000..15cca41d Binary files /dev/null and b/media/VOICE/miku/half_clear.ogg differ diff --git a/media/VOICE/miku/happy.ogg b/media/VOICE/miku/happy.ogg new file mode 100644 index 00000000..277b93ea Binary files /dev/null and b/media/VOICE/miku/happy.ogg differ diff --git a/media/VOICE/miku/hspin.ogg b/media/VOICE/miku/hspin.ogg new file mode 100644 index 00000000..7a93649c Binary files /dev/null and b/media/VOICE/miku/hspin.ogg differ diff --git a/media/VOICE/miku/ispin.ogg b/media/VOICE/miku/ispin.ogg new file mode 100644 index 00000000..57261336 Binary files /dev/null and b/media/VOICE/miku/ispin.ogg differ diff --git a/media/VOICE/miku/jspin.ogg b/media/VOICE/miku/jspin.ogg new file mode 100644 index 00000000..b822c278 Binary files /dev/null and b/media/VOICE/miku/jspin.ogg differ diff --git a/media/VOICE/miku/lose.ogg b/media/VOICE/miku/lose.ogg new file mode 100644 index 00000000..411ae701 Binary files /dev/null and b/media/VOICE/miku/lose.ogg differ diff --git a/media/VOICE/miku/lspin.ogg b/media/VOICE/miku/lspin.ogg new file mode 100644 index 00000000..af278090 Binary files /dev/null and b/media/VOICE/miku/lspin.ogg differ diff --git a/media/VOICE/miku/mini.ogg b/media/VOICE/miku/mini.ogg new file mode 100644 index 00000000..fc447119 Binary files /dev/null and b/media/VOICE/miku/mini.ogg differ diff --git a/media/VOICE/miku/nspin.ogg b/media/VOICE/miku/nspin.ogg new file mode 100644 index 00000000..386dd9cf Binary files /dev/null and b/media/VOICE/miku/nspin.ogg differ diff --git a/media/VOICE/miku/nya.ogg b/media/VOICE/miku/nya.ogg new file mode 100644 index 00000000..891eb817 Binary files /dev/null and b/media/VOICE/miku/nya.ogg differ diff --git a/media/VOICE/miku/ospin.ogg b/media/VOICE/miku/ospin.ogg new file mode 100644 index 00000000..3f9dff65 Binary files /dev/null and b/media/VOICE/miku/ospin.ogg differ diff --git a/media/VOICE/miku/pentacrash.ogg b/media/VOICE/miku/pentacrash.ogg new file mode 100644 index 00000000..88a55f64 Binary files /dev/null and b/media/VOICE/miku/pentacrash.ogg differ diff --git a/media/VOICE/miku/perfect_clear.ogg b/media/VOICE/miku/perfect_clear.ogg new file mode 100644 index 00000000..fb7c2be9 Binary files /dev/null and b/media/VOICE/miku/perfect_clear.ogg differ diff --git a/media/VOICE/miku/pspin.ogg b/media/VOICE/miku/pspin.ogg new file mode 100644 index 00000000..5b45b501 Binary files /dev/null and b/media/VOICE/miku/pspin.ogg differ diff --git a/media/VOICE/miku/qspin.ogg b/media/VOICE/miku/qspin.ogg new file mode 100644 index 00000000..0a483090 Binary files /dev/null and b/media/VOICE/miku/qspin.ogg differ diff --git a/media/VOICE/miku/rspin.ogg b/media/VOICE/miku/rspin.ogg new file mode 100644 index 00000000..980e468a Binary files /dev/null and b/media/VOICE/miku/rspin.ogg differ diff --git a/media/VOICE/miku/sad.ogg b/media/VOICE/miku/sad.ogg new file mode 100644 index 00000000..c23a7275 Binary files /dev/null and b/media/VOICE/miku/sad.ogg differ diff --git a/media/VOICE/miku/single.ogg b/media/VOICE/miku/single.ogg new file mode 100644 index 00000000..64444931 Binary files /dev/null and b/media/VOICE/miku/single.ogg differ diff --git a/media/VOICE/miku/sspin.ogg b/media/VOICE/miku/sspin.ogg new file mode 100644 index 00000000..6a2272bd Binary files /dev/null and b/media/VOICE/miku/sspin.ogg differ diff --git a/media/VOICE/miku/techrash.ogg b/media/VOICE/miku/techrash.ogg new file mode 100644 index 00000000..4588fcd2 Binary files /dev/null and b/media/VOICE/miku/techrash.ogg differ diff --git a/media/VOICE/miku/triple.ogg b/media/VOICE/miku/triple.ogg new file mode 100644 index 00000000..d69e33b1 Binary files /dev/null and b/media/VOICE/miku/triple.ogg differ diff --git a/media/VOICE/miku/tspin.ogg b/media/VOICE/miku/tspin.ogg new file mode 100644 index 00000000..990ac895 Binary files /dev/null and b/media/VOICE/miku/tspin.ogg differ diff --git a/media/VOICE/miku/uspin.ogg b/media/VOICE/miku/uspin.ogg new file mode 100644 index 00000000..ec92aa1a Binary files /dev/null and b/media/VOICE/miku/uspin.ogg differ diff --git a/media/VOICE/miku/vspin.ogg b/media/VOICE/miku/vspin.ogg new file mode 100644 index 00000000..8302911a Binary files /dev/null and b/media/VOICE/miku/vspin.ogg differ diff --git a/media/VOICE/miku/wspin.ogg b/media/VOICE/miku/wspin.ogg new file mode 100644 index 00000000..6d8f26c8 Binary files /dev/null and b/media/VOICE/miku/wspin.ogg differ diff --git a/media/VOICE/miku/xspin.ogg b/media/VOICE/miku/xspin.ogg new file mode 100644 index 00000000..02ee4077 Binary files /dev/null and b/media/VOICE/miku/xspin.ogg differ diff --git a/media/VOICE/miku/yspin.ogg b/media/VOICE/miku/yspin.ogg new file mode 100644 index 00000000..6dcc6f64 Binary files /dev/null and b/media/VOICE/miku/yspin.ogg differ diff --git a/media/VOICE/miku/zspin.ogg b/media/VOICE/miku/zspin.ogg new file mode 100644 index 00000000..0383c490 Binary files /dev/null and b/media/VOICE/miku/zspin.ogg differ diff --git a/parts/RSlist.lua b/parts/RSlist.lua index 610ba314..5c617dc7 100644 --- a/parts/RSlist.lua +++ b/parts/RSlist.lua @@ -3,8 +3,8 @@ local defaultCenterPos={--For SRS-like RSs --Tetromino {[0]={0,1},{1,0},{1,1},{1,1}},--Z {[0]={0,1},{1,0},{1,1},{1,1}},--S - {[0]={0,1},{1,0},{1,1},{1,1}},--L {[0]={0,1},{1,0},{1,1},{1,1}},--J + {[0]={0,1},{1,0},{1,1},{1,1}},--L {[0]={0,1},{1,0},{1,1},{1,1}},--T {[0]={.5,.5},{.5,.5},{.5,.5},{.5,.5}},--O {[0]={-.5,1.5},{1.5,-.5},{.5,1.5},{1.5,.5}},--I diff --git a/parts/player/player.lua b/parts/player/player.lua index fc624da2..bed60574 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -1002,7 +1002,7 @@ do--Player.drop(self)--Place piece local reAtk={0,0,1,1,1,2,2,3,3} 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','hspin','nspin','ispin'} + 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 spinSFX={[0]='spin_0','spin_1','spin_2'} local clearSFX={'clear_1','clear_2','clear_3'} diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 129d849b..f33f4a95 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -99,7 +99,7 @@ scene.widgetList={ end}, WIDGET.newSwitch{name="fine", x=1150,y=270,disp=SETval('fine'),code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, - WIDGET.newSelector{name="cv", x=1100,y=380,w=200,list={'miya','naki','xiaoya'},disp=function()return cv end,code=function(i)cv=i end}, + WIDGET.newSelector{name="cv", x=1100,y=380,w=200,list={'miya','naki','xiaoya','miku'},disp=function()return cv end,code=function(i)cv=i end}, WIDGET.newButton{name="apply", x=1100,y=460,w=180,h=80,code=function()SETTING.cv=cv VOC.loadAll()end,hideF=function()return SETTING.cv==cv end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene}, }