From 862dcbf8064b6b50b07122b4fd1fad1cf8b5a3da Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 1 Nov 2021 20:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87&=E5=BC=80=E5=A7=8B=E9=9F=B3?=
 =?UTF-8?q?=E6=95=88=E6=94=B9=E4=B8=BA=E5=87=BD=E6=95=B0=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E5=88=B0gameFuncs=E6=96=87=E4=BB=B6=E9=87=8C=20launchpad?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=89=A7=E8=A1=8C=E4=BB=BB=E6=84=8F=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=87=86=E5=A4=87-?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E9=9F=B3=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gameFuncs.lua        | 23 ++++++++++++++++++++---
 parts/player/player.lua    | 19 +++----------------
 parts/scenes/launchpad.lua | 11 ++++++++++-
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua
index 3596a538..59d6db54 100644
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -173,7 +173,25 @@ function royaleLevelup()
         end
     end
 end
-
+function playReadySFX(i)
+    if i==3 then
+        Snd('bass','A3')
+        Snd('lead','A4')
+    elseif i==2 then
+        Snd('bass','F3')
+        Snd('lead','A4')
+        Snd('lead','D5')
+    elseif i==1 then
+        Snd('bass','G3')
+        Snd('lead','B4')
+        Snd('lead','E5')
+    elseif i==0 then
+        Snd('bass','A3')
+        Snd('lead','A4')
+        Snd('lead','E5')
+        Snd('lead','A5')
+    end
+end
 
 
 --Game
@@ -622,8 +640,7 @@ do--function resetGameData(args)
         if GAME.setting.allowMod then
             TASK.new(task_showMods)
         end
-        Snd('bass','A3')
-        Snd('lead','A4')
+        playReadySFX(3)
         collectgarbage()
     end
 end
diff --git a/parts/player/player.lua b/parts/player/player.lua
index 8202c0ba..59baca2b 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1888,24 +1888,11 @@ local function update_alive(P)
     P.frameRun=P.frameRun+1
     if P.frameRun<=180 then
         if P.frameRun==60 then
-            if P.id==1 then
-                Snd('bass','F3')
-                Snd('lead','A4')
-                Snd('lead','D5')
-            end
+            if P.id==1 then playReadySFX(2)end
         elseif P.frameRun==120 then
-            if P.id==1 then
-                Snd('bass','G3')
-                Snd('lead','B4')
-                Snd('lead','E5')
-            end
+            if P.id==1 then playReadySFX(1)end
         elseif P.frameRun==180 then
-            if P.id==1 then
-                Snd('bass','A3')
-                Snd('lead','A4')
-                Snd('lead','E5')
-                Snd('lead','A5')
-            end
+            if P.id==1 then playReadySFX(0)end
             P.control=true
             P.timing=true
             P:popNext()
diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua
index 629628e2..02c4cc5b 100644
--- a/parts/scenes/launchpad.lua
+++ b/parts/scenes/launchpad.lua
@@ -37,7 +37,13 @@ pad={x=140,y=65,page=1,
         {0,0,0,0,0,0,0,0},
     },
     {
-        {{},                  {},                       {},                 {},              {sfx='move'},   {sfx='lock'},   {sfx='drop'},   {sfx='fall'},},
+        {
+            {samp={tag='ready3',func=function()playReadySFX(3)end}},
+            {samp={tag='ready2',func=function()playReadySFX(2)end}},
+            {samp={tag='ready1',func=function()playReadySFX(1)end}},
+            {samp={tag='start',func=function()playReadySFX(0)end}},
+            {sfx='move'},{sfx='lock'},{sfx='drop'},{sfx='fall'},
+        },
         {{sfx='hold'},        {sfx='prehold'},          {},                 {},              {sfx='clear_1'},{sfx='clear_2'},{sfx='clear_3'},{sfx='clear_4'}},
         {{sfx='prerotate'},   {sfx='rotate'},           {sfx='rotatekick'}, {},              {voc='single'}, {voc='double'}, {voc='triple'}, {voc='techrash'}},
         {{sfx='finesseError'},{sfx='finesseError_long'},{sfx='drop_cancel'},{},              {sfx='spin_0'}, {sfx='spin_1'}, {sfx='spin_2'}, {sfx='spin_3'}},
@@ -108,6 +114,7 @@ local function press(x,y)
         pad.funcAlpha[y]=1
     else
         local k=pad[pad.page][y][x]
+        if k.samp then k.samp.func()end
         if k.sfx then SFX.play(k.sfx,k.vol)end
         if k.voc then VOC.play(k.voc)end
         if k.bgm then BGM.play(k.bgm)end
@@ -201,10 +208,12 @@ function scene.draw()
         if showLabel then
             if k.sfx then mStr(k.sfx,x*80+40,y*80-30)gc_circle('fill',x*80+40,(y-1)*80+40,6)end
             if k.voc then mStr(k.voc,x*80+40,y*80-17)gc_rectangle('line',x*80+30,(y-1)*80+30,20,20,1)end
+            if k.samp then mStr(k.samp.tag,x*80+40,y*80-30)gc_rectangle('fill',x*80+10,(y-1)*80+35,60,5,1)end
             if k.bgm then mStr(k.bgm,x*80+40,y*80-78)gc_rectangle('fill',x*80+20,(y-1)*80+15,40,5,2)end
         else
             if k.sfx then gc_circle('fill',x*80+40,(y-1)*80+40,6)end
             if k.voc then gc_rectangle('line',x*80+30,(y-1)*80+30,20,20,1)end
+            if k.samp then gc_rectangle('fill',x*80+10,(y-1)*80+35,60,5,1)end
             if k.bgm then gc_rectangle('fill',x*80+20,(y-1)*80+15,40,5,2)end
         end
         if pad.alpha[y][x]>0 then