diff --git a/Zframework/bgm.lua b/Zframework/bgm.lua index f4ef1e63..fd7c6b4f 100644 --- a/Zframework/bgm.lua +++ b/Zframework/bgm.lua @@ -63,7 +63,7 @@ function BGM.init(list) Sources[name]:setVolume(0) return true -- else - -- MES.new('warn',"No BGM file: "..Sources[name],5) + -- MES.new('warn',"[no BGM] "..Sources[name],5) end elseif Sources[name]then return true diff --git a/Zframework/sfx.lua b/Zframework/sfx.lua index e9181bc1..3a09cf56 100644 --- a/Zframework/sfx.lua +++ b/Zframework/sfx.lua @@ -1,6 +1,6 @@ local SFX={ getCount=function()return 0 end, - loadAll=function()error("Cannot load before init!")end, + load=function()error("Cannot load before init!")end, fieldPlay=NULL, play=NULL, fplay=NULL, @@ -12,13 +12,13 @@ function SFX.init(list) local Sources={} local count=#list function SFX.getCount()return count end - function SFX.loadAll() + function SFX.load(path) for i=1,count do - local N='media/SFX/'..list[i]..'.ogg' - if love.filesystem.getInfo(N)then - Sources[list[i]]={love.audio.newSource(N,'static')} + local fullPath=path..list[i]..'.ogg' + if love.filesystem.getInfo(fullPath)then + Sources[list[i]]={love.audio.newSource(fullPath,'static')} else - MES.new('warn',"No SFX file: "..N,.1) + MES.new('warn',"[no SFX] "..list[i]..'.ogg',.1) end end diff --git a/Zframework/voice.lua b/Zframework/voice.lua index 83f66ab5..e05d3c05 100644 --- a/Zframework/voice.lua +++ b/Zframework/voice.lua @@ -1,7 +1,7 @@ local VOC={ getCount=function()return 0 end, getQueueCount=function()return 0 end, - loadAll=function()error("Cannot load before init!")end, + load=function()error("Cannot load before init!")end, getFreeChannel=NULL, play=NULL, update=NULL, @@ -15,14 +15,15 @@ function VOC.init(list) local Source={} local count=#list function VOC.getCount()return count end - local function _loadVoiceFile(N,vocName) - local fileName='media/VOICE/'..SETTING.cv..'/'..vocName..'.ogg' - if love.filesystem.getInfo(fileName)then - bank[vocName]={love.audio.newSource(fileName,'stream')} + local function _loadVoiceFile(path,N,vocName) + local fullPath=path..vocName..'.ogg' + if love.filesystem.getInfo(fullPath)then + bank[vocName]={love.audio.newSource(fullPath,'stream')} table.insert(Source[N],vocName) return true end end + --Load voice with string local function _getVoice(str) local L=bank[str] local n=1 @@ -35,18 +36,17 @@ function VOC.init(list) end end return L[n] - --Load voice with string end - function VOC.loadAll() + function VOC.load(path) for i=1,count do Source[list[i]]={} local n=0 - repeat n=n+1 until not _loadVoiceFile(list[i],list[i]..'_'..n) + repeat n=n+1 until not _loadVoiceFile(path,list[i],list[i]..'_'..n) if n==1 then - _loadVoiceFile(list[i],list[i]) - -- if not _loadVoiceFile(list[i],list[i])then MES.new('warn',"No VOICE file: "..list[i],.1)end + _loadVoiceFile(path,list[i],list[i]) + -- if not _loadVoiceFile(path,list[i],list[i])then MES.new('warn',"[]no VOC] "..list[i],.1)end end if not Source[list[i]][1]then Source[list[i]]=nil diff --git a/main.lua b/main.lua index 3fbd4e56..f8df9ae3 100644 --- a/main.lua +++ b/main.lua @@ -220,22 +220,22 @@ SKIN.init{ --Initialize sound libs SFX.init((function() local L={} - for _,v in next,fs.getDirectoryItems('media/SFX')do - if fs.getRealDirectory('media/SFX/'..v)~=SAVEDIR then + for _,v in next,fs.getDirectoryItems('media/effect/chiptune/')do + if fs.getRealDirectory('media/effect/chiptune/'..v)~=SAVEDIR then table.insert(L,v:sub(1,-5)) else - MES.new('warn',"Dangerous file : %SAVE%/media/SFX/"..v) + MES.new('warn',"Dangerous file : %SAVE%/media/effect/chiptune/"..v) end end return L end)()) BGM.init((function() local L={} - for _,v in next,fs.getDirectoryItems('media/BGM')do - if fs.getRealDirectory('media/BGM/'..v)~=SAVEDIR then - table.insert(L,{name=v:sub(1,-5),path='media/BGM/'..v}) + for _,v in next,fs.getDirectoryItems('media/music')do + if fs.getRealDirectory('media/music/'..v)~=SAVEDIR then + table.insert(L,{name=v:sub(1,-5),path='media/music/'..v}) else - MES.new('warn',"Dangerous file : %SAVE%/media/BGM/"..v) + MES.new('warn',"Dangerous file : %SAVE%/media/music/"..v) end end return L @@ -383,6 +383,9 @@ do if not TABLE.find({8,10,13,17,22,29,37,47,62,80,100},SETTING.frameMul)then SETTING.frameMul=100 end + if SETTING.cv then + SETTING.vocPack,SETTING.cv=SETTING.cv + end for _,v in next,VK_org do v.color=nil end if RANKS.infinite then diff --git a/media/SFX/blip_1.ogg b/media/effect/chiptune/blip_1.ogg similarity index 100% rename from media/SFX/blip_1.ogg rename to media/effect/chiptune/blip_1.ogg diff --git a/media/SFX/blip_2.ogg b/media/effect/chiptune/blip_2.ogg similarity index 100% rename from media/SFX/blip_2.ogg rename to media/effect/chiptune/blip_2.ogg diff --git a/media/SFX/button.ogg b/media/effect/chiptune/button.ogg similarity index 100% rename from media/SFX/button.ogg rename to media/effect/chiptune/button.ogg diff --git a/media/SFX/clear.ogg b/media/effect/chiptune/clear.ogg similarity index 100% rename from media/SFX/clear.ogg rename to media/effect/chiptune/clear.ogg diff --git a/media/SFX/clear_1.ogg b/media/effect/chiptune/clear_1.ogg similarity index 100% rename from media/SFX/clear_1.ogg rename to media/effect/chiptune/clear_1.ogg diff --git a/media/SFX/clear_2.ogg b/media/effect/chiptune/clear_2.ogg similarity index 100% rename from media/SFX/clear_2.ogg rename to media/effect/chiptune/clear_2.ogg diff --git a/media/SFX/clear_3.ogg b/media/effect/chiptune/clear_3.ogg similarity index 100% rename from media/SFX/clear_3.ogg rename to media/effect/chiptune/clear_3.ogg diff --git a/media/SFX/clear_4.ogg b/media/effect/chiptune/clear_4.ogg similarity index 100% rename from media/SFX/clear_4.ogg rename to media/effect/chiptune/clear_4.ogg diff --git a/media/SFX/click.ogg b/media/effect/chiptune/click.ogg similarity index 100% rename from media/SFX/click.ogg rename to media/effect/chiptune/click.ogg diff --git a/media/SFX/collect.ogg b/media/effect/chiptune/collect.ogg similarity index 100% rename from media/SFX/collect.ogg rename to media/effect/chiptune/collect.ogg diff --git a/media/SFX/connect.ogg b/media/effect/chiptune/connect.ogg similarity index 100% rename from media/SFX/connect.ogg rename to media/effect/chiptune/connect.ogg diff --git a/media/SFX/connected.ogg b/media/effect/chiptune/connected.ogg similarity index 100% rename from media/SFX/connected.ogg rename to media/effect/chiptune/connected.ogg diff --git a/media/SFX/drop.ogg b/media/effect/chiptune/drop.ogg similarity index 100% rename from media/SFX/drop.ogg rename to media/effect/chiptune/drop.ogg diff --git a/media/SFX/drop_cancel.ogg b/media/effect/chiptune/drop_cancel.ogg similarity index 100% rename from media/SFX/drop_cancel.ogg rename to media/effect/chiptune/drop_cancel.ogg diff --git a/media/SFX/emit.ogg b/media/effect/chiptune/emit.ogg similarity index 100% rename from media/SFX/emit.ogg rename to media/effect/chiptune/emit.ogg diff --git a/media/SFX/enter.ogg b/media/effect/chiptune/enter.ogg similarity index 100% rename from media/SFX/enter.ogg rename to media/effect/chiptune/enter.ogg diff --git a/media/SFX/error.ogg b/media/effect/chiptune/error.ogg similarity index 100% rename from media/SFX/error.ogg rename to media/effect/chiptune/error.ogg diff --git a/media/SFX/fail.ogg b/media/effect/chiptune/fail.ogg similarity index 100% rename from media/SFX/fail.ogg rename to media/effect/chiptune/fail.ogg diff --git a/media/SFX/fall.ogg b/media/effect/chiptune/fall.ogg similarity index 100% rename from media/SFX/fall.ogg rename to media/effect/chiptune/fall.ogg diff --git a/media/SFX/finesseError.ogg b/media/effect/chiptune/finesseError.ogg similarity index 100% rename from media/SFX/finesseError.ogg rename to media/effect/chiptune/finesseError.ogg diff --git a/media/SFX/finesseError_long.ogg b/media/effect/chiptune/finesseError_long.ogg similarity index 100% rename from media/SFX/finesseError_long.ogg rename to media/effect/chiptune/finesseError_long.ogg diff --git a/media/SFX/hold.ogg b/media/effect/chiptune/hold.ogg similarity index 100% rename from media/SFX/hold.ogg rename to media/effect/chiptune/hold.ogg diff --git a/media/SFX/key.ogg b/media/effect/chiptune/key.ogg similarity index 100% rename from media/SFX/key.ogg rename to media/effect/chiptune/key.ogg diff --git a/media/SFX/lock.ogg b/media/effect/chiptune/lock.ogg similarity index 100% rename from media/SFX/lock.ogg rename to media/effect/chiptune/lock.ogg diff --git a/media/SFX/move.ogg b/media/effect/chiptune/move.ogg similarity index 100% rename from media/SFX/move.ogg rename to media/effect/chiptune/move.ogg diff --git a/media/SFX/prehold.ogg b/media/effect/chiptune/prehold.ogg similarity index 100% rename from media/SFX/prehold.ogg rename to media/effect/chiptune/prehold.ogg diff --git a/media/SFX/prerotate.ogg b/media/effect/chiptune/prerotate.ogg similarity index 100% rename from media/SFX/prerotate.ogg rename to media/effect/chiptune/prerotate.ogg diff --git a/media/SFX/reach.ogg b/media/effect/chiptune/reach.ogg similarity index 100% rename from media/SFX/reach.ogg rename to media/effect/chiptune/reach.ogg diff --git a/media/SFX/ready.ogg b/media/effect/chiptune/ready.ogg similarity index 100% rename from media/SFX/ready.ogg rename to media/effect/chiptune/ready.ogg diff --git a/media/SFX/ren_1.ogg b/media/effect/chiptune/ren_1.ogg similarity index 100% rename from media/SFX/ren_1.ogg rename to media/effect/chiptune/ren_1.ogg diff --git a/media/SFX/ren_10.ogg b/media/effect/chiptune/ren_10.ogg similarity index 100% rename from media/SFX/ren_10.ogg rename to media/effect/chiptune/ren_10.ogg diff --git a/media/SFX/ren_11.ogg b/media/effect/chiptune/ren_11.ogg similarity index 100% rename from media/SFX/ren_11.ogg rename to media/effect/chiptune/ren_11.ogg diff --git a/media/SFX/ren_2.ogg b/media/effect/chiptune/ren_2.ogg similarity index 100% rename from media/SFX/ren_2.ogg rename to media/effect/chiptune/ren_2.ogg diff --git a/media/SFX/ren_3.ogg b/media/effect/chiptune/ren_3.ogg similarity index 100% rename from media/SFX/ren_3.ogg rename to media/effect/chiptune/ren_3.ogg diff --git a/media/SFX/ren_4.ogg b/media/effect/chiptune/ren_4.ogg similarity index 100% rename from media/SFX/ren_4.ogg rename to media/effect/chiptune/ren_4.ogg diff --git a/media/SFX/ren_5.ogg b/media/effect/chiptune/ren_5.ogg similarity index 100% rename from media/SFX/ren_5.ogg rename to media/effect/chiptune/ren_5.ogg diff --git a/media/SFX/ren_6.ogg b/media/effect/chiptune/ren_6.ogg similarity index 100% rename from media/SFX/ren_6.ogg rename to media/effect/chiptune/ren_6.ogg diff --git a/media/SFX/ren_7.ogg b/media/effect/chiptune/ren_7.ogg similarity index 100% rename from media/SFX/ren_7.ogg rename to media/effect/chiptune/ren_7.ogg diff --git a/media/SFX/ren_8.ogg b/media/effect/chiptune/ren_8.ogg similarity index 100% rename from media/SFX/ren_8.ogg rename to media/effect/chiptune/ren_8.ogg diff --git a/media/SFX/ren_9.ogg b/media/effect/chiptune/ren_9.ogg similarity index 100% rename from media/SFX/ren_9.ogg rename to media/effect/chiptune/ren_9.ogg diff --git a/media/SFX/ren_mega.ogg b/media/effect/chiptune/ren_mega.ogg similarity index 100% rename from media/SFX/ren_mega.ogg rename to media/effect/chiptune/ren_mega.ogg diff --git a/media/SFX/rotate.ogg b/media/effect/chiptune/rotate.ogg similarity index 100% rename from media/SFX/rotate.ogg rename to media/effect/chiptune/rotate.ogg diff --git a/media/SFX/rotatekick.ogg b/media/effect/chiptune/rotatekick.ogg similarity index 100% rename from media/SFX/rotatekick.ogg rename to media/effect/chiptune/rotatekick.ogg diff --git a/media/SFX/spawn_1.ogg b/media/effect/chiptune/spawn_1.ogg similarity index 100% rename from media/SFX/spawn_1.ogg rename to media/effect/chiptune/spawn_1.ogg diff --git a/media/SFX/spawn_2.ogg b/media/effect/chiptune/spawn_2.ogg similarity index 100% rename from media/SFX/spawn_2.ogg rename to media/effect/chiptune/spawn_2.ogg diff --git a/media/SFX/spawn_3.ogg b/media/effect/chiptune/spawn_3.ogg similarity index 100% rename from media/SFX/spawn_3.ogg rename to media/effect/chiptune/spawn_3.ogg diff --git a/media/SFX/spawn_4.ogg b/media/effect/chiptune/spawn_4.ogg similarity index 100% rename from media/SFX/spawn_4.ogg rename to media/effect/chiptune/spawn_4.ogg diff --git a/media/SFX/spawn_5.ogg b/media/effect/chiptune/spawn_5.ogg similarity index 100% rename from media/SFX/spawn_5.ogg rename to media/effect/chiptune/spawn_5.ogg diff --git a/media/SFX/spawn_6.ogg b/media/effect/chiptune/spawn_6.ogg similarity index 100% rename from media/SFX/spawn_6.ogg rename to media/effect/chiptune/spawn_6.ogg diff --git a/media/SFX/spawn_7.ogg b/media/effect/chiptune/spawn_7.ogg similarity index 100% rename from media/SFX/spawn_7.ogg rename to media/effect/chiptune/spawn_7.ogg diff --git a/media/SFX/spin_0.ogg b/media/effect/chiptune/spin_0.ogg similarity index 100% rename from media/SFX/spin_0.ogg rename to media/effect/chiptune/spin_0.ogg diff --git a/media/SFX/spin_1.ogg b/media/effect/chiptune/spin_1.ogg similarity index 100% rename from media/SFX/spin_1.ogg rename to media/effect/chiptune/spin_1.ogg diff --git a/media/SFX/spin_2.ogg b/media/effect/chiptune/spin_2.ogg similarity index 100% rename from media/SFX/spin_2.ogg rename to media/effect/chiptune/spin_2.ogg diff --git a/media/SFX/spin_3.ogg b/media/effect/chiptune/spin_3.ogg similarity index 100% rename from media/SFX/spin_3.ogg rename to media/effect/chiptune/spin_3.ogg diff --git a/media/SFX/start.ogg b/media/effect/chiptune/start.ogg similarity index 100% rename from media/SFX/start.ogg rename to media/effect/chiptune/start.ogg diff --git a/media/SFX/swipe.ogg b/media/effect/chiptune/swipe.ogg similarity index 100% rename from media/SFX/swipe.ogg rename to media/effect/chiptune/swipe.ogg diff --git a/media/SFX/virtualKey.ogg b/media/effect/chiptune/virtualKey.ogg similarity index 100% rename from media/SFX/virtualKey.ogg rename to media/effect/chiptune/virtualKey.ogg diff --git a/media/SFX/warning.ogg b/media/effect/chiptune/warning.ogg similarity index 100% rename from media/SFX/warning.ogg rename to media/effect/chiptune/warning.ogg diff --git a/media/SFX/welcome_sfx.ogg b/media/effect/chiptune/welcome_sfx.ogg similarity index 100% rename from media/SFX/welcome_sfx.ogg rename to media/effect/chiptune/welcome_sfx.ogg diff --git a/media/SFX/win.ogg b/media/effect/chiptune/win.ogg similarity index 100% rename from media/SFX/win.ogg rename to media/effect/chiptune/win.ogg diff --git a/media/BGM/8-bit happiness.ogg b/media/music/8-bit happiness.ogg similarity index 100% rename from media/BGM/8-bit happiness.ogg rename to media/music/8-bit happiness.ogg diff --git a/media/BGM/battle.ogg b/media/music/battle.ogg similarity index 100% rename from media/BGM/battle.ogg rename to media/music/battle.ogg diff --git a/media/BGM/beat5th.ogg b/media/music/beat5th.ogg similarity index 100% rename from media/BGM/beat5th.ogg rename to media/music/beat5th.ogg diff --git a/media/BGM/blank.ogg b/media/music/blank.ogg similarity index 100% rename from media/BGM/blank.ogg rename to media/music/blank.ogg diff --git a/media/BGM/cruelty.ogg b/media/music/cruelty.ogg similarity index 100% rename from media/BGM/cruelty.ogg rename to media/music/cruelty.ogg diff --git a/media/BGM/distortion.ogg b/media/music/distortion.ogg similarity index 100% rename from media/BGM/distortion.ogg rename to media/music/distortion.ogg diff --git a/media/BGM/down.ogg b/media/music/down.ogg similarity index 100% rename from media/BGM/down.ogg rename to media/music/down.ogg diff --git a/media/BGM/dream.ogg b/media/music/dream.ogg similarity index 100% rename from media/BGM/dream.ogg rename to media/music/dream.ogg diff --git a/media/BGM/echo.ogg b/media/music/echo.ogg similarity index 100% rename from media/BGM/echo.ogg rename to media/music/echo.ogg diff --git a/media/BGM/empty.ogg b/media/music/empty.ogg similarity index 100% rename from media/BGM/empty.ogg rename to media/music/empty.ogg diff --git a/media/BGM/end.ogg b/media/music/end.ogg similarity index 100% rename from media/BGM/end.ogg rename to media/music/end.ogg diff --git a/media/BGM/exploration.ogg b/media/music/exploration.ogg similarity index 100% rename from media/BGM/exploration.ogg rename to media/music/exploration.ogg diff --git a/media/BGM/far.ogg b/media/music/far.ogg similarity index 100% rename from media/BGM/far.ogg rename to media/music/far.ogg diff --git a/media/BGM/final.ogg b/media/music/final.ogg similarity index 100% rename from media/BGM/final.ogg rename to media/music/final.ogg diff --git a/media/BGM/hang out.ogg b/media/music/hang out.ogg similarity index 100% rename from media/BGM/hang out.ogg rename to media/music/hang out.ogg diff --git a/media/BGM/here.ogg b/media/music/here.ogg similarity index 100% rename from media/BGM/here.ogg rename to media/music/here.ogg diff --git a/media/BGM/hope.ogg b/media/music/hope.ogg similarity index 100% rename from media/BGM/hope.ogg rename to media/music/hope.ogg diff --git a/media/BGM/how feeling.ogg b/media/music/how feeling.ogg similarity index 100% rename from media/BGM/how feeling.ogg rename to media/music/how feeling.ogg diff --git a/media/BGM/infinite.ogg b/media/music/infinite.ogg similarity index 100% rename from media/BGM/infinite.ogg rename to media/music/infinite.ogg diff --git a/media/BGM/jazz nihilism.ogg b/media/music/jazz nihilism.ogg similarity index 100% rename from media/BGM/jazz nihilism.ogg rename to media/music/jazz nihilism.ogg diff --git a/media/BGM/magicblock.ogg b/media/music/magicblock.ogg similarity index 100% rename from media/BGM/magicblock.ogg rename to media/music/magicblock.ogg diff --git a/media/BGM/memory.ogg b/media/music/memory.ogg similarity index 100% rename from media/BGM/memory.ogg rename to media/music/memory.ogg diff --git a/media/BGM/moonbeam.ogg b/media/music/moonbeam.ogg similarity index 100% rename from media/BGM/moonbeam.ogg rename to media/music/moonbeam.ogg diff --git a/media/BGM/new era.ogg b/media/music/new era.ogg similarity index 100% rename from media/BGM/new era.ogg rename to media/music/new era.ogg diff --git a/media/BGM/nil.ogg b/media/music/nil.ogg similarity index 100% rename from media/BGM/nil.ogg rename to media/music/nil.ogg diff --git a/media/BGM/null.ogg b/media/music/null.ogg similarity index 100% rename from media/BGM/null.ogg rename to media/music/null.ogg diff --git a/media/BGM/overzero.ogg b/media/music/overzero.ogg similarity index 100% rename from media/BGM/overzero.ogg rename to media/music/overzero.ogg diff --git a/media/BGM/oxygen.ogg b/media/music/oxygen.ogg similarity index 100% rename from media/BGM/oxygen.ogg rename to media/music/oxygen.ogg diff --git a/media/BGM/push.ogg b/media/music/push.ogg similarity index 100% rename from media/BGM/push.ogg rename to media/music/push.ogg diff --git a/media/BGM/race.ogg b/media/music/race.ogg similarity index 100% rename from media/BGM/race.ogg rename to media/music/race.ogg diff --git a/media/BGM/reason.ogg b/media/music/reason.ogg similarity index 100% rename from media/BGM/reason.ogg rename to media/music/reason.ogg diff --git a/media/BGM/rectification.ogg b/media/music/rectification.ogg similarity index 100% rename from media/BGM/rectification.ogg rename to media/music/rectification.ogg diff --git a/media/BGM/rockblock.ogg b/media/music/rockblock.ogg similarity index 100% rename from media/BGM/rockblock.ogg rename to media/music/rockblock.ogg diff --git a/media/BGM/secret7th remix.ogg b/media/music/secret7th remix.ogg similarity index 100% rename from media/BGM/secret7th remix.ogg rename to media/music/secret7th remix.ogg diff --git a/media/BGM/secret7th.ogg b/media/music/secret7th.ogg similarity index 100% rename from media/BGM/secret7th.ogg rename to media/music/secret7th.ogg diff --git a/media/BGM/secret8th remix.ogg b/media/music/secret8th remix.ogg similarity index 100% rename from media/BGM/secret8th remix.ogg rename to media/music/secret8th remix.ogg diff --git a/media/BGM/secret8th.ogg b/media/music/secret8th.ogg similarity index 100% rename from media/BGM/secret8th.ogg rename to media/music/secret8th.ogg diff --git a/media/BGM/shift.ogg b/media/music/shift.ogg similarity index 100% rename from media/BGM/shift.ogg rename to media/music/shift.ogg diff --git a/media/BGM/shining terminal.ogg b/media/music/shining terminal.ogg similarity index 100% rename from media/BGM/shining terminal.ogg rename to media/music/shining terminal.ogg diff --git a/media/BGM/space.ogg b/media/music/space.ogg similarity index 100% rename from media/BGM/space.ogg rename to media/music/space.ogg diff --git a/media/BGM/spring festival.ogg b/media/music/spring festival.ogg similarity index 100% rename from media/BGM/spring festival.ogg rename to media/music/spring festival.ogg diff --git a/media/BGM/storm.ogg b/media/music/storm.ogg similarity index 100% rename from media/BGM/storm.ogg rename to media/music/storm.ogg diff --git a/media/BGM/sugar fairy.ogg b/media/music/sugar fairy.ogg similarity index 100% rename from media/BGM/sugar fairy.ogg rename to media/music/sugar fairy.ogg diff --git a/media/BGM/super7th.ogg b/media/music/super7th.ogg similarity index 100% rename from media/BGM/super7th.ogg rename to media/music/super7th.ogg diff --git a/media/BGM/there.ogg b/media/music/there.ogg similarity index 100% rename from media/BGM/there.ogg rename to media/music/there.ogg diff --git a/media/BGM/truth.ogg b/media/music/truth.ogg similarity index 100% rename from media/BGM/truth.ogg rename to media/music/truth.ogg diff --git a/media/BGM/vacuum.ogg b/media/music/vacuum.ogg similarity index 100% rename from media/BGM/vacuum.ogg rename to media/music/vacuum.ogg diff --git a/media/BGM/vapor.ogg b/media/music/vapor.ogg similarity index 100% rename from media/BGM/vapor.ogg rename to media/music/vapor.ogg diff --git a/media/BGM/venus.ogg b/media/music/venus.ogg similarity index 100% rename from media/BGM/venus.ogg rename to media/music/venus.ogg diff --git a/media/BGM/warped.ogg b/media/music/warped.ogg similarity index 100% rename from media/BGM/warped.ogg rename to media/music/warped.ogg diff --git a/media/BGM/waterfall.ogg b/media/music/waterfall.ogg similarity index 100% rename from media/BGM/waterfall.ogg rename to media/music/waterfall.ogg diff --git a/media/BGM/way.ogg b/media/music/way.ogg similarity index 100% rename from media/BGM/way.ogg rename to media/music/way.ogg diff --git a/media/BGM/xmas.ogg b/media/music/xmas.ogg similarity index 100% rename from media/BGM/xmas.ogg rename to media/music/xmas.ogg diff --git a/media/VOICE/miku/b2b.ogg b/media/vocal/miku/b2b.ogg similarity index 100% rename from media/VOICE/miku/b2b.ogg rename to media/vocal/miku/b2b.ogg diff --git a/media/VOICE/miku/b3b.ogg b/media/vocal/miku/b3b.ogg similarity index 100% rename from media/VOICE/miku/b3b.ogg rename to media/vocal/miku/b3b.ogg diff --git a/media/VOICE/miku/bye.ogg b/media/vocal/miku/bye.ogg similarity index 100% rename from media/VOICE/miku/bye.ogg rename to media/vocal/miku/bye.ogg diff --git a/media/VOICE/miku/cspin.ogg b/media/vocal/miku/cspin.ogg similarity index 100% rename from media/VOICE/miku/cspin.ogg rename to media/vocal/miku/cspin.ogg diff --git a/media/VOICE/miku/double.ogg b/media/vocal/miku/double.ogg similarity index 100% rename from media/VOICE/miku/double.ogg rename to media/vocal/miku/double.ogg diff --git a/media/VOICE/miku/doubt_1.ogg b/media/vocal/miku/doubt_1.ogg similarity index 100% rename from media/VOICE/miku/doubt_1.ogg rename to media/vocal/miku/doubt_1.ogg diff --git a/media/VOICE/miku/doubt_2.ogg b/media/vocal/miku/doubt_2.ogg similarity index 100% rename from media/VOICE/miku/doubt_2.ogg rename to media/vocal/miku/doubt_2.ogg diff --git a/media/VOICE/miku/egg.ogg b/media/vocal/miku/egg.ogg similarity index 100% rename from media/VOICE/miku/egg.ogg rename to media/vocal/miku/egg.ogg diff --git a/media/VOICE/miku/espin.ogg b/media/vocal/miku/espin.ogg similarity index 100% rename from media/VOICE/miku/espin.ogg rename to media/vocal/miku/espin.ogg diff --git a/media/VOICE/miku/fspin.ogg b/media/vocal/miku/fspin.ogg similarity index 100% rename from media/VOICE/miku/fspin.ogg rename to media/vocal/miku/fspin.ogg diff --git a/media/VOICE/miku/half_clear.ogg b/media/vocal/miku/half_clear.ogg similarity index 100% rename from media/VOICE/miku/half_clear.ogg rename to media/vocal/miku/half_clear.ogg diff --git a/media/VOICE/miku/happy.ogg b/media/vocal/miku/happy.ogg similarity index 100% rename from media/VOICE/miku/happy.ogg rename to media/vocal/miku/happy.ogg diff --git a/media/VOICE/miku/hspin.ogg b/media/vocal/miku/hspin.ogg similarity index 100% rename from media/VOICE/miku/hspin.ogg rename to media/vocal/miku/hspin.ogg diff --git a/media/VOICE/miku/ispin.ogg b/media/vocal/miku/ispin.ogg similarity index 100% rename from media/VOICE/miku/ispin.ogg rename to media/vocal/miku/ispin.ogg diff --git a/media/VOICE/miku/jspin.ogg b/media/vocal/miku/jspin.ogg similarity index 100% rename from media/VOICE/miku/jspin.ogg rename to media/vocal/miku/jspin.ogg diff --git a/media/VOICE/miku/lose.ogg b/media/vocal/miku/lose.ogg similarity index 100% rename from media/VOICE/miku/lose.ogg rename to media/vocal/miku/lose.ogg diff --git a/media/VOICE/miku/lspin.ogg b/media/vocal/miku/lspin.ogg similarity index 100% rename from media/VOICE/miku/lspin.ogg rename to media/vocal/miku/lspin.ogg diff --git a/media/VOICE/miku/mini.ogg b/media/vocal/miku/mini.ogg similarity index 100% rename from media/VOICE/miku/mini.ogg rename to media/vocal/miku/mini.ogg diff --git a/media/VOICE/miku/nspin.ogg b/media/vocal/miku/nspin.ogg similarity index 100% rename from media/VOICE/miku/nspin.ogg rename to media/vocal/miku/nspin.ogg diff --git a/media/VOICE/miku/nya.ogg b/media/vocal/miku/nya.ogg similarity index 100% rename from media/VOICE/miku/nya.ogg rename to media/vocal/miku/nya.ogg diff --git a/media/VOICE/miku/ospin.ogg b/media/vocal/miku/ospin.ogg similarity index 100% rename from media/VOICE/miku/ospin.ogg rename to media/vocal/miku/ospin.ogg diff --git a/media/VOICE/miku/pentacrash.ogg b/media/vocal/miku/pentacrash.ogg similarity index 100% rename from media/VOICE/miku/pentacrash.ogg rename to media/vocal/miku/pentacrash.ogg diff --git a/media/VOICE/miku/perfect_clear.ogg b/media/vocal/miku/perfect_clear.ogg similarity index 100% rename from media/VOICE/miku/perfect_clear.ogg rename to media/vocal/miku/perfect_clear.ogg diff --git a/media/VOICE/miku/pspin.ogg b/media/vocal/miku/pspin.ogg similarity index 100% rename from media/VOICE/miku/pspin.ogg rename to media/vocal/miku/pspin.ogg diff --git a/media/VOICE/miku/qspin.ogg b/media/vocal/miku/qspin.ogg similarity index 100% rename from media/VOICE/miku/qspin.ogg rename to media/vocal/miku/qspin.ogg diff --git a/media/VOICE/miku/rspin.ogg b/media/vocal/miku/rspin.ogg similarity index 100% rename from media/VOICE/miku/rspin.ogg rename to media/vocal/miku/rspin.ogg diff --git a/media/VOICE/miku/sad.ogg b/media/vocal/miku/sad.ogg similarity index 100% rename from media/VOICE/miku/sad.ogg rename to media/vocal/miku/sad.ogg diff --git a/media/VOICE/miku/single.ogg b/media/vocal/miku/single.ogg similarity index 100% rename from media/VOICE/miku/single.ogg rename to media/vocal/miku/single.ogg diff --git a/media/VOICE/miku/sspin.ogg b/media/vocal/miku/sspin.ogg similarity index 100% rename from media/VOICE/miku/sspin.ogg rename to media/vocal/miku/sspin.ogg diff --git a/media/VOICE/miku/techrash.ogg b/media/vocal/miku/techrash.ogg similarity index 100% rename from media/VOICE/miku/techrash.ogg rename to media/vocal/miku/techrash.ogg diff --git a/media/VOICE/miku/triple.ogg b/media/vocal/miku/triple.ogg similarity index 100% rename from media/VOICE/miku/triple.ogg rename to media/vocal/miku/triple.ogg diff --git a/media/VOICE/miku/tspin.ogg b/media/vocal/miku/tspin.ogg similarity index 100% rename from media/VOICE/miku/tspin.ogg rename to media/vocal/miku/tspin.ogg diff --git a/media/VOICE/miku/uspin.ogg b/media/vocal/miku/uspin.ogg similarity index 100% rename from media/VOICE/miku/uspin.ogg rename to media/vocal/miku/uspin.ogg diff --git a/media/VOICE/miku/vspin.ogg b/media/vocal/miku/vspin.ogg similarity index 100% rename from media/VOICE/miku/vspin.ogg rename to media/vocal/miku/vspin.ogg diff --git a/media/VOICE/miku/win.ogg b/media/vocal/miku/win.ogg similarity index 100% rename from media/VOICE/miku/win.ogg rename to media/vocal/miku/win.ogg diff --git a/media/VOICE/miku/wspin.ogg b/media/vocal/miku/wspin.ogg similarity index 100% rename from media/VOICE/miku/wspin.ogg rename to media/vocal/miku/wspin.ogg diff --git a/media/VOICE/miku/xspin.ogg b/media/vocal/miku/xspin.ogg similarity index 100% rename from media/VOICE/miku/xspin.ogg rename to media/vocal/miku/xspin.ogg diff --git a/media/VOICE/miku/yspin.ogg b/media/vocal/miku/yspin.ogg similarity index 100% rename from media/VOICE/miku/yspin.ogg rename to media/vocal/miku/yspin.ogg diff --git a/media/VOICE/miku/zspin.ogg b/media/vocal/miku/zspin.ogg similarity index 100% rename from media/VOICE/miku/zspin.ogg rename to media/vocal/miku/zspin.ogg diff --git a/media/VOICE/miya/b2b_1.ogg b/media/vocal/miya/b2b_1.ogg similarity index 100% rename from media/VOICE/miya/b2b_1.ogg rename to media/vocal/miya/b2b_1.ogg diff --git a/media/VOICE/miya/b2b_2.ogg b/media/vocal/miya/b2b_2.ogg similarity index 100% rename from media/VOICE/miya/b2b_2.ogg rename to media/vocal/miya/b2b_2.ogg diff --git a/media/VOICE/miya/b2b_3.ogg b/media/vocal/miya/b2b_3.ogg similarity index 100% rename from media/VOICE/miya/b2b_3.ogg rename to media/vocal/miya/b2b_3.ogg diff --git a/media/VOICE/miya/b3b_1.ogg b/media/vocal/miya/b3b_1.ogg similarity index 100% rename from media/VOICE/miya/b3b_1.ogg rename to media/vocal/miya/b3b_1.ogg diff --git a/media/VOICE/miya/b3b_2.ogg b/media/vocal/miya/b3b_2.ogg similarity index 100% rename from media/VOICE/miya/b3b_2.ogg rename to media/vocal/miya/b3b_2.ogg diff --git a/media/VOICE/miya/bye_1.ogg b/media/vocal/miya/bye_1.ogg similarity index 100% rename from media/VOICE/miya/bye_1.ogg rename to media/vocal/miya/bye_1.ogg diff --git a/media/VOICE/miya/bye_2.ogg b/media/vocal/miya/bye_2.ogg similarity index 100% rename from media/VOICE/miya/bye_2.ogg rename to media/vocal/miya/bye_2.ogg diff --git a/media/VOICE/miya/clear_1.ogg b/media/vocal/miya/clear_1.ogg similarity index 100% rename from media/VOICE/miya/clear_1.ogg rename to media/vocal/miya/clear_1.ogg diff --git a/media/VOICE/miya/clear_2.ogg b/media/vocal/miya/clear_2.ogg similarity index 100% rename from media/VOICE/miya/clear_2.ogg rename to media/vocal/miya/clear_2.ogg diff --git a/media/VOICE/miya/double_1.ogg b/media/vocal/miya/double_1.ogg similarity index 100% rename from media/VOICE/miya/double_1.ogg rename to media/vocal/miya/double_1.ogg diff --git a/media/VOICE/miya/double_2.ogg b/media/vocal/miya/double_2.ogg similarity index 100% rename from media/VOICE/miya/double_2.ogg rename to media/vocal/miya/double_2.ogg diff --git a/media/VOICE/miya/double_3.ogg b/media/vocal/miya/double_3.ogg similarity index 100% rename from media/VOICE/miya/double_3.ogg rename to media/vocal/miya/double_3.ogg diff --git a/media/VOICE/miya/double_4.ogg b/media/vocal/miya/double_4.ogg similarity index 100% rename from media/VOICE/miya/double_4.ogg rename to media/vocal/miya/double_4.ogg diff --git a/media/VOICE/miya/double_5.ogg b/media/vocal/miya/double_5.ogg similarity index 100% rename from media/VOICE/miya/double_5.ogg rename to media/vocal/miya/double_5.ogg diff --git a/media/VOICE/miya/doubt_1.ogg b/media/vocal/miya/doubt_1.ogg similarity index 100% rename from media/VOICE/miya/doubt_1.ogg rename to media/vocal/miya/doubt_1.ogg diff --git a/media/VOICE/miya/doubt_2.ogg b/media/vocal/miya/doubt_2.ogg similarity index 100% rename from media/VOICE/miya/doubt_2.ogg rename to media/vocal/miya/doubt_2.ogg diff --git a/media/VOICE/miya/egg_1.ogg b/media/vocal/miya/egg_1.ogg similarity index 100% rename from media/VOICE/miya/egg_1.ogg rename to media/vocal/miya/egg_1.ogg diff --git a/media/VOICE/miya/egg_2.ogg b/media/vocal/miya/egg_2.ogg similarity index 100% rename from media/VOICE/miya/egg_2.ogg rename to media/vocal/miya/egg_2.ogg diff --git a/media/VOICE/miya/half_clear_1.ogg b/media/vocal/miya/half_clear_1.ogg similarity index 100% rename from media/VOICE/miya/half_clear_1.ogg rename to media/vocal/miya/half_clear_1.ogg diff --git a/media/VOICE/miya/half_clear_2.ogg b/media/vocal/miya/half_clear_2.ogg similarity index 100% rename from media/VOICE/miya/half_clear_2.ogg rename to media/vocal/miya/half_clear_2.ogg diff --git a/media/VOICE/miya/happy_1.ogg b/media/vocal/miya/happy_1.ogg similarity index 100% rename from media/VOICE/miya/happy_1.ogg rename to media/vocal/miya/happy_1.ogg diff --git a/media/VOICE/miya/happy_2.ogg b/media/vocal/miya/happy_2.ogg similarity index 100% rename from media/VOICE/miya/happy_2.ogg rename to media/vocal/miya/happy_2.ogg diff --git a/media/VOICE/miya/happy_3.ogg b/media/vocal/miya/happy_3.ogg similarity index 100% rename from media/VOICE/miya/happy_3.ogg rename to media/vocal/miya/happy_3.ogg diff --git a/media/VOICE/miya/happy_4.ogg b/media/vocal/miya/happy_4.ogg similarity index 100% rename from media/VOICE/miya/happy_4.ogg rename to media/vocal/miya/happy_4.ogg diff --git a/media/VOICE/miya/ispin_1.ogg b/media/vocal/miya/ispin_1.ogg similarity index 100% rename from media/VOICE/miya/ispin_1.ogg rename to media/vocal/miya/ispin_1.ogg diff --git a/media/VOICE/miya/ispin_2.ogg b/media/vocal/miya/ispin_2.ogg similarity index 100% rename from media/VOICE/miya/ispin_2.ogg rename to media/vocal/miya/ispin_2.ogg diff --git a/media/VOICE/miya/ispin_3.ogg b/media/vocal/miya/ispin_3.ogg similarity index 100% rename from media/VOICE/miya/ispin_3.ogg rename to media/vocal/miya/ispin_3.ogg diff --git a/media/VOICE/miya/jspin_1.ogg b/media/vocal/miya/jspin_1.ogg similarity index 100% rename from media/VOICE/miya/jspin_1.ogg rename to media/vocal/miya/jspin_1.ogg diff --git a/media/VOICE/miya/jspin_2.ogg b/media/vocal/miya/jspin_2.ogg similarity index 100% rename from media/VOICE/miya/jspin_2.ogg rename to media/vocal/miya/jspin_2.ogg diff --git a/media/VOICE/miya/jspin_3.ogg b/media/vocal/miya/jspin_3.ogg similarity index 100% rename from media/VOICE/miya/jspin_3.ogg rename to media/vocal/miya/jspin_3.ogg diff --git a/media/VOICE/miya/jspin_4.ogg b/media/vocal/miya/jspin_4.ogg similarity index 100% rename from media/VOICE/miya/jspin_4.ogg rename to media/vocal/miya/jspin_4.ogg diff --git a/media/VOICE/miya/lose_1.ogg b/media/vocal/miya/lose_1.ogg similarity index 100% rename from media/VOICE/miya/lose_1.ogg rename to media/vocal/miya/lose_1.ogg diff --git a/media/VOICE/miya/lose_2.ogg b/media/vocal/miya/lose_2.ogg similarity index 100% rename from media/VOICE/miya/lose_2.ogg rename to media/vocal/miya/lose_2.ogg diff --git a/media/VOICE/miya/lose_3.ogg b/media/vocal/miya/lose_3.ogg similarity index 100% rename from media/VOICE/miya/lose_3.ogg rename to media/vocal/miya/lose_3.ogg diff --git a/media/VOICE/miya/lspin_1.ogg b/media/vocal/miya/lspin_1.ogg similarity index 100% rename from media/VOICE/miya/lspin_1.ogg rename to media/vocal/miya/lspin_1.ogg diff --git a/media/VOICE/miya/lspin_2.ogg b/media/vocal/miya/lspin_2.ogg similarity index 100% rename from media/VOICE/miya/lspin_2.ogg rename to media/vocal/miya/lspin_2.ogg diff --git a/media/VOICE/miya/mini_1.ogg b/media/vocal/miya/mini_1.ogg similarity index 100% rename from media/VOICE/miya/mini_1.ogg rename to media/vocal/miya/mini_1.ogg diff --git a/media/VOICE/miya/mini_2.ogg b/media/vocal/miya/mini_2.ogg similarity index 100% rename from media/VOICE/miya/mini_2.ogg rename to media/vocal/miya/mini_2.ogg diff --git a/media/VOICE/miya/mini_3.ogg b/media/vocal/miya/mini_3.ogg similarity index 100% rename from media/VOICE/miya/mini_3.ogg rename to media/vocal/miya/mini_3.ogg diff --git a/media/VOICE/miya/nya_1.ogg b/media/vocal/miya/nya_1.ogg similarity index 100% rename from media/VOICE/miya/nya_1.ogg rename to media/vocal/miya/nya_1.ogg diff --git a/media/VOICE/miya/nya_2.ogg b/media/vocal/miya/nya_2.ogg similarity index 100% rename from media/VOICE/miya/nya_2.ogg rename to media/vocal/miya/nya_2.ogg diff --git a/media/VOICE/miya/nya_3.ogg b/media/vocal/miya/nya_3.ogg similarity index 100% rename from media/VOICE/miya/nya_3.ogg rename to media/vocal/miya/nya_3.ogg diff --git a/media/VOICE/miya/nya_4.ogg b/media/vocal/miya/nya_4.ogg similarity index 100% rename from media/VOICE/miya/nya_4.ogg rename to media/vocal/miya/nya_4.ogg diff --git a/media/VOICE/miya/nya_doubt_1.ogg b/media/vocal/miya/nya_doubt_1.ogg similarity index 100% rename from media/VOICE/miya/nya_doubt_1.ogg rename to media/vocal/miya/nya_doubt_1.ogg diff --git a/media/VOICE/miya/nya_doubt_2.ogg b/media/vocal/miya/nya_doubt_2.ogg similarity index 100% rename from media/VOICE/miya/nya_doubt_2.ogg rename to media/vocal/miya/nya_doubt_2.ogg diff --git a/media/VOICE/miya/nya_happy_1.ogg b/media/vocal/miya/nya_happy_1.ogg similarity index 100% rename from media/VOICE/miya/nya_happy_1.ogg rename to media/vocal/miya/nya_happy_1.ogg diff --git a/media/VOICE/miya/nya_happy_2.ogg b/media/vocal/miya/nya_happy_2.ogg similarity index 100% rename from media/VOICE/miya/nya_happy_2.ogg rename to media/vocal/miya/nya_happy_2.ogg diff --git a/media/VOICE/miya/nya_happy_3.ogg b/media/vocal/miya/nya_happy_3.ogg similarity index 100% rename from media/VOICE/miya/nya_happy_3.ogg rename to media/vocal/miya/nya_happy_3.ogg diff --git a/media/VOICE/miya/nya_happy_4.ogg b/media/vocal/miya/nya_happy_4.ogg similarity index 100% rename from media/VOICE/miya/nya_happy_4.ogg rename to media/vocal/miya/nya_happy_4.ogg diff --git a/media/VOICE/miya/nya_sad_1.ogg b/media/vocal/miya/nya_sad_1.ogg similarity index 100% rename from media/VOICE/miya/nya_sad_1.ogg rename to media/vocal/miya/nya_sad_1.ogg diff --git a/media/VOICE/miya/ospin_1.ogg b/media/vocal/miya/ospin_1.ogg similarity index 100% rename from media/VOICE/miya/ospin_1.ogg rename to media/vocal/miya/ospin_1.ogg diff --git a/media/VOICE/miya/ospin_2.ogg b/media/vocal/miya/ospin_2.ogg similarity index 100% rename from media/VOICE/miya/ospin_2.ogg rename to media/vocal/miya/ospin_2.ogg diff --git a/media/VOICE/miya/ospin_3.ogg b/media/vocal/miya/ospin_3.ogg similarity index 100% rename from media/VOICE/miya/ospin_3.ogg rename to media/vocal/miya/ospin_3.ogg diff --git a/media/VOICE/miya/perfect_clear_1.ogg b/media/vocal/miya/perfect_clear_1.ogg similarity index 100% rename from media/VOICE/miya/perfect_clear_1.ogg rename to media/vocal/miya/perfect_clear_1.ogg diff --git a/media/VOICE/miya/perfect_clear_2.ogg b/media/vocal/miya/perfect_clear_2.ogg similarity index 100% rename from media/VOICE/miya/perfect_clear_2.ogg rename to media/vocal/miya/perfect_clear_2.ogg diff --git a/media/VOICE/miya/sad.ogg b/media/vocal/miya/sad.ogg similarity index 100% rename from media/VOICE/miya/sad.ogg rename to media/vocal/miya/sad.ogg diff --git a/media/VOICE/miya/single_1.ogg b/media/vocal/miya/single_1.ogg similarity index 100% rename from media/VOICE/miya/single_1.ogg rename to media/vocal/miya/single_1.ogg diff --git a/media/VOICE/miya/single_2.ogg b/media/vocal/miya/single_2.ogg similarity index 100% rename from media/VOICE/miya/single_2.ogg rename to media/vocal/miya/single_2.ogg diff --git a/media/VOICE/miya/single_3.ogg b/media/vocal/miya/single_3.ogg similarity index 100% rename from media/VOICE/miya/single_3.ogg rename to media/vocal/miya/single_3.ogg diff --git a/media/VOICE/miya/single_4.ogg b/media/vocal/miya/single_4.ogg similarity index 100% rename from media/VOICE/miya/single_4.ogg rename to media/vocal/miya/single_4.ogg diff --git a/media/VOICE/miya/single_5.ogg b/media/vocal/miya/single_5.ogg similarity index 100% rename from media/VOICE/miya/single_5.ogg rename to media/vocal/miya/single_5.ogg diff --git a/media/VOICE/miya/single_6.ogg b/media/vocal/miya/single_6.ogg similarity index 100% rename from media/VOICE/miya/single_6.ogg rename to media/vocal/miya/single_6.ogg diff --git a/media/VOICE/miya/single_7.ogg b/media/vocal/miya/single_7.ogg similarity index 100% rename from media/VOICE/miya/single_7.ogg rename to media/vocal/miya/single_7.ogg diff --git a/media/VOICE/miya/sspin_1.ogg b/media/vocal/miya/sspin_1.ogg similarity index 100% rename from media/VOICE/miya/sspin_1.ogg rename to media/vocal/miya/sspin_1.ogg diff --git a/media/VOICE/miya/sspin_2.ogg b/media/vocal/miya/sspin_2.ogg similarity index 100% rename from media/VOICE/miya/sspin_2.ogg rename to media/vocal/miya/sspin_2.ogg diff --git a/media/VOICE/miya/sspin_3.ogg b/media/vocal/miya/sspin_3.ogg similarity index 100% rename from media/VOICE/miya/sspin_3.ogg rename to media/vocal/miya/sspin_3.ogg diff --git a/media/VOICE/miya/sspin_4.ogg b/media/vocal/miya/sspin_4.ogg similarity index 100% rename from media/VOICE/miya/sspin_4.ogg rename to media/vocal/miya/sspin_4.ogg diff --git a/media/VOICE/miya/sspin_5.ogg b/media/vocal/miya/sspin_5.ogg similarity index 100% rename from media/VOICE/miya/sspin_5.ogg rename to media/vocal/miya/sspin_5.ogg diff --git a/media/VOICE/miya/sspin_6.ogg b/media/vocal/miya/sspin_6.ogg similarity index 100% rename from media/VOICE/miya/sspin_6.ogg rename to media/vocal/miya/sspin_6.ogg diff --git a/media/VOICE/miya/techrash_1.ogg b/media/vocal/miya/techrash_1.ogg similarity index 100% rename from media/VOICE/miya/techrash_1.ogg rename to media/vocal/miya/techrash_1.ogg diff --git a/media/VOICE/miya/techrash_2.ogg b/media/vocal/miya/techrash_2.ogg similarity index 100% rename from media/VOICE/miya/techrash_2.ogg rename to media/vocal/miya/techrash_2.ogg diff --git a/media/VOICE/miya/techrash_3.ogg b/media/vocal/miya/techrash_3.ogg similarity index 100% rename from media/VOICE/miya/techrash_3.ogg rename to media/vocal/miya/techrash_3.ogg diff --git a/media/VOICE/miya/techrash_4.ogg b/media/vocal/miya/techrash_4.ogg similarity index 100% rename from media/VOICE/miya/techrash_4.ogg rename to media/vocal/miya/techrash_4.ogg diff --git a/media/VOICE/miya/test_1.ogg b/media/vocal/miya/test_1.ogg similarity index 100% rename from media/VOICE/miya/test_1.ogg rename to media/vocal/miya/test_1.ogg diff --git a/media/VOICE/miya/test_2.ogg b/media/vocal/miya/test_2.ogg similarity index 100% rename from media/VOICE/miya/test_2.ogg rename to media/vocal/miya/test_2.ogg diff --git a/media/VOICE/miya/test_3.ogg b/media/vocal/miya/test_3.ogg similarity index 100% rename from media/VOICE/miya/test_3.ogg rename to media/vocal/miya/test_3.ogg diff --git a/media/VOICE/miya/test_4.ogg b/media/vocal/miya/test_4.ogg similarity index 100% rename from media/VOICE/miya/test_4.ogg rename to media/vocal/miya/test_4.ogg diff --git a/media/VOICE/miya/triple_1.ogg b/media/vocal/miya/triple_1.ogg similarity index 100% rename from media/VOICE/miya/triple_1.ogg rename to media/vocal/miya/triple_1.ogg diff --git a/media/VOICE/miya/triple_2.ogg b/media/vocal/miya/triple_2.ogg similarity index 100% rename from media/VOICE/miya/triple_2.ogg rename to media/vocal/miya/triple_2.ogg diff --git a/media/VOICE/miya/triple_3.ogg b/media/vocal/miya/triple_3.ogg similarity index 100% rename from media/VOICE/miya/triple_3.ogg rename to media/vocal/miya/triple_3.ogg diff --git a/media/VOICE/miya/triple_4.ogg b/media/vocal/miya/triple_4.ogg similarity index 100% rename from media/VOICE/miya/triple_4.ogg rename to media/vocal/miya/triple_4.ogg diff --git a/media/VOICE/miya/triple_5.ogg b/media/vocal/miya/triple_5.ogg similarity index 100% rename from media/VOICE/miya/triple_5.ogg rename to media/vocal/miya/triple_5.ogg diff --git a/media/VOICE/miya/triple_6.ogg b/media/vocal/miya/triple_6.ogg similarity index 100% rename from media/VOICE/miya/triple_6.ogg rename to media/vocal/miya/triple_6.ogg diff --git a/media/VOICE/miya/triple_7.ogg b/media/vocal/miya/triple_7.ogg similarity index 100% rename from media/VOICE/miya/triple_7.ogg rename to media/vocal/miya/triple_7.ogg diff --git a/media/VOICE/miya/tspin_1.ogg b/media/vocal/miya/tspin_1.ogg similarity index 100% rename from media/VOICE/miya/tspin_1.ogg rename to media/vocal/miya/tspin_1.ogg diff --git a/media/VOICE/miya/tspin_2.ogg b/media/vocal/miya/tspin_2.ogg similarity index 100% rename from media/VOICE/miya/tspin_2.ogg rename to media/vocal/miya/tspin_2.ogg diff --git a/media/VOICE/miya/tspin_3.ogg b/media/vocal/miya/tspin_3.ogg similarity index 100% rename from media/VOICE/miya/tspin_3.ogg rename to media/vocal/miya/tspin_3.ogg diff --git a/media/VOICE/miya/tspin_4.ogg b/media/vocal/miya/tspin_4.ogg similarity index 100% rename from media/VOICE/miya/tspin_4.ogg rename to media/vocal/miya/tspin_4.ogg diff --git a/media/VOICE/miya/tspin_5.ogg b/media/vocal/miya/tspin_5.ogg similarity index 100% rename from media/VOICE/miya/tspin_5.ogg rename to media/vocal/miya/tspin_5.ogg diff --git a/media/VOICE/miya/tspin_6.ogg b/media/vocal/miya/tspin_6.ogg similarity index 100% rename from media/VOICE/miya/tspin_6.ogg rename to media/vocal/miya/tspin_6.ogg diff --git a/media/VOICE/miya/welcome_voc.ogg b/media/vocal/miya/welcome_voc.ogg similarity index 100% rename from media/VOICE/miya/welcome_voc.ogg rename to media/vocal/miya/welcome_voc.ogg diff --git a/media/VOICE/miya/win_1.ogg b/media/vocal/miya/win_1.ogg similarity index 100% rename from media/VOICE/miya/win_1.ogg rename to media/vocal/miya/win_1.ogg diff --git a/media/VOICE/miya/win_2.ogg b/media/vocal/miya/win_2.ogg similarity index 100% rename from media/VOICE/miya/win_2.ogg rename to media/vocal/miya/win_2.ogg diff --git a/media/VOICE/miya/win_3.ogg b/media/vocal/miya/win_3.ogg similarity index 100% rename from media/VOICE/miya/win_3.ogg rename to media/vocal/miya/win_3.ogg diff --git a/media/VOICE/miya/win_4.ogg b/media/vocal/miya/win_4.ogg similarity index 100% rename from media/VOICE/miya/win_4.ogg rename to media/vocal/miya/win_4.ogg diff --git a/media/VOICE/miya/win_5.ogg b/media/vocal/miya/win_5.ogg similarity index 100% rename from media/VOICE/miya/win_5.ogg rename to media/vocal/miya/win_5.ogg diff --git a/media/VOICE/miya/win_6.ogg b/media/vocal/miya/win_6.ogg similarity index 100% rename from media/VOICE/miya/win_6.ogg rename to media/vocal/miya/win_6.ogg diff --git a/media/VOICE/miya/win_7.ogg b/media/vocal/miya/win_7.ogg similarity index 100% rename from media/VOICE/miya/win_7.ogg rename to media/vocal/miya/win_7.ogg diff --git a/media/VOICE/miya/win_8.ogg b/media/vocal/miya/win_8.ogg similarity index 100% rename from media/VOICE/miya/win_8.ogg rename to media/vocal/miya/win_8.ogg diff --git a/media/VOICE/miya/zspin_1.ogg b/media/vocal/miya/zspin_1.ogg similarity index 100% rename from media/VOICE/miya/zspin_1.ogg rename to media/vocal/miya/zspin_1.ogg diff --git a/media/VOICE/miya/zspin_2.ogg b/media/vocal/miya/zspin_2.ogg similarity index 100% rename from media/VOICE/miya/zspin_2.ogg rename to media/vocal/miya/zspin_2.ogg diff --git a/media/VOICE/miya/zspin_3.ogg b/media/vocal/miya/zspin_3.ogg similarity index 100% rename from media/VOICE/miya/zspin_3.ogg rename to media/vocal/miya/zspin_3.ogg diff --git a/media/VOICE/naki/b2b_1.ogg b/media/vocal/naki/b2b_1.ogg similarity index 100% rename from media/VOICE/naki/b2b_1.ogg rename to media/vocal/naki/b2b_1.ogg diff --git a/media/VOICE/naki/b2b_2.ogg b/media/vocal/naki/b2b_2.ogg similarity index 100% rename from media/VOICE/naki/b2b_2.ogg rename to media/vocal/naki/b2b_2.ogg diff --git a/media/VOICE/naki/b3b_1.ogg b/media/vocal/naki/b3b_1.ogg similarity index 100% rename from media/VOICE/naki/b3b_1.ogg rename to media/vocal/naki/b3b_1.ogg diff --git a/media/VOICE/naki/b3b_2.ogg b/media/vocal/naki/b3b_2.ogg similarity index 100% rename from media/VOICE/naki/b3b_2.ogg rename to media/vocal/naki/b3b_2.ogg diff --git a/media/VOICE/naki/double.ogg b/media/vocal/naki/double.ogg similarity index 100% rename from media/VOICE/naki/double.ogg rename to media/vocal/naki/double.ogg diff --git a/media/VOICE/naki/half_clear_1.ogg b/media/vocal/naki/half_clear_1.ogg similarity index 100% rename from media/VOICE/naki/half_clear_1.ogg rename to media/vocal/naki/half_clear_1.ogg diff --git a/media/VOICE/naki/ispin_1.ogg b/media/vocal/naki/ispin_1.ogg similarity index 100% rename from media/VOICE/naki/ispin_1.ogg rename to media/vocal/naki/ispin_1.ogg diff --git a/media/VOICE/naki/ispin_2.ogg b/media/vocal/naki/ispin_2.ogg similarity index 100% rename from media/VOICE/naki/ispin_2.ogg rename to media/vocal/naki/ispin_2.ogg diff --git a/media/VOICE/naki/ispin_3.ogg b/media/vocal/naki/ispin_3.ogg similarity index 100% rename from media/VOICE/naki/ispin_3.ogg rename to media/vocal/naki/ispin_3.ogg diff --git a/media/VOICE/naki/ispin_4.ogg b/media/vocal/naki/ispin_4.ogg similarity index 100% rename from media/VOICE/naki/ispin_4.ogg rename to media/vocal/naki/ispin_4.ogg diff --git a/media/VOICE/naki/jspin_1.ogg b/media/vocal/naki/jspin_1.ogg similarity index 100% rename from media/VOICE/naki/jspin_1.ogg rename to media/vocal/naki/jspin_1.ogg diff --git a/media/VOICE/naki/jspin_2.ogg b/media/vocal/naki/jspin_2.ogg similarity index 100% rename from media/VOICE/naki/jspin_2.ogg rename to media/vocal/naki/jspin_2.ogg diff --git a/media/VOICE/naki/jspin_3.ogg b/media/vocal/naki/jspin_3.ogg similarity index 100% rename from media/VOICE/naki/jspin_3.ogg rename to media/vocal/naki/jspin_3.ogg diff --git a/media/VOICE/naki/jspin_4.ogg b/media/vocal/naki/jspin_4.ogg similarity index 100% rename from media/VOICE/naki/jspin_4.ogg rename to media/vocal/naki/jspin_4.ogg diff --git a/media/VOICE/naki/lose_1.ogg b/media/vocal/naki/lose_1.ogg similarity index 100% rename from media/VOICE/naki/lose_1.ogg rename to media/vocal/naki/lose_1.ogg diff --git a/media/VOICE/naki/lose_2.ogg b/media/vocal/naki/lose_2.ogg similarity index 100% rename from media/VOICE/naki/lose_2.ogg rename to media/vocal/naki/lose_2.ogg diff --git a/media/VOICE/naki/lose_3.ogg b/media/vocal/naki/lose_3.ogg similarity index 100% rename from media/VOICE/naki/lose_3.ogg rename to media/vocal/naki/lose_3.ogg diff --git a/media/VOICE/naki/lspin_1.ogg b/media/vocal/naki/lspin_1.ogg similarity index 100% rename from media/VOICE/naki/lspin_1.ogg rename to media/vocal/naki/lspin_1.ogg diff --git a/media/VOICE/naki/lspin_2.ogg b/media/vocal/naki/lspin_2.ogg similarity index 100% rename from media/VOICE/naki/lspin_2.ogg rename to media/vocal/naki/lspin_2.ogg diff --git a/media/VOICE/naki/lspin_3.ogg b/media/vocal/naki/lspin_3.ogg similarity index 100% rename from media/VOICE/naki/lspin_3.ogg rename to media/vocal/naki/lspin_3.ogg diff --git a/media/VOICE/naki/mini_1.ogg b/media/vocal/naki/mini_1.ogg similarity index 100% rename from media/VOICE/naki/mini_1.ogg rename to media/vocal/naki/mini_1.ogg diff --git a/media/VOICE/naki/mini_2.ogg b/media/vocal/naki/mini_2.ogg similarity index 100% rename from media/VOICE/naki/mini_2.ogg rename to media/vocal/naki/mini_2.ogg diff --git a/media/VOICE/naki/mini_3.ogg b/media/vocal/naki/mini_3.ogg similarity index 100% rename from media/VOICE/naki/mini_3.ogg rename to media/vocal/naki/mini_3.ogg diff --git a/media/VOICE/naki/ospin_1.ogg b/media/vocal/naki/ospin_1.ogg similarity index 100% rename from media/VOICE/naki/ospin_1.ogg rename to media/vocal/naki/ospin_1.ogg diff --git a/media/VOICE/naki/ospin_2.ogg b/media/vocal/naki/ospin_2.ogg similarity index 100% rename from media/VOICE/naki/ospin_2.ogg rename to media/vocal/naki/ospin_2.ogg diff --git a/media/VOICE/naki/ospin_3.ogg b/media/vocal/naki/ospin_3.ogg similarity index 100% rename from media/VOICE/naki/ospin_3.ogg rename to media/vocal/naki/ospin_3.ogg diff --git a/media/VOICE/naki/perfect_clear.ogg b/media/vocal/naki/perfect_clear.ogg similarity index 100% rename from media/VOICE/naki/perfect_clear.ogg rename to media/vocal/naki/perfect_clear.ogg diff --git a/media/VOICE/naki/single_1.ogg b/media/vocal/naki/single_1.ogg similarity index 100% rename from media/VOICE/naki/single_1.ogg rename to media/vocal/naki/single_1.ogg diff --git a/media/VOICE/naki/single_2.ogg b/media/vocal/naki/single_2.ogg similarity index 100% rename from media/VOICE/naki/single_2.ogg rename to media/vocal/naki/single_2.ogg diff --git a/media/VOICE/naki/sspin_1.ogg b/media/vocal/naki/sspin_1.ogg similarity index 100% rename from media/VOICE/naki/sspin_1.ogg rename to media/vocal/naki/sspin_1.ogg diff --git a/media/VOICE/naki/sspin_2.ogg b/media/vocal/naki/sspin_2.ogg similarity index 100% rename from media/VOICE/naki/sspin_2.ogg rename to media/vocal/naki/sspin_2.ogg diff --git a/media/VOICE/naki/sspin_3.ogg b/media/vocal/naki/sspin_3.ogg similarity index 100% rename from media/VOICE/naki/sspin_3.ogg rename to media/vocal/naki/sspin_3.ogg diff --git a/media/VOICE/naki/techrash_1.ogg b/media/vocal/naki/techrash_1.ogg similarity index 100% rename from media/VOICE/naki/techrash_1.ogg rename to media/vocal/naki/techrash_1.ogg diff --git a/media/VOICE/naki/techrash_2.ogg b/media/vocal/naki/techrash_2.ogg similarity index 100% rename from media/VOICE/naki/techrash_2.ogg rename to media/vocal/naki/techrash_2.ogg diff --git a/media/VOICE/naki/test_1.ogg b/media/vocal/naki/test_1.ogg similarity index 100% rename from media/VOICE/naki/test_1.ogg rename to media/vocal/naki/test_1.ogg diff --git a/media/VOICE/naki/test_2.ogg b/media/vocal/naki/test_2.ogg similarity index 100% rename from media/VOICE/naki/test_2.ogg rename to media/vocal/naki/test_2.ogg diff --git a/media/VOICE/naki/triple.ogg b/media/vocal/naki/triple.ogg similarity index 100% rename from media/VOICE/naki/triple.ogg rename to media/vocal/naki/triple.ogg diff --git a/media/VOICE/naki/triple_1.ogg b/media/vocal/naki/triple_1.ogg similarity index 100% rename from media/VOICE/naki/triple_1.ogg rename to media/vocal/naki/triple_1.ogg diff --git a/media/VOICE/naki/tspin_1.ogg b/media/vocal/naki/tspin_1.ogg similarity index 100% rename from media/VOICE/naki/tspin_1.ogg rename to media/vocal/naki/tspin_1.ogg diff --git a/media/VOICE/naki/tspin_2.ogg b/media/vocal/naki/tspin_2.ogg similarity index 100% rename from media/VOICE/naki/tspin_2.ogg rename to media/vocal/naki/tspin_2.ogg diff --git a/media/VOICE/naki/tspin_3.ogg b/media/vocal/naki/tspin_3.ogg similarity index 100% rename from media/VOICE/naki/tspin_3.ogg rename to media/vocal/naki/tspin_3.ogg diff --git a/media/VOICE/naki/welcome_voc_1.ogg b/media/vocal/naki/welcome_voc_1.ogg similarity index 100% rename from media/VOICE/naki/welcome_voc_1.ogg rename to media/vocal/naki/welcome_voc_1.ogg diff --git a/media/VOICE/naki/welcome_voc_2.ogg b/media/vocal/naki/welcome_voc_2.ogg similarity index 100% rename from media/VOICE/naki/welcome_voc_2.ogg rename to media/vocal/naki/welcome_voc_2.ogg diff --git a/media/VOICE/naki/welcome_voc_3.ogg b/media/vocal/naki/welcome_voc_3.ogg similarity index 100% rename from media/VOICE/naki/welcome_voc_3.ogg rename to media/vocal/naki/welcome_voc_3.ogg diff --git a/media/VOICE/naki/win_1.ogg b/media/vocal/naki/win_1.ogg similarity index 100% rename from media/VOICE/naki/win_1.ogg rename to media/vocal/naki/win_1.ogg diff --git a/media/VOICE/naki/win_2.ogg b/media/vocal/naki/win_2.ogg similarity index 100% rename from media/VOICE/naki/win_2.ogg rename to media/vocal/naki/win_2.ogg diff --git a/media/VOICE/naki/win_3.ogg b/media/vocal/naki/win_3.ogg similarity index 100% rename from media/VOICE/naki/win_3.ogg rename to media/vocal/naki/win_3.ogg diff --git a/media/VOICE/naki/zspin_1.ogg b/media/vocal/naki/zspin_1.ogg similarity index 100% rename from media/VOICE/naki/zspin_1.ogg rename to media/vocal/naki/zspin_1.ogg diff --git a/media/VOICE/naki/zspin_2.ogg b/media/vocal/naki/zspin_2.ogg similarity index 100% rename from media/VOICE/naki/zspin_2.ogg rename to media/vocal/naki/zspin_2.ogg diff --git a/media/VOICE/naki/zspin_3.ogg b/media/vocal/naki/zspin_3.ogg similarity index 100% rename from media/VOICE/naki/zspin_3.ogg rename to media/vocal/naki/zspin_3.ogg diff --git a/media/VOICE/xiaoya/b2b_1.ogg b/media/vocal/xiaoya/b2b_1.ogg similarity index 100% rename from media/VOICE/xiaoya/b2b_1.ogg rename to media/vocal/xiaoya/b2b_1.ogg diff --git a/media/VOICE/xiaoya/b2b_2.ogg b/media/vocal/xiaoya/b2b_2.ogg similarity index 100% rename from media/VOICE/xiaoya/b2b_2.ogg rename to media/vocal/xiaoya/b2b_2.ogg diff --git a/media/VOICE/xiaoya/b3b_1.ogg b/media/vocal/xiaoya/b3b_1.ogg similarity index 100% rename from media/VOICE/xiaoya/b3b_1.ogg rename to media/vocal/xiaoya/b3b_1.ogg diff --git a/media/VOICE/xiaoya/b3b_2.ogg b/media/vocal/xiaoya/b3b_2.ogg similarity index 100% rename from media/VOICE/xiaoya/b3b_2.ogg rename to media/vocal/xiaoya/b3b_2.ogg diff --git a/media/VOICE/xiaoya/bye_1.ogg b/media/vocal/xiaoya/bye_1.ogg similarity index 100% rename from media/VOICE/xiaoya/bye_1.ogg rename to media/vocal/xiaoya/bye_1.ogg diff --git a/media/VOICE/xiaoya/bye_2.ogg b/media/vocal/xiaoya/bye_2.ogg similarity index 100% rename from media/VOICE/xiaoya/bye_2.ogg rename to media/vocal/xiaoya/bye_2.ogg diff --git a/media/VOICE/xiaoya/bye_3.ogg b/media/vocal/xiaoya/bye_3.ogg similarity index 100% rename from media/VOICE/xiaoya/bye_3.ogg rename to media/vocal/xiaoya/bye_3.ogg diff --git a/media/VOICE/xiaoya/double_1.ogg b/media/vocal/xiaoya/double_1.ogg similarity index 100% rename from media/VOICE/xiaoya/double_1.ogg rename to media/vocal/xiaoya/double_1.ogg diff --git a/media/VOICE/xiaoya/double_2.ogg b/media/vocal/xiaoya/double_2.ogg similarity index 100% rename from media/VOICE/xiaoya/double_2.ogg rename to media/vocal/xiaoya/double_2.ogg diff --git a/media/VOICE/xiaoya/double_3.ogg b/media/vocal/xiaoya/double_3.ogg similarity index 100% rename from media/VOICE/xiaoya/double_3.ogg rename to media/vocal/xiaoya/double_3.ogg diff --git a/media/VOICE/xiaoya/half_clear_1.ogg b/media/vocal/xiaoya/half_clear_1.ogg similarity index 100% rename from media/VOICE/xiaoya/half_clear_1.ogg rename to media/vocal/xiaoya/half_clear_1.ogg diff --git a/media/VOICE/xiaoya/half_clear_2.ogg b/media/vocal/xiaoya/half_clear_2.ogg similarity index 100% rename from media/VOICE/xiaoya/half_clear_2.ogg rename to media/vocal/xiaoya/half_clear_2.ogg diff --git a/media/VOICE/xiaoya/ispin_1.ogg b/media/vocal/xiaoya/ispin_1.ogg similarity index 100% rename from media/VOICE/xiaoya/ispin_1.ogg rename to media/vocal/xiaoya/ispin_1.ogg diff --git a/media/VOICE/xiaoya/ispin_2.ogg b/media/vocal/xiaoya/ispin_2.ogg similarity index 100% rename from media/VOICE/xiaoya/ispin_2.ogg rename to media/vocal/xiaoya/ispin_2.ogg diff --git a/media/VOICE/xiaoya/ispin_3.ogg b/media/vocal/xiaoya/ispin_3.ogg similarity index 100% rename from media/VOICE/xiaoya/ispin_3.ogg rename to media/vocal/xiaoya/ispin_3.ogg diff --git a/media/VOICE/xiaoya/ispin_4.ogg b/media/vocal/xiaoya/ispin_4.ogg similarity index 100% rename from media/VOICE/xiaoya/ispin_4.ogg rename to media/vocal/xiaoya/ispin_4.ogg diff --git a/media/VOICE/xiaoya/jspin_1.ogg b/media/vocal/xiaoya/jspin_1.ogg similarity index 100% rename from media/VOICE/xiaoya/jspin_1.ogg rename to media/vocal/xiaoya/jspin_1.ogg diff --git a/media/VOICE/xiaoya/jspin_2.ogg b/media/vocal/xiaoya/jspin_2.ogg similarity index 100% rename from media/VOICE/xiaoya/jspin_2.ogg rename to media/vocal/xiaoya/jspin_2.ogg diff --git a/media/VOICE/xiaoya/jspin_3.ogg b/media/vocal/xiaoya/jspin_3.ogg similarity index 100% rename from media/VOICE/xiaoya/jspin_3.ogg rename to media/vocal/xiaoya/jspin_3.ogg diff --git a/media/VOICE/xiaoya/jspin_4.ogg b/media/vocal/xiaoya/jspin_4.ogg similarity index 100% rename from media/VOICE/xiaoya/jspin_4.ogg rename to media/vocal/xiaoya/jspin_4.ogg diff --git a/media/VOICE/xiaoya/lose_1.ogg b/media/vocal/xiaoya/lose_1.ogg similarity index 100% rename from media/VOICE/xiaoya/lose_1.ogg rename to media/vocal/xiaoya/lose_1.ogg diff --git a/media/VOICE/xiaoya/lose_2.ogg b/media/vocal/xiaoya/lose_2.ogg similarity index 100% rename from media/VOICE/xiaoya/lose_2.ogg rename to media/vocal/xiaoya/lose_2.ogg diff --git a/media/VOICE/xiaoya/lose_3.ogg b/media/vocal/xiaoya/lose_3.ogg similarity index 100% rename from media/VOICE/xiaoya/lose_3.ogg rename to media/vocal/xiaoya/lose_3.ogg diff --git a/media/VOICE/xiaoya/lspin_1.ogg b/media/vocal/xiaoya/lspin_1.ogg similarity index 100% rename from media/VOICE/xiaoya/lspin_1.ogg rename to media/vocal/xiaoya/lspin_1.ogg diff --git a/media/VOICE/xiaoya/lspin_2.ogg b/media/vocal/xiaoya/lspin_2.ogg similarity index 100% rename from media/VOICE/xiaoya/lspin_2.ogg rename to media/vocal/xiaoya/lspin_2.ogg diff --git a/media/VOICE/xiaoya/lspin_3.ogg b/media/vocal/xiaoya/lspin_3.ogg similarity index 100% rename from media/VOICE/xiaoya/lspin_3.ogg rename to media/vocal/xiaoya/lspin_3.ogg diff --git a/media/VOICE/xiaoya/lspin_4.ogg b/media/vocal/xiaoya/lspin_4.ogg similarity index 100% rename from media/VOICE/xiaoya/lspin_4.ogg rename to media/vocal/xiaoya/lspin_4.ogg diff --git a/media/VOICE/xiaoya/mini_1.ogg b/media/vocal/xiaoya/mini_1.ogg similarity index 100% rename from media/VOICE/xiaoya/mini_1.ogg rename to media/vocal/xiaoya/mini_1.ogg diff --git a/media/VOICE/xiaoya/mini_2.ogg b/media/vocal/xiaoya/mini_2.ogg similarity index 100% rename from media/VOICE/xiaoya/mini_2.ogg rename to media/vocal/xiaoya/mini_2.ogg diff --git a/media/VOICE/xiaoya/ospin_1.ogg b/media/vocal/xiaoya/ospin_1.ogg similarity index 100% rename from media/VOICE/xiaoya/ospin_1.ogg rename to media/vocal/xiaoya/ospin_1.ogg diff --git a/media/VOICE/xiaoya/ospin_2.ogg b/media/vocal/xiaoya/ospin_2.ogg similarity index 100% rename from media/VOICE/xiaoya/ospin_2.ogg rename to media/vocal/xiaoya/ospin_2.ogg diff --git a/media/VOICE/xiaoya/ospin_3.ogg b/media/vocal/xiaoya/ospin_3.ogg similarity index 100% rename from media/VOICE/xiaoya/ospin_3.ogg rename to media/vocal/xiaoya/ospin_3.ogg diff --git a/media/VOICE/xiaoya/ospin_4.ogg b/media/vocal/xiaoya/ospin_4.ogg similarity index 100% rename from media/VOICE/xiaoya/ospin_4.ogg rename to media/vocal/xiaoya/ospin_4.ogg diff --git a/media/VOICE/xiaoya/perfect_clear_1.ogg b/media/vocal/xiaoya/perfect_clear_1.ogg similarity index 100% rename from media/VOICE/xiaoya/perfect_clear_1.ogg rename to media/vocal/xiaoya/perfect_clear_1.ogg diff --git a/media/VOICE/xiaoya/perfect_clear_2.ogg b/media/vocal/xiaoya/perfect_clear_2.ogg similarity index 100% rename from media/VOICE/xiaoya/perfect_clear_2.ogg rename to media/vocal/xiaoya/perfect_clear_2.ogg diff --git a/media/VOICE/xiaoya/single_1.ogg b/media/vocal/xiaoya/single_1.ogg similarity index 100% rename from media/VOICE/xiaoya/single_1.ogg rename to media/vocal/xiaoya/single_1.ogg diff --git a/media/VOICE/xiaoya/single_2.ogg b/media/vocal/xiaoya/single_2.ogg similarity index 100% rename from media/VOICE/xiaoya/single_2.ogg rename to media/vocal/xiaoya/single_2.ogg diff --git a/media/VOICE/xiaoya/single_3.ogg b/media/vocal/xiaoya/single_3.ogg similarity index 100% rename from media/VOICE/xiaoya/single_3.ogg rename to media/vocal/xiaoya/single_3.ogg diff --git a/media/VOICE/xiaoya/sspin_1.ogg b/media/vocal/xiaoya/sspin_1.ogg similarity index 100% rename from media/VOICE/xiaoya/sspin_1.ogg rename to media/vocal/xiaoya/sspin_1.ogg diff --git a/media/VOICE/xiaoya/sspin_2.ogg b/media/vocal/xiaoya/sspin_2.ogg similarity index 100% rename from media/VOICE/xiaoya/sspin_2.ogg rename to media/vocal/xiaoya/sspin_2.ogg diff --git a/media/VOICE/xiaoya/sspin_3.ogg b/media/vocal/xiaoya/sspin_3.ogg similarity index 100% rename from media/VOICE/xiaoya/sspin_3.ogg rename to media/vocal/xiaoya/sspin_3.ogg diff --git a/media/VOICE/xiaoya/sspin_4.ogg b/media/vocal/xiaoya/sspin_4.ogg similarity index 100% rename from media/VOICE/xiaoya/sspin_4.ogg rename to media/vocal/xiaoya/sspin_4.ogg diff --git a/media/VOICE/xiaoya/techrash_1.ogg b/media/vocal/xiaoya/techrash_1.ogg similarity index 100% rename from media/VOICE/xiaoya/techrash_1.ogg rename to media/vocal/xiaoya/techrash_1.ogg diff --git a/media/VOICE/xiaoya/techrash_2.ogg b/media/vocal/xiaoya/techrash_2.ogg similarity index 100% rename from media/VOICE/xiaoya/techrash_2.ogg rename to media/vocal/xiaoya/techrash_2.ogg diff --git a/media/VOICE/xiaoya/test_1.ogg b/media/vocal/xiaoya/test_1.ogg similarity index 100% rename from media/VOICE/xiaoya/test_1.ogg rename to media/vocal/xiaoya/test_1.ogg diff --git a/media/VOICE/xiaoya/triple_1.ogg b/media/vocal/xiaoya/triple_1.ogg similarity index 100% rename from media/VOICE/xiaoya/triple_1.ogg rename to media/vocal/xiaoya/triple_1.ogg diff --git a/media/VOICE/xiaoya/triple_2.ogg b/media/vocal/xiaoya/triple_2.ogg similarity index 100% rename from media/VOICE/xiaoya/triple_2.ogg rename to media/vocal/xiaoya/triple_2.ogg diff --git a/media/VOICE/xiaoya/triple_3.ogg b/media/vocal/xiaoya/triple_3.ogg similarity index 100% rename from media/VOICE/xiaoya/triple_3.ogg rename to media/vocal/xiaoya/triple_3.ogg diff --git a/media/VOICE/xiaoya/tspin_1.ogg b/media/vocal/xiaoya/tspin_1.ogg similarity index 100% rename from media/VOICE/xiaoya/tspin_1.ogg rename to media/vocal/xiaoya/tspin_1.ogg diff --git a/media/VOICE/xiaoya/tspin_3.ogg b/media/vocal/xiaoya/tspin_3.ogg similarity index 100% rename from media/VOICE/xiaoya/tspin_3.ogg rename to media/vocal/xiaoya/tspin_3.ogg diff --git a/media/VOICE/xiaoya/tspin_4.ogg b/media/vocal/xiaoya/tspin_4.ogg similarity index 100% rename from media/VOICE/xiaoya/tspin_4.ogg rename to media/vocal/xiaoya/tspin_4.ogg diff --git a/media/VOICE/xiaoya/welcome_voc_1.ogg b/media/vocal/xiaoya/welcome_voc_1.ogg similarity index 100% rename from media/VOICE/xiaoya/welcome_voc_1.ogg rename to media/vocal/xiaoya/welcome_voc_1.ogg diff --git a/media/VOICE/xiaoya/welcome_voc_2.ogg b/media/vocal/xiaoya/welcome_voc_2.ogg similarity index 100% rename from media/VOICE/xiaoya/welcome_voc_2.ogg rename to media/vocal/xiaoya/welcome_voc_2.ogg diff --git a/media/VOICE/xiaoya/welcome_voc_3.ogg b/media/vocal/xiaoya/welcome_voc_3.ogg similarity index 100% rename from media/VOICE/xiaoya/welcome_voc_3.ogg rename to media/vocal/xiaoya/welcome_voc_3.ogg diff --git a/media/VOICE/xiaoya/win_1.ogg b/media/vocal/xiaoya/win_1.ogg similarity index 100% rename from media/VOICE/xiaoya/win_1.ogg rename to media/vocal/xiaoya/win_1.ogg diff --git a/media/VOICE/xiaoya/win_2.ogg b/media/vocal/xiaoya/win_2.ogg similarity index 100% rename from media/VOICE/xiaoya/win_2.ogg rename to media/vocal/xiaoya/win_2.ogg diff --git a/media/VOICE/xiaoya/win_3.ogg b/media/vocal/xiaoya/win_3.ogg similarity index 100% rename from media/VOICE/xiaoya/win_3.ogg rename to media/vocal/xiaoya/win_3.ogg diff --git a/media/VOICE/xiaoya/zspin_1.ogg b/media/vocal/xiaoya/zspin_1.ogg similarity index 100% rename from media/VOICE/xiaoya/zspin_1.ogg rename to media/vocal/xiaoya/zspin_1.ogg diff --git a/media/VOICE/xiaoya/zspin_2.ogg b/media/vocal/xiaoya/zspin_2.ogg similarity index 100% rename from media/VOICE/xiaoya/zspin_2.ogg rename to media/vocal/xiaoya/zspin_2.ogg diff --git a/media/VOICE/xiaoya/zspin_3.ogg b/media/vocal/xiaoya/zspin_3.ogg similarity index 100% rename from media/VOICE/xiaoya/zspin_3.ogg rename to media/vocal/xiaoya/zspin_3.ogg diff --git a/media/VOICE/xiaoya/zspin_4.ogg b/media/vocal/xiaoya/zspin_4.ogg similarity index 100% rename from media/VOICE/xiaoya/zspin_4.ogg rename to media/vocal/xiaoya/zspin_4.ogg diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 0bb40a77..98588a80 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -303,6 +303,8 @@ SETTING={--Settings --Sound autoMute=true, + sfxPack='chiptune', + vocPack='miya', mainVol=1, sfx=1, sfx_spawn=0, @@ -311,7 +313,6 @@ SETTING={--Settings stereo=.7, vib=0, voc=0, - cv='miya', --Virtualkey VKSFX=.2,--SFX volume diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index ea526d9d..6f05ad99 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -387,7 +387,8 @@ return{ autoMute="Mute while unfocused", fine="Finesse Error SFX", - cv="Voice Pack", + sfxPack="SFX Pack", + vocPack="Voice Pack", apply="Apply", }, setting_control={ diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index c8fe459c..cc619d33 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -352,7 +352,8 @@ return{ -- autoMute="Mute while unfocused", fine="Sonido de Error de Finesse", - cv="Pack de Voces", + -- sfxPack="SFX Pack", + vocPack="Pack de Voces", apply="Aplicar", }, setting_control={ diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 8b2ab32a..1f1ea129 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -351,7 +351,8 @@ return{ -- autoMute="Mute while unfocused", fine="Son d'erreur de Finesse", - -- cv="Voice Pack", + -- sfxPack="SFX Pack", + -- vocPack="Voice Pack", -- apply="Apply", }, setting_control={ diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 5163ceea..a96b1bd1 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -375,7 +375,8 @@ return{ -- autoMute="Mute while unfocused", fine="Som Falha de destreza", - cv="Pacote de voz", + -- sfxPack="SFX Pack", + vocPack="Pacote de voz", apply="Aplicar", }, setting_control={ diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index b448c597..85c1e485 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -105,7 +105,8 @@ return{ spawn="出块", warn="警告", vib="嗡嗡", - cv="谁", + sfxPack="啥", + vocPack="谁", }, setting_control={ title="改控制", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 255adc69..78e46036 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -386,7 +386,8 @@ return{ autoMute="失去焦点自动静音", fine="极简操作提示音", - cv="语音包", + sfxPack="音效包", + vocPack="语音包", apply="应用", }, setting_control={ diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 94b2a2b7..389bbff7 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -22,8 +22,8 @@ local loadingThread=coroutine.wrap(function() logoColor2={COLOR.rainbow_light(r)} end YIELD() - YIELD('loadSFX')SFX.loadAll() - YIELD('loadVoice')VOC.loadAll() + YIELD('loadSFX')SFX.load('media/effect/'..SETTING.sfxPack..'/') + YIELD('loadVoice')VOC.load('media/vocal/'..SETTING.vocPack..'/') YIELD('loadFont')for i=1,17 do getFont(15+5*i)end YIELD('loadModeIcon') diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 2be0bcc6..3edfe39e 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -7,12 +7,15 @@ local scene={} local last--Last touch time local jump--Animation timer(10 to 0) -local cv=SETTING.cv +local sfxPack=SETTING.sfxPack +local vocPack=SETTING.vocPack function scene.sceneInit() last,jump=0,0 - cv=SETTING.cv - WIDGET.active.cv:reset() + sfxPack=SETTING.sfxPack + vocPack=SETTING.vocPack + WIDGET.active.sfxPack:reset() + WIDGET.active.vocPack:reset() BG.set() end function scene.sceneBack() @@ -52,44 +55,46 @@ function scene.draw() local t=TIME() local x,y=800,340+10*sin(t*.5)+(jump-10)*jump*.3 gc.translate(x,y) - if cv=="miya"then + if vocPack=="miya"then gc.draw(IMG.miyaCH) gc.setColor(1,1,1,.7) gc.draw(IMG.miyaF1,4,47+4*sin(t*.9)) gc.draw(IMG.miyaF2,42,107+5*sin(t)) gc.draw(IMG.miyaF3,93,126+3*sin(t*.7)) gc.draw(IMG.miyaF4,129,98+3*sin(t*.5)) - elseif cv=="mono"then + elseif vocPack=="mono"then gc.draw(IMG.monoCH,-30) - elseif cv=="xiaoya"then + elseif vocPack=="xiaoya"then gc.draw(IMG.xiaoyaCH,-30) - elseif cv=="miku"then + elseif vocPack=="miku"then gc.draw(IMG.mikuCH,-30) end gc.translate(-x,-y) end scene.widgetList={ - WIDGET.newText{name="title", x=640, y=15,font=80}, + WIDGET.newText{name="title", x=640, y=15,font=80}, - WIDGET.newButton{name="game", x=200, y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeR')}, - WIDGET.newButton{name="graphic",x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeL')}, + WIDGET.newButton{name="game", x=200, y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeR')}, + WIDGET.newButton{name="graphic", x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeL')}, - WIDGET.newSlider{name="mainVol",x=300, y=170,w=520,color='lG',disp=SETval('mainVol'),code=function(v)SETTING.mainVol=v love.audio.setVolume(SETTING.mainVol)end}, - WIDGET.newSlider{name="bgm", x=300, y=240,w=420,color='lG',disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, - WIDGET.newSlider{name="sfx", x=300, y=310,w=420,color='lC',change=function()SFX.play('blip_1')end,disp=SETval('sfx'),code=SETsto('sfx')}, - WIDGET.newSlider{name="stereo", x=300, y=380,w=420,color='lC',change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval('stereo'),code=SETsto('stereo'),hideF=function()return SETTING.sx==0 end}, - WIDGET.newSlider{name="spawn", x=300, y=450,w=420,color='lC',change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,disp=SETval('sfx_spawn'),code=SETsto('sfx_spawn')}, - WIDGET.newSlider{name="warn", x=300, y=520,w=420,color='lC',change=function()SFX.fplay('warning',SETTING.sfx_warn)end,disp=SETval('sfx_warn'),code=SETsto('sfx_warn')}, - WIDGET.newSlider{name="vib", x=300, y=590,w=420,color='lN',unit=10,change=function()VIB(2)end,disp=SETval('vib'),code=SETsto('vib')}, - WIDGET.newSlider{name="voc", x=300, y=660,w=420,color='lN',change=function()VOC.play('test')end,disp=SETval('voc'),code=SETsto('voc')}, + WIDGET.newSlider{name="mainVol", x=300, y=170,w=520,color='lG',disp=SETval('mainVol'),code=function(v)SETTING.mainVol=v love.audio.setVolume(SETTING.mainVol)end}, + WIDGET.newSlider{name="bgm", x=300, y=240,w=420,color='lG',disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, + WIDGET.newSlider{name="sfx", x=300, y=310,w=420,color='lC',change=function()SFX.play('blip_1')end,disp=SETval('sfx'),code=SETsto('sfx')}, + WIDGET.newSlider{name="stereo", x=300, y=380,w=420,color='lC',change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval('stereo'),code=SETsto('stereo'),hideF=function()return SETTING.sfx==0 end}, + WIDGET.newSlider{name="spawn", x=300, y=450,w=420,color='lC',change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,disp=SETval('sfx_spawn'),code=SETsto('sfx_spawn')}, + WIDGET.newSlider{name="warn", x=300, y=520,w=420,color='lC',change=function()SFX.fplay('warning',SETTING.sfx_warn)end,disp=SETval('sfx_warn'),code=SETsto('sfx_warn')}, + WIDGET.newSlider{name="vib", x=300, y=590,w=420,color='lN',unit=10,change=function()VIB(2)end,disp=SETval('vib'),code=SETsto('vib')}, + WIDGET.newSlider{name="voc", x=300, y=660,w=420,color='lN',change=function()VOC.play('test')end,disp=SETval('voc'),code=SETsto('voc')}, - WIDGET.newSwitch{name="autoMute",x=1150,y=190,disp=SETval('autoMute'),code=SETrev('autoMute')}, - 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.newSwitch{name="autoMute", x=1150,y=210,disp=SETval('autoMute'),code=SETrev('autoMute')}, + 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','mono','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}, + WIDGET.newSelector{name="sfxPack",x=1100,y=340,w=200,list={'chiptune'},disp=function()return sfxPack end,code=function(i)sfxPack=i end}, + WIDGET.newButton{name="apply", x=1100,y=410,w=180,h=60,code=function()SETTING.sfxPack=sfxPack SFX.load('media/effect/'..sfxPack..'/')end,hideF=function()return SETTING.sfxPack==sfxPack end}, + WIDGET.newSelector{name="vocPack",x=1100,y=480,w=200,list={'miya','mono','xiaoya','miku'},disp=function()return vocPack end,code=function(i)vocPack=i end}, + WIDGET.newButton{name="apply", x=1100,y=550,w=180,h=60,code=function()SETTING.vocPack=vocPack VOC.load('media/vocal/'..vocPack..'/')end,hideF=function()return SETTING.vocPack==vocPack end}, + WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene}, } return scene diff --git a/parts/skin.lua b/parts/skin.lua index 328b6569..95d38282 100644 --- a/parts/skin.lua +++ b/parts/skin.lua @@ -27,7 +27,7 @@ function SKIN.init(list) if love.filesystem.getInfo(N)then I=gc.newImage(N) else - MES.new('warn',"No skin file: "..Skins[name]) + MES.new('warn',"[no skin] "..Skins[name]) end gc.setDefaultFilter(f1,f2)