diff --git a/Zenitha b/Zenitha index 72299d26..7f91fe94 160000 --- a/Zenitha +++ b/Zenitha @@ -1 +1 @@ -Subproject commit 72299d268ede941967020c69b6bb30de2e48d907 +Subproject commit 7f91fe94075dc004a88f184297ae867bc604e921 diff --git a/assets/game/mechanicLib/mino/hypersonic.lua b/assets/game/mechanicLib/mino/hypersonic.lua index f14090fc..ff68af42 100644 --- a/assets/game/mechanicLib/mino/hypersonic.lua +++ b/assets/game/mechanicLib/mino/hypersonic.lua @@ -226,12 +226,13 @@ do-- hidden local showVisTime=1000 local showFadeTime=1000 + local bpm=130 local flashProbability=.1626 - local flashInterval=math.floor(4*60*1000/130/2^(-1/12)+.5) + local flashInterval=math.floor(4*60*1000/bpm/2^(-1/12)+.5) local flashVisTime1,flashVisTime2=120,460 local flashFadeTime=620 - local endAllInterval=math.floor(60*1000/130/2^(-1/12)+.5) + local endAllInterval=math.floor(60*1000/bpm/2^(-1/12)+.5) local endVisTime1,endVisTime2=620,723 local endFadeTime=1260 diff --git a/assets/game/mode/mino/exterior/hypersonic_hd.lua b/assets/game/mode/mino/exterior/hypersonic_hd.lua index 6b50aa1b..4f1f6131 100644 --- a/assets/game/mode/mino/exterior/hypersonic_hd.lua +++ b/assets/game/mode/mino/exterior/hypersonic_hd.lua @@ -5,6 +5,7 @@ return { playBgm('secret7th','base') BGM.set('secret7th/melody1','volume',0,0) BGM.set('all','pitch',2^(-1/12),0) + BGM.set('all','seek',MATH.roundUnit(BGM.tell(),60/130)) end, settings={mino={ event={ diff --git a/main.lua b/main.lua index 6189e9d5..8fe1955f 100644 --- a/main.lua +++ b/main.lua @@ -189,7 +189,7 @@ SFX.load((function() local L={} for _,v in next,love.filesystem.getDirectoryItems(path) do if FILE.isSafe(path..v) then - L[v:sub(1,-5)]=path..v:sub(1,-5)..'.ogg' + L[v:sub(1,-5)]=path..v end end return L