删除adp，软降也使用水平移动的参数

assets/basedictionary.lua

@@ -25,7 +25,7 @@ local baseDict={
     {'term: drop_speed'},
     {'term: key_speed'},
     {'term: attack_power'},
-    {'term: asd_asp_adp'},
+    {'term: asd_asp'},
     {'term: ash'},
     {'term: init_control'},
     {'term: misaction'},

assets/game/mechanicLib/mino/comboPractice.lua

@@ -70,7 +70,6 @@ end
 function comboPractice.event_playerInit(P)
     P.settings.asd=math.max(P.settings.asd,120)
     P.settings.asp=math.max(P.settings.asp,12)
-    P.settings.adp=math.max(P.settings.adp,6)
 
     P.modeData.comboCount=0
     P.modeData.levelRemain=0

assets/game/mechanicLib/mino/marathon.lua

@@ -46,7 +46,6 @@ end
 function marathon.event_playerInit(P)
     P.settings.asd=max(P.settings.asd,100)
     P.settings.asp=max(P.settings.asp,20)
-    P.settings.adp=max(P.settings.adp,20)
 
     P.settings.dropDelay=levels[1].drop
     P.settings.lockDelay=levels[1].lock

assets/game/minoPlayer.lua

@@ -551,7 +551,7 @@ function MP:freshGhost()
             end
 
             -- 20G check
-            if (self.settings.dropDelay<=0 or self.downCharge and self.settings.adp==0) and self.ghostY<self.handY then
+            if (self.settings.dropDelay<=0 or self.downCharge and self.settings.asp==0) and self.ghostY<self.handY then
                 local dY=self.ghostY-self.handY
                 self:moveHand('drop',dY)
                 self:freshDelay('drop')
@@ -1480,8 +1480,14 @@ function MP:updateFrame()
         -- Auto drop
         if self.downCharge and self.keyState.softDrop then
             if self.hand and not self:ifoverlap(self.hand.matrix,self.handX,self.handY-1) then
-                self.downCharge=self.downCharge+1
-                local dist=SET.adp==0 and 1e99 or self.downCharge%SET.adp==0 and 1 or 0
+                local dist=0
+                if SET.asp==0 then
+                    if self.downCharge>=SET.asd then
+                        dist=1e99
+                    end
+                elseif self.downCharge>=SET.asd and (self.downCharge-SET.asd)%SET.asp==0 then
+                    dist=1
+                end
                 if dist>0 then
                     local oy=self.handY
                     while dist>0 do
@@ -1499,8 +1505,9 @@ function MP:updateFrame()
                         end
                     end
                 end
+                self.downCharge=self.downCharge+1
             else
-                self.downCharge=SET.adp
+                self.downCharge=SET.asd
                 if self.hand then
                     self:shakeBoard('-down')
                 end
@@ -1929,7 +1936,6 @@ local baseEnv={
     -- Control
     asd=122, -- *Auto shift delay
     asp=26, -- *Auto shift period
-    adp=26, -- *Auto drop period
     ash=26, -- *Auto Shift Halt, discharge asd when piece spawn
     entryChrg='on', -- on/off/full/cancel charge when move before spawn
     wallChrg='on', -- on/off/full/cancel charge when move towards wall

assets/game/mode/mino/interior/marathon.lua

@@ -20,7 +20,6 @@ return {
             playerInit=function(P)
                 P.settings.asd=math.max(P.settings.asd,100)
                 P.settings.asp=math.max(P.settings.asp,20)
-                P.settings.adp=math.max(P.settings.adp,20)
 
                 P.settings.dropDelay=dropSpeed[1]
                 P.modeData.lineTarget=10

assets/game/puyoPlayer.lua

@@ -404,7 +404,7 @@ function PP:freshGhost()
         end
 
         -- 20G check
-        if (self.settings.dropDelay<=0 or self.downCharge and self.settings.adp==0) and self.ghostY<self.handY then -- if (temp) 20G on
+        if (self.settings.dropDelay<=0 or self.downCharge and self.settings.asp==0) and self.ghostY<self.handY then -- if (temp) 20G on
             local dY=self.ghostY-self.handY
             self:moveHand('drop',dY)
             self:freshDelay('drop')
@@ -954,8 +954,14 @@ function PP:updateFrame()
         -- Auto drop
         if self.downCharge and self.keyState.softDrop then
             if self.hand and not self:ifoverlap(self.hand.matrix,self.handX,self.handY-1) then
-                self.downCharge=self.downCharge+1
-                local dist=SET.adp==0 and 1e99 or self.downCharge%SET.adp==0 and 1 or 0
+                local dist=0
+                if SET.asp==0 then
+                    if self.downCharge>=SET.asd then
+                        dist=1e99
+                    end
+                elseif self.downCharge>=SET.asd and (self.downCharge-SET.asd)%SET.asp==0 then
+                    dist=1
+                end
                 if dist>0 then
                     local oy=self.handY
                     while dist>0 do
@@ -970,8 +976,9 @@ function PP:updateFrame()
                         end
                     end
                 end
+                self.downCharge=self.downCharge+1
             else
-                self.downCharge=SET.adp
+                self.downCharge=SET.asd
                 if self.hand then
                     self:shakeBoard('-down')
                 end
@@ -1254,7 +1261,6 @@ local baseEnv={
     -- Control
     asd=122,
     asp=26,
-    adp=26,
     ash=26,
     entryChrg='on',
     wallChrg='on',

assets/language/dict_zh.lua

@@ -195,12 +195,11 @@ KPM: Key per Minute，按键每分
 APM: Attack per Minute，攻击每分
 APL: Attack per Line，攻击每行（行的计算方式也可以分两种，详见LPM词条），也叫效率
 
-# asd_asp_adp
+# asd_asp
 @ title 移动延迟（ASD & ASP & ADP）
 @ contentSize 25
 ASD: Auto Shift Delay，自动移动延迟，旧称DAS（Delayed Auto Shift）
 ASP: Auto Shift Period，自动重复周期，旧称ARR（Auto Repeat Rate)
-ADP: Auto Drop Period，软降重复周期
 ~~
 在使用键盘输入文本时按住一个键，会连续输入了一大串字符。注意字符出现的时机：第一个字按下后立刻出现，停了一小会后开始快速连续自动输入，其中“停了一小会”就是ASD长度，“连续自动输入”的间隔就是ASP长度。
 ADP类似ASP，区别是用于软降。

assets/language/lang_en.lua

@@ -72,7 +72,6 @@ return {
 
     setting_asd="ASD",
     setting_asp="ASP",
-    setting_adp="ADP",
     setting_ash="AS Halt",
     setting_aHdLock="Auto harddrop lock",
     setting_mHdLock="Manual harddrop lock",

assets/language/lang_zh.lua

@@ -72,7 +72,6 @@ return {
 
     setting_asd="自动移动延迟",
     setting_asp="自动重复周期",
-    setting_adp="软降重复周期",
     setting_ash="自动移动阻止",
     setting_aHdLock="自动硬降锁",
     setting_mHdLock="手动硬降锁",

assets/scene/setting_in.lua

@@ -4,19 +4,6 @@ local scene={}
 
 function scene.enter()
     settingHint=PROGRESS.get('main')<2 and PROGRESS.get('launchCount')<=3
-
-    local L=scene.widgetList
-    if PROGRESS.get('main')==1 then
-        L.asd.y=250
-        L.asp.y=350
-        L.adp:setVisible(false)
-    else
-        L.asd.y=150
-        L.asp.y=250
-        L.adp.y=350
-        L.adp:setVisible(true)
-    end
-    WIDGET._reset()
 end
 function scene.leave()
     saveSettings()
@@ -57,8 +44,7 @@ scene.widgetList={
     {type='slider',   pos={1,.5},x=-550, y=-210,w=400,fontSize=40,text=LANG'setting_sfx',    widthLimit=260,disp=TABLE.func_getVal(SETTINGS.system,'sfxVol'), code=TABLE.func_setVal(SETTINGS.system,'sfxVol')},
     {type='slider',   pos={1,.5},x=-550, y=-130,w=400,fontSize=40,text=LANG'setting_vib',    widthLimit=260,disp=TABLE.func_getVal(SETTINGS.system,'vibVol'), code=TABLE.func_setVal(SETTINGS.system,'vibVol')},
 
-    {type='slider',   name='asd',  pos={1,.5},x=-800,y=50, w=650,text=LANG'setting_asd',  widthLimit=260,axis={100,260,10},disp=TABLE.func_getVal(SETTINGS.game_mino,'asd'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_mino.asd=v; SETTINGS.game_mino.asp=math.min(SETTINGS.game_mino.asp,SETTINGS.game_mino.asd) end},
-    {type='slider',   name='asp',  pos={1,.5},x=-800,y=150,w=650,text=LANG'setting_asp',  widthLimit=260,axis={20,120,10}, disp=TABLE.func_getVal(SETTINGS.game_mino,'asp'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_mino.asp=v; SETTINGS.game_mino.asd=math.max(SETTINGS.game_mino.asd,SETTINGS.game_mino.asp) end},
-    {type='slider',   name='adp',pos={1,.5},x=-800,y=250,w=650,text=LANG'setting_adp',widthLimit=260,axis={20,100,10}, disp=TABLE.func_getVal(SETTINGS.game_mino,'adp'),valueShow=sliderShow_time, code=TABLE.func_setVal(SETTINGS.game_mino,'adp')},
+    {type='slider',   name='asd',  pos={1,.5},x=-800,y=250,w=650,text=LANG'setting_asd',  widthLimit=260,axis={100,260,10},disp=TABLE.func_getVal(SETTINGS.game_mino,'asd'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_mino.asd=v; SETTINGS.game_mino.asp=math.min(SETTINGS.game_mino.asp,SETTINGS.game_mino.asd) end},
+    {type='slider',   name='asp',  pos={1,.5},x=-800,y=350,w=650,text=LANG'setting_asp',  widthLimit=260,axis={20,120,10}, disp=TABLE.func_getVal(SETTINGS.game_mino,'asp'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_mino.asp=v; SETTINGS.game_mino.asd=math.max(SETTINGS.game_mino.asd,SETTINGS.game_mino.asp) end},
 }
 return scene

assets/scene/setting_out.lua

@@ -62,13 +62,12 @@ scene.widgetList={
     -- Controls
     {name='1',type='slider', pos={0,0},x=340, y=220,w=650, fontSize=35,text=LANG'setting_asd',  widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'asd'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_mino.asd=v; SETTINGS.game_mino.asp=math.min(SETTINGS.game_mino.asp,SETTINGS.game_mino.asd); SETTINGS.game_mino.ash=math.min(SETTINGS.game_mino.ash,SETTINGS.game_mino.asd) end},
     {name='1',type='slider', pos={0,0},x=340, y=300,w=300, fontSize=35,text=LANG'setting_asp',  widthLimit=260,axis={0,120,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'asp'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_mino.asp=v; SETTINGS.game_mino.asd=math.max(SETTINGS.game_mino.asd,SETTINGS.game_mino.asp) end},
-    {name='1',type='slider', pos={0,0},x=340, y=380,w=250, fontSize=35,text=LANG'setting_adp',  widthLimit=260,axis={0,100,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'adp'),  valueShow=sliderShow_time, code=TABLE.func_setVal(SETTINGS.game_mino,'adp')},
-    {name='1',type='slider', pos={0,0},x=340, y=460,w=650, fontSize=35,text=LANG'setting_ash',  widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'ash'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_mino.ash=v; SETTINGS.game_mino.asd=math.max(SETTINGS.game_mino.asd,SETTINGS.game_mino.ash) end},
-    {name='1',type='slider', pos={0,0},x=340, y=540,w=650, fontSize=35,text=LANG'setting_aHdLock', widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'aHdLock'), valueShow=sliderShow_time, code=TABLE.func_setVal(SETTINGS.game_mino,'aHdLock')},
-    {name='1',type='slider', pos={0,0},x=340, y=620,w=650, fontSize=35,text=LANG'setting_mHdLock', widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'mHdLock'), valueShow=sliderShow_time, code=TABLE.func_setVal(SETTINGS.game_mino,'mHdLock')},
-    {name='1',type='button', pos={0,0},x=500, y=720,w=360, h=80,cornerR=10, fontSize=40,text=LANG'setting_keymapping',     code=WIDGET.c_goScn('keyset_out','fadeHeader')},
-    {name='1',type='switch', pos={0,0},x=360, y=820,h=40,  labelPos='right',fontSize=40,text=LANG'setting_enableTouching', disp=TABLE.func_getVal(SETTINGS.system,'touchControl'),code=TABLE.func_revVal(SETTINGS.system,'touchControl')},
-    {name='1',type='button', pos={0,0},x=500, y=900,w=360, h=80,cornerR=10, fontSize=40,text=LANG'setting_touching',       code=WIDGET.c_goScn'keyset_touch_out',visibleTick=function() return page=='1' and SETTINGS.system.touchControl end},
+    {name='1',type='slider', pos={0,0},x=340, y=380,w=650, fontSize=35,text=LANG'setting_ash',  widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'ash'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_mino.ash=v; SETTINGS.game_mino.asd=math.max(SETTINGS.game_mino.asd,SETTINGS.game_mino.ash) end},
+    {name='1',type='slider', pos={0,0},x=340, y=460,w=650, fontSize=35,text=LANG'setting_aHdLock', widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'aHdLock'), valueShow=sliderShow_time, code=TABLE.func_setVal(SETTINGS.game_mino,'aHdLock')},
+    {name='1',type='slider', pos={0,0},x=340, y=540,w=650, fontSize=35,text=LANG'setting_mHdLock', widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'mHdLock'), valueShow=sliderShow_time, code=TABLE.func_setVal(SETTINGS.game_mino,'mHdLock')},
+    {name='1',type='button', pos={0,0},x=500, y=640,w=360, h=80,cornerR=10, fontSize=40,text=LANG'setting_keymapping',     code=WIDGET.c_goScn('keyset_out','fadeHeader')},
+    {name='1',type='switch', pos={0,0},x=360, y=740,h=40,  labelPos='right',fontSize=40,text=LANG'setting_enableTouching', disp=TABLE.func_getVal(SETTINGS.system,'touchControl'),code=TABLE.func_revVal(SETTINGS.system,'touchControl')},
+    {name='1',type='button', pos={0,0},x=500, y=820,w=360, h=80,cornerR=10, fontSize=40,text=LANG'setting_touching',       code=WIDGET.c_goScn'keyset_touch_out',visibleTick=function() return page=='1' and SETTINGS.system.touchControl end},
 
     -- Audio
     {name='2',type='slider_fill',pos={0,0},x=340, y=220,w=650, fontSize=40,text=LANG'setting_mainVol', widthLimit=260, disp=TABLE.func_getVal(SETTINGS.system,'mainVol'), code=TABLE.func_setVal(SETTINGS.system,'mainVol')},

assets/settings.lua

@@ -31,7 +31,6 @@ local settings={
         -- Handling
         asd=120,
         asp=20,
-        adp=20,
         ash=26,
         aHdLock=200,
         mHdLock=62,
@@ -43,7 +42,6 @@ local settings={
         -- Handling
         asd=120,
         asp=20,
-        adp=20,
         ash=26,
         aHdLock=200,
         mHdLock=62,