diff --git a/BGM/newera.ogg b/BGM/new era.ogg similarity index 100% rename from BGM/newera.ogg rename to BGM/new era.ogg diff --git a/BGM/sugar fairy.ogg b/BGM/sugar fairy.ogg new file mode 100644 index 00000000..fb9e269c Binary files /dev/null and b/BGM/sugar fairy.ogg differ diff --git a/Zframework/bgm.lua b/Zframework/bgm.lua index d545a2de..be444483 100644 --- a/Zframework/bgm.lua +++ b/Zframework/bgm.lua @@ -22,31 +22,10 @@ local BGM={ --suspend=[str:pausing ID] --playing=[src:playing SRC] } -BGM.list={ - "blank",--menu - "race",--sprint, solo - "infinite",--infinite norm/dig, ultra, zen, tech-finesse - "push",--marathon, round, tsd, blind-5/6 - "way",--dig sprint - "reason",--drought, blind-1/2/3/4 - - "secret8th",--master-1, survivor-2 - "secret7th",--master-2, survivor-3 - "waterfall",--sprint Penta/MPH - "newera",--bigbang, survivor-1, tech-normal - "oxygen",--c4w/pc train - "truth",--pc challenge - - "distortion",--master-3 - "far",--GM - "shining terminal",--attacker - "storm",--defender, survivor-4/5 - "down",--dig, tech-hard/lunatic - - "rockblock",--classic, 49/99 - "cruelty","final","8-bit happiness","end","how feeling",--49/99 -} -BGM.len=#BGM.list +function BGM.set(L) + BGM.list=L + BGM.len=#L +end function BGM.loadOne(N) N=BGM.list[N] local file="/BGM/"..N..".ogg" diff --git a/Zframework/sfx.lua b/Zframework/sfx.lua index d96f0ce6..f9d1926d 100644 --- a/Zframework/sfx.lua +++ b/Zframework/sfx.lua @@ -1,29 +1,10 @@ local rem=table.remove local SFX={} -SFX.list={ - "welcome_sfx", - "click","enter", - "finesseError","finesseError_long", - --Stereo sfxs(cannot set position) - - "virtualKey", - "button","swipe", - "ready","start","win","fail","collect", - "spawn_1","spawn_2","spawn_3","spawn_4","spawn_5","spawn_6","spawn_7", - "move","rotate","rotatekick","hold", - "prerotate","prehold", - "lock","drop","fall", - "reach", - "ren_1","ren_2","ren_3","ren_4","ren_5","ren_6","ren_7","ren_8","ren_9","ren_10","ren_11","ren_mega", - "clear_1","clear_2","clear_3","clear_4", - "spin_0","spin_1","spin_2","spin_3", - "emit","blip_1","blip_2", - "clear", - - "error", - --Mono sfxs -} +function SFX.set(L) + SFX.list=L + SFX.len=#L +end function SFX.loadOne(_) _,SFX.list[_]=SFX.list[_] local N="/SFX/".._..".ogg" diff --git a/Zframework/voice.lua b/Zframework/voice.lua index cd82ea07..7f510f5c 100644 --- a/Zframework/voice.lua +++ b/Zframework/voice.lua @@ -3,15 +3,6 @@ local rem=table.remove local voiceQueue={free=0} local bank={}--{vocName1={SRC1s},vocName2={SRC2s},...} local VOC={} -VOC.name={ - "zspin","sspin","lspin","jspin","tspin","ospin","ispin", - "single","double","triple","techrash", - "mini","b2b","b3b", - "perfect_clear","half_clear", - "win","lose","bye", - "test","happy","doubt","sad","egg", - "welcome_voc", -} VOC.list={} local function loadVoiceFile(N,vocName) @@ -22,6 +13,11 @@ local function loadVoiceFile(N,vocName) return true end end +function VOC.set(L) + VOC.name=L + VOC.len=#L +end + function VOC.loadOne(name) local N=VOC.name[name] VOC.list[N]={} diff --git a/main.lua b/main.lua index 505e7b24..764668bf 100644 --- a/main.lua +++ b/main.lua @@ -134,6 +134,64 @@ AIFUNC= require("parts/ai") MODES= require("parts/modes") TICK= require("parts/tick") +SFX.set{ + "welcome_sfx", + "click","enter", + "finesseError","finesseError_long", + --Stereo sfxs(cannot set position) + + "virtualKey", + "button","swipe", + "ready","start","win","fail","collect", + "spawn_1","spawn_2","spawn_3","spawn_4","spawn_5","spawn_6","spawn_7", + "move","rotate","rotatekick","hold", + "prerotate","prehold", + "lock","drop","fall", + "reach", + "ren_1","ren_2","ren_3","ren_4","ren_5","ren_6","ren_7","ren_8","ren_9","ren_10","ren_11","ren_mega", + "clear_1","clear_2","clear_3","clear_4", + "spin_0","spin_1","spin_2","spin_3", + "emit","blip_1","blip_2", + "clear", + + "error", + --Mono sfxs +} +BGM.set{ + "blank",--menu + "race",--sprint, solo + "infinite",--infinite norm/dig, ultra, zen, tech-finesse + "push",--marathon, round, tsd, blind-5/6 + "way",--dig sprint + "reason",--drought, blind-1/2/3/4 + + "secret8th",--master-1, survivor-2 + "secret7th",--master-2, survivor-3 + "waterfall",--sprint Penta/MPH + "new era",--bigbang, survivor-1, tech-normal + "oxygen",--c4w/pc train + "truth",--pc challenge + "sugar fairy",--classic2 + + "distortion",--master-3 + "far",--GM + "shining terminal",--attacker + "storm",--defender, survivor-4/5 + "down",--dig, tech-hard/lunatic + + "rockblock",--classic, 49/99 + "cruelty","final","8-bit happiness","end","how feeling",--49/99 +} +VOC.set{ + "zspin","sspin","lspin","jspin","tspin","ospin","ispin", + "single","double","triple","techrash", + "mini","b2b","b3b", + "perfect_clear","half_clear", + "win","lose","bye", + "test","happy","doubt","sad","egg", + "welcome_voc", +} + --Load background files from SOURCE ONLY for _,v in next,love.filesystem.getDirectoryItems("parts/backgrounds")do if love.filesystem.getRealDirectory("parts/backgrounds/"..v)~=SAVEDIR then diff --git a/modes/bigbang.lua b/modes/bigbang.lua index ae3dbe26..edef9747 100644 --- a/modes/bigbang.lua +++ b/modes/bigbang.lua @@ -6,7 +6,7 @@ return{ hold=false, dropPiece=function(P)P:lose()end, task=nil, - bg="bg1",bgm="newera", + bg="bg1",bgm="new era", }, pauseLimit=true, load=function() diff --git a/modes/marathon_ultimate.lua b/modes/marathon_ultimate.lua index 78778720..d8eb301f 100644 --- a/modes/marathon_ultimate.lua +++ b/modes/marathon_ultimate.lua @@ -27,7 +27,7 @@ return{ wait=8,fall=20, target=10,dropPiece=check_LVup, mindas=7,minarr=1,minsdarr=1, - bg="bg2",bgm="push", + bg="bg2",bgm="sugar fairy", }, pauseLimit=true, slowMark=true, diff --git a/modes/survivor_easy.lua b/modes/survivor_easy.lua index a3629e32..a37ef186 100644 --- a/modes/survivor_easy.lua +++ b/modes/survivor_easy.lua @@ -16,7 +16,7 @@ return{ P.modeData.event=P.modeData.event+1 end end, - bg="glow",bgm="newera", + bg="glow",bgm="new era", }, pauseLimit=true, load=function() diff --git a/modes/tech_normal.lua b/modes/tech_normal.lua index 498f036f..b3fee72b 100644 --- a/modes/tech_normal.lua +++ b/modes/tech_normal.lua @@ -14,7 +14,7 @@ return{ oncehold=false, drop=1e99,lock=1e99, dropPiece=tech_check_easy, - bg="matrix",bgm="newera", + bg="matrix",bgm="new era", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/tech_normal2.lua b/modes/tech_normal2.lua index fb4ec62a..61806c97 100644 --- a/modes/tech_normal2.lua +++ b/modes/tech_normal2.lua @@ -19,7 +19,7 @@ return{ oncehold=false, drop=1e99,lock=1e99, dropPiece=tech_check_hard, - bg="matrix",bgm="newera", + bg="matrix",bgm="new era", }, load=function() PLY.newPlayer(1,340,15)