From 1bb696de3814bf92d5469d82dfe88ae79219e85c Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Thu, 4 Jan 2024 17:22:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ahdl=E5=92=8Cmhdl=E7=9A=84?= =?UTF-8?q?=E5=86=85=E9=83=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/game/mechanicLib/mino/actions.lua | 4 ++-- assets/game/mechanicLib/puyo/actions.lua | 4 ++-- assets/game/minoPlayer.lua | 14 +++++++------- assets/game/puyoPlayer.lua | 14 +++++++------- assets/language/lang_en.lua | 4 ++-- assets/language/lang_zh.lua | 4 ++-- assets/scene/setting_out.lua | 4 ++-- assets/settings.lua | 8 ++++---- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assets/game/mechanicLib/mino/actions.lua b/assets/game/mechanicLib/mino/actions.lua index 43a4d1c7..89697f49 100644 --- a/assets/game/mechanicLib/mino/actions.lua +++ b/assets/game/mechanicLib/mino/actions.lua @@ -135,11 +135,11 @@ actions.softDrop={ } actions.hardDrop={ press=function(P) - if P.mhdlTimer~=0 or P.ahdlTimer~=0 then + if P.mHdLockTimer~=0 or P.aHdLockTimer~=0 then P:playSound('rotate_failed') elseif P.hand then if not P.deathTimer then - P.mhdlTimer=P.settings.mhdl + P.mHdLockTimer=P.settings.mHdLock P:minoDropped() else P.deathTimer=ceil(P.deathTimer/2.6) diff --git a/assets/game/mechanicLib/puyo/actions.lua b/assets/game/mechanicLib/puyo/actions.lua index ea45c4e2..658851ff 100644 --- a/assets/game/mechanicLib/puyo/actions.lua +++ b/assets/game/mechanicLib/puyo/actions.lua @@ -135,11 +135,11 @@ actions.softDrop={ } actions.hardDrop={ press=function(P) - if P.mhdlTimer~=0 or P.ahdlTimer~=0 then + if P.mHdLockTimer~=0 or P.aHdLockTimer~=0 then P:playSound('rotate_failed') elseif P.hand then if not P.deathTimer then - P.mhdlTimer=P.settings.mhdl + P.mHdLockTimer=P.settings.mHdLock P:puyoDropped() else P.deathTimer=ceil(P.deathTimer/2.6) diff --git a/assets/game/minoPlayer.lua b/assets/game/minoPlayer.lua index c1b41d1b..b7321881 100644 --- a/assets/game/minoPlayer.lua +++ b/assets/game/minoPlayer.lua @@ -1448,8 +1448,8 @@ function MP:updateFrame() local SET=self.settings -- Hard-drop lock - if self.ahdlTimer>0 then self.ahdlTimer=self.ahdlTimer-1 end - if self.mhdlTimer>0 then self.mhdlTimer=self.mhdlTimer-1 end + if self.aHdLockTimer>0 then self.aHdLockTimer=self.aHdLockTimer-1 end + if self.mHdLockTimer>0 then self.mHdLockTimer=self.mHdLockTimer-1 end -- Current controlling piece if not self.deathTimer then @@ -1550,7 +1550,7 @@ function MP:updateFrame() if self.handY==self.ghostY then self.lockTimer=self.lockTimer-1 if self.lockTimer<=0 then - self.ahdlTimer=self.settings.ahdl + self.aHdLockTimer=self.settings.aHdLock self:minoDropped() end break @@ -1963,8 +1963,8 @@ local baseEnv={ initMove='buffer', -- buffer/hold to do initial move initRotate='buffer', -- buffer/hold to do initial rotate initHold='buffer', -- buffer/hold to do initial hold - ahdl=1000, -- *Auto harddrop lock - mhdl=100, -- *Manual harddrop lock + aHdLock=1000, -- *Auto harddrop lock + mHdLock=100, -- *Manual harddrop lock -- Other IRSpushUp=true, -- Use bottom-align when IRS or suffocate @@ -2074,8 +2074,8 @@ function MP:initialize() self.moveCharge=0 self.downCharge=false - self.ahdlTimer=0 - self.mhdlTimer=0 + self.aHdLockTimer=0 + self.mHdLockTimer=0 self.keyBuffer={ move=false, diff --git a/assets/game/puyoPlayer.lua b/assets/game/puyoPlayer.lua index dce7ecd0..4461ff8b 100644 --- a/assets/game/puyoPlayer.lua +++ b/assets/game/puyoPlayer.lua @@ -920,8 +920,8 @@ function PP:updateFrame() local SET=self.settings -- Hard-drop lock - if self.ahdlTimer>0 then self.ahdlTimer=self.ahdlTimer-1 end - if self.mhdlTimer>0 then self.mhdlTimer=self.mhdlTimer-1 end + if self.aHdLockTimer>0 then self.aHdLockTimer=self.aHdLockTimer-1 end + if self.mHdLockTimer>0 then self.mHdLockTimer=self.mHdLockTimer-1 end -- Controlling piece if not self.deathTimer then @@ -1047,7 +1047,7 @@ function PP:updateFrame() if self.handY==self.ghostY then self.lockTimer=self.lockTimer-1 if self.lockTimer<=0 then - self.ahdlTimer=self.settings.ahdl + self.aHdLockTimer=self.settings.aHdLock self:puyoDropped() end break @@ -1288,8 +1288,8 @@ local baseEnv={ dblMoveRelInvRedir=true, initMove='buffer', initRotate='buffer', - ahdl=1000, - mhdl=100, + aHdLock=1000, + mHdLock=100, IRSpushUp=true, skin='puyo_jelly', particles=true, @@ -1379,8 +1379,8 @@ function PP:initialize() self.moveCharge=0 self.downCharge=false - self.ahdlTimer=0 - self.mhdlTimer=0 + self.aHdLockTimer=0 + self.mHdLockTimer=0 self.keyBuffer={ move=false, diff --git a/assets/language/lang_en.lua b/assets/language/lang_en.lua index d0d92175..fbc2de85 100644 --- a/assets/language/lang_en.lua +++ b/assets/language/lang_en.lua @@ -74,8 +74,8 @@ return { setting_asp="ASP", setting_adp="ADP", setting_ash="AS Halt", - setting_ahdl="Auto harddrop lock", - setting_mhdl="Manual harddrop lock", + setting_aHdLock="Auto harddrop lock", + setting_mHdLock="Manual harddrop lock", setting_shakeness="Shakiness", setting_hitWavePower="Hitwave Power", diff --git a/assets/language/lang_zh.lua b/assets/language/lang_zh.lua index cba03cfb..8a9023db 100644 --- a/assets/language/lang_zh.lua +++ b/assets/language/lang_zh.lua @@ -74,8 +74,8 @@ return { setting_asp="自动重复周期", setting_adp="软降重复周期", setting_ash="自动移动阻止", - setting_ahdl="自动硬降锁", - setting_mhdl="手动硬降锁", + setting_aHdLock="自动硬降锁", + setting_mHdLock="手动硬降锁", setting_shakeness="场地晃动", setting_hitWavePower="冲击波强度", diff --git a/assets/scene/setting_out.lua b/assets/scene/setting_out.lua index 7d98f2e3..b47b394f 100644 --- a/assets/scene/setting_out.lua +++ b/assets/scene/setting_out.lua @@ -64,8 +64,8 @@ scene.widgetList={ {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_ahdl', widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'ahdl'), valueShow=sliderShow_time, code=TABLE.func_setVal(SETTINGS.game_mino,'ahdl')}, - {name='1',type='slider', pos={0,0},x=340, y=620,w=650, fontSize=35,text=LANG'setting_mhdl', widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_mino,'mhdl'), valueShow=sliderShow_time, code=TABLE.func_setVal(SETTINGS.game_mino,'mhdl')}, + {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}, diff --git a/assets/settings.lua b/assets/settings.lua index 3720f0e9..2adc0dc3 100644 --- a/assets/settings.lua +++ b/assets/settings.lua @@ -33,8 +33,8 @@ local settings={ asp=20, adp=20, ash=26, - ahdl=200, - mhdl=62, + aHdLock=200, + mHdLock=62, -- Video shakeness=.6, @@ -45,8 +45,8 @@ local settings={ asp=20, adp=20, ash=26, - ahdl=200, - mhdl=62, + aHdLock=200, + mHdLock=62, -- Video shakeness=.6,