SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调一些玩家动作逻辑

Browse Source 
修复零ARE+非零lineARE的时候ihs失效
This commit is contained in:
MrZ626
2021-11-26 00:55:29 +08:00
parent 11aa178fc1
commit c47546d501
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
parts/player/player.lua
View File

@@ -258,21 +258,21 @@ function Player:act_moveRight(auto)
end end
end end
function Player:act_rotRight() function Player:act_rotRight()
if self.control and self.waiting==0 and self.cur then if self.control and self.cur then
self.ctrlCount=self.ctrlCount+1 self.ctrlCount=self.ctrlCount+1
self:spin(1) self:spin(1)
self.keyPressing[3]=false self.keyPressing[3]=false
end end
end end
function Player:act_rotLeft() function Player:act_rotLeft()
if self.control and self.waiting==0 and self.cur then if self.control and self.cur then
self.ctrlCount=self.ctrlCount+1 self.ctrlCount=self.ctrlCount+1
self:spin(3) self:spin(3)
self.keyPressing[4]=false self.keyPressing[4]=false
end end
end end
function Player:act_rot180() function Player:act_rot180()
if self.control and self.waiting==0 and self.cur then if self.control and self.cur then
self.ctrlCount=self.ctrlCount+2 self.ctrlCount=self.ctrlCount+2
self:spin(2) self:spin(2)
self.keyPressing[5]=false self.keyPressing[5]=false
@@ -280,7 +280,7 @@ function Player:act_rot180()
end end
function Player:act_hardDrop() function Player:act_hardDrop()
local ENV=self.gameEnv local ENV=self.gameEnv
if self.control and self.waiting==0 and self.cur then if self.control and self.cur then
if self.lastPiece.autoLock and self.frameRun-self.lastPiece.frame<ENV.dropcut then if self.lastPiece.autoLock and self.frameRun-self.lastPiece.frame<ENV.dropcut then
SFX.play('drop_cancel',.3) SFX.play('drop_cancel',.3)
else else
@@ -305,7 +305,7 @@ function Player:act_hardDrop()
end end
function Player:act_softDrop() function Player:act_softDrop()
self.downing=1 self.downing=1
if self.control and self.waiting==0 and self.cur then if self.control and self.cur then
if self.curY>self.ghoY then if self.curY>self.ghoY then
self.curY=self.curY-1 self.curY=self.curY-1
self:freshBlock('fresh') self:freshBlock('fresh')
@@ -317,10 +317,11 @@ function Player:act_softDrop()
end end
end end
function Player:act_hold() function Player:act_hold()
if self.control and self.waiting==0 then if self.control and self.cur then
self:hold() if self:hold()then
self.keyPressing[8]=false self.keyPressing[8]=false
end end
end
end end
function Player:act_func1() function Player:act_func1()
self.gameEnv.fkey1(self) self.gameEnv.fkey1(self)
@@ -1330,6 +1331,7 @@ function Player:hold(ifpre)
elseif self.gameEnv.holdMode=='swap'then elseif self.gameEnv.holdMode=='swap'then
self:hold_swap(ifpre) self:hold_swap(ifpre)
end end
return true
end end
end end
@@ -2342,7 +2344,7 @@ local function update_alive(P)
if P.movDir~=0 then if P.movDir~=0 then
local das,arr=ENV.das,ENV.arr local das,arr=ENV.das,ENV.arr
local mov=P.moving local mov=P.moving
if P.waiting==0 then if P.cur then
if P.movDir==1 then if P.movDir==1 then
if P.keyPressing[2]then if P.keyPressing[2]then
if arr>0 then if arr>0 then