From 33b8533d8ee9ebc13c59c7948104711cb7683690 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Sun, 1 Nov 2020 11:06:43 -0500 Subject: [PATCH] Fixes to TAP M-roll requirements --- tetris/modes/big_a2.lua | 2 +- tetris/modes/marathon_a2.lua | 4 ++-- tetris/modes/marathon_ax4.lua | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tetris/modes/big_a2.lua b/tetris/modes/big_a2.lua index 3ea9f98..a517e86 100755 --- a/tetris/modes/big_a2.lua +++ b/tetris/modes/big_a2.lua @@ -249,7 +249,7 @@ function MarathonA2Game:updateGrade(cleared_lines) end end -local tetris_requirements = { [0] = 2, 2, 2, 2, 2, 1, 1, 1, 1, 1 } +local tetris_requirements = { [0] = 2, 2, 2, 2, 2, 1, 1, 1, 1, 0 } function MarathonA2Game:qualifiesForMRoll() if not self.clear then return false end diff --git a/tetris/modes/marathon_a2.lua b/tetris/modes/marathon_a2.lua index 7b04622..20abbfc 100644 --- a/tetris/modes/marathon_a2.lua +++ b/tetris/modes/marathon_a2.lua @@ -253,7 +253,7 @@ function MarathonA2Game:updateGrade(cleared_lines) end end -local tetris_requirements = { [0] = 2, 2, 2, 2, 2, 1, 1, 1, 1, 1 } +local tetris_requirements = { [0] = 2, 2, 2, 2, 2, 1, 1, 1, 1, 0 } function MarathonA2Game:qualifiesForMRoll() if not self.clear then return false end @@ -280,7 +280,7 @@ function MarathonA2Game:qualifiesForMRoll() return false end end - if self.grade < 17 or self.frames > frameTime(9,30) then + if self.grade < 17 or self.frames > frameTime(8,45) then return false end return true diff --git a/tetris/modes/marathon_ax4.lua b/tetris/modes/marathon_ax4.lua index 5495c41..6554cc0 100644 --- a/tetris/modes/marathon_ax4.lua +++ b/tetris/modes/marathon_ax4.lua @@ -98,6 +98,7 @@ function MarathonAX4Game:onLineClear(cleared_row_count) self:updateSectionTimes(self.lines, new_lines) self.lines = math.min(new_lines, 150) if self.lines == 150 then + self.grid:clear() self.clear = true self.roll_frames = -150 end