SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-22 14:19:02 -06:00
Code Issues Projects Releases Wiki Activity

Revert "Fixing step reset" - didn't realize infinite floorkicks

Browse Source 
This reverts commit 0c317d9ce1.
This commit is contained in:
Ishaan Bhardwaj 2020-10-11 15:46:34 -04:00
parent 0c317d9ce1
commit 12a6f42198
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tetris/rulesets/arika_ace.lua
View File

@ -150,7 +150,6 @@ end
function ARS:onPieceDrop(piece, grid) function ARS:onPieceDrop(piece, grid)
piece.lock_delay = 0 -- step reset piece.lock_delay = 0 -- step reset
piece.manipulations = 0
end end
function ARS:onPieceMove(piece, grid) function ARS:onPieceMove(piece, grid)

1
tetris/rulesets/arika_srs.lua
View File

@ -164,7 +164,6 @@ end
function SRS:onPieceDrop(piece, grid) function SRS:onPieceDrop(piece, grid)
piece.lock_delay = 0 -- step reset piece.lock_delay = 0 -- step reset
piece.manipulations = 0
end end
function SRS:onPieceMove(piece, grid) function SRS:onPieceMove(piece, grid)

12
tetris/rulesets/standard_exp.lua
View File

@ -159,19 +159,19 @@ function SRS:attemptWallkicks(piece, new_piece, rot_dir, grid)
end end
function SRS:onPieceCreate(piece, grid) function SRS:onPieceCreate(piece, grid)
piece.manipulations = 0 piece.rotate_counter = 0
piece.move_counter = 0
end end
function SRS:onPieceDrop(piece, grid) function SRS:onPieceDrop(piece, grid)
piece.lock_delay = 0 -- step reset piece.lock_delay = 0 -- step reset
piece.manipulations = 0
end end
function SRS:onPieceMove(piece, grid) function SRS:onPieceMove(piece, grid)
piece.lock_delay = 0 -- move reset piece.lock_delay = 0 -- move reset
if piece:isDropBlocked(grid) then if piece:isDropBlocked(grid) then
piece.manipulations = piece.manipulations + 1 piece.move_counter = piece.move_counter + 1
if piece.manipulations >= 15 then if piece.move_counter >= 24 then
piece.locked = true piece.locked = true
end end
end end
@ -180,8 +180,8 @@ end
function SRS:onPieceRotate(piece, grid) function SRS:onPieceRotate(piece, grid)
piece.lock_delay = 0 -- rotate reset piece.lock_delay = 0 -- rotate reset
if piece:isDropBlocked(grid) then if piece:isDropBlocked(grid) then
piece.manipulations = piece.manipulations + 1 piece.rotate_counter = piece.rotate_counter + 1
if piece.manipulations >= 15 then if piece.rotate_counter >= 12 then
piece.locked = true piece.locked = true
end end
end end

1
tetris/rulesets/ti_srs.lua
View File

@ -164,7 +164,6 @@ end
function SRS:onPieceDrop(piece, grid) function SRS:onPieceDrop(piece, grid)
piece.lock_delay = 0 -- step reset piece.lock_delay = 0 -- step reset
piece.manipulations = 0
end end
function SRS:onPieceMove(piece, grid) function SRS:onPieceMove(piece, grid)