From cb2b693bcb0b4f27f0f82fd2f261a812aaf956aa Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Thu, 18 Feb 2021 21:04:03 -0500 Subject: [PATCH] Fixed T-floorkick behavior in Ti/ACE ARS --- tetris/rulesets/arika_ace.lua | 3 +++ tetris/rulesets/arika_ace2.lua | 3 +++ tetris/rulesets/arika_ti.lua | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tetris/rulesets/arika_ace.lua b/tetris/rulesets/arika_ace.lua index 35d6f38..7a274fd 100755 --- a/tetris/rulesets/arika_ace.lua +++ b/tetris/rulesets/arika_ace.lua @@ -47,6 +47,9 @@ function ARS:onPieceRotate(piece, grid) end if piece.floorkick >= 1 then piece.floorkick = piece.floorkick + 1 + if piece:isDropBlocked(grid) then + piece.locked = true + end end end diff --git a/tetris/rulesets/arika_ace2.lua b/tetris/rulesets/arika_ace2.lua index 5072c12..f2d2f8f 100644 --- a/tetris/rulesets/arika_ace2.lua +++ b/tetris/rulesets/arika_ace2.lua @@ -34,6 +34,9 @@ function ARS:onPieceRotate(piece, grid) end if piece.floorkick >= 1 then piece.floorkick = piece.floorkick + 1 + if piece:isDropBlocked(grid) then + piece.locked = true + end end end diff --git a/tetris/rulesets/arika_ti.lua b/tetris/rulesets/arika_ti.lua index 91dd649..b723ffe 100644 --- a/tetris/rulesets/arika_ti.lua +++ b/tetris/rulesets/arika_ti.lua @@ -74,8 +74,8 @@ function ARS:attemptWallkicks(piece, new_piece, rot_dir, grid) and grid:canPlacePiece(new_piece:withOffset({x=0, y=-1})) then -- T floorkick - piece.floorkick = piece.floorkick + 1 self:onPieceRotate(piece, grid) + piece.floorkick = piece.floorkick + 1 piece:setRelativeRotation(rot_dir):setOffset({x=0, y=-1}) end end