diff --git a/main.lua b/main.lua index 2b07bc77..46225501 100644 --- a/main.lua +++ b/main.lua @@ -56,6 +56,7 @@ getFont=FONT.get mStr=GC.mStr mText=GC.simpX mDraw=GC.draw +Snd=SFX.playSample --Delete all naked files (from too old version) FILE.clear('') diff --git a/media/effect/chiptune/ready.ogg b/media/effect/chiptune/ready.ogg deleted file mode 100644 index a707e57e..00000000 Binary files a/media/effect/chiptune/ready.ogg and /dev/null differ diff --git a/media/effect/chiptune/start.ogg b/media/effect/chiptune/start.ogg deleted file mode 100644 index f15bacfe..00000000 Binary files a/media/effect/chiptune/start.ogg and /dev/null differ diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index 82bc8e12..405adc43 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -617,7 +617,8 @@ do--function resetGameData(args) if GAME.setting.allowMod then TASK.new(task_showMods) end - SFX.play('ready') + Snd('bass','A2') + Snd('lead','A3') collectgarbage() end end diff --git a/parts/player/player.lua b/parts/player/player.lua index df86adba..35e0893f 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -1887,17 +1887,28 @@ local function update_alive(P) P.frameRun=P.frameRun+1 if P.frameRun<=180 then - if P.frameRun==180 then + if P.frameRun==60 then if P.id==1 then - SFX.play('start') + Snd('bass','G2') + Snd('lead','A3') + Snd('lead','D4') + end + elseif P.frameRun==120 then + if P.id==1 then + Snd('bass','A2') + Snd('lead','B3') + Snd('lead','E4') + end + elseif P.frameRun==180 then + if P.id==1 then + Snd('bass','A3') + Snd('lead','A3') + Snd('lead','E4') + Snd('lead','A4') end P.control=true P.timing=true P:popNext() - elseif P.frameRun==60 or P.frameRun==120 then - if P.id==1 then - SFX.play('ready') - end end if P.movDir~=0 then if P.moving