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

Fixes to TAP M-roll requirements

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2020-11-01 11:06:43 -05:00
parent 69959ff687
commit 33b8533d8e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tetris/modes/big_a2.lua
View File

@ -249,7 +249,7 @@ function MarathonA2Game:updateGrade(cleared_lines)
end end
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() function MarathonA2Game:qualifiesForMRoll()
if not self.clear then return false end if not self.clear then return false end

4
tetris/modes/marathon_a2.lua
View File

@ -253,7 +253,7 @@ function MarathonA2Game:updateGrade(cleared_lines)
end end
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() function MarathonA2Game:qualifiesForMRoll()
if not self.clear then return false end if not self.clear then return false end
@ -280,7 +280,7 @@ function MarathonA2Game:qualifiesForMRoll()
return false return false
end end
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 return false
end end
return true return true

1
tetris/modes/marathon_ax4.lua
View File

@ -98,6 +98,7 @@ function MarathonAX4Game:onLineClear(cleared_row_count)
self:updateSectionTimes(self.lines, new_lines) self:updateSectionTimes(self.lines, new_lines)
self.lines = math.min(new_lines, 150) self.lines = math.min(new_lines, 150)
if self.lines == 150 then if self.lines == 150 then
self.grid:clear()
self.clear = true self.clear = true
self.roll_frames = -150 self.roll_frames = -150
end end