From 5eb310baf37404507db0287f0d27bb5b83989197 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Wed, 24 Feb 2021 17:58:50 -0500 Subject: [PATCH] Misc fixes --- tetris/modes/big_meme.lua | 4 ++++ tetris/rulesets/pairs.lua | 6 +++++- tetris/rulesets/tetra.lua | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tetris/modes/big_meme.lua b/tetris/modes/big_meme.lua index 848109e..e1d2974 100644 --- a/tetris/modes/big_meme.lua +++ b/tetris/modes/big_meme.lua @@ -8,6 +8,10 @@ BigMemeGame.name = "Big Survival A3" BigMemeGame.hash = "BigA3" BigMemeGame.tagline = "The blocks are bigger and the speeds are faster!" +function BigMemeGame:new() + SurvivalA3Game:new() +end + function BigMemeGame:initialize(ruleset) self.super:initialize(ruleset) self.big_mode = true diff --git a/tetris/rulesets/pairs.lua b/tetris/rulesets/pairs.lua index a9548f8..01a305f 100644 --- a/tetris/rulesets/pairs.lua +++ b/tetris/rulesets/pairs.lua @@ -217,9 +217,9 @@ function PAIRS:attemptWallkicks(piece, new_piece, rot_dir, grid) for idx, offset in pairs(kicks) do kicked_piece = new_piece:withOffset(offset) if grid:canPlacePiece(kicked_piece) then - self:onPieceRotate(piece, grid) piece:setRelativeRotation(rot_dir) piece:setOffset(offset) + self:onPieceRotate(piece, grid) return end end @@ -243,6 +243,10 @@ function PAIRS:onPieceDrop(piece, grid) self:checkNewLow(piece) end +function PAIRS:onPieceRotate(piece, grid) + self:checkNewLow(piece) +end + function PAIRS:get180RotationValue() return 3 end diff --git a/tetris/rulesets/tetra.lua b/tetris/rulesets/tetra.lua index fdd75cc..1b281ca 100644 --- a/tetris/rulesets/tetra.lua +++ b/tetris/rulesets/tetra.lua @@ -77,9 +77,9 @@ function Tetra:attemptWallkicks(piece, new_piece, rot_dir, grid) for idx, offset in pairs(kicks) do kicked_piece = new_piece:withOffset(offset) if grid:canPlacePiece(kicked_piece) then - self:onPieceRotate(piece, grid) piece:setRelativeRotation(rot_dir) piece:setOffset(offset) + self:onPieceRotate(piece, grid) return end end @@ -99,7 +99,7 @@ end function Tetra:onPieceCreate(piece) piece.lowest_y = -math.huge end function Tetra:onPieceDrop(piece) self:checkNewLow(piece) end function Tetra:onPieceMove() end -function Tetra:onPieceRotate() end +function Tetra:onPieceRotate() self:checkNewLow(piece) end function Tetra:canPieceRotate() return true end function Tetra:get180RotationValue() return 2 end