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

Merge branch 'master' into haileyjunk

Browse Source
This commit is contained in:
Hailey 2021-11-09 14:58:14 +10:00
commit 23b42a534e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tetris/modes/marathon_a2.lua
View File

@ -112,7 +112,7 @@ function MarathonA2Game:advanceOneFrame()
if self.clear then if self.clear then
self.roll_frames = self.roll_frames + 1 self.roll_frames = self.roll_frames + 1
if self.roll_frames < 0 then return false end if self.roll_frames < 0 then return false end
if self.roll_frames > 3694 then if self.roll_frames > 3701 then
self.completed = true self.completed = true
if self.grade == 32 then if self.grade == 32 then
self.grade = 33 self.grade = 33
@ -365,10 +365,10 @@ function MarathonA2Game:drawScoringInfo()
love.graphics.setFont(font_3x5_3) love.graphics.setFont(font_3x5_3)
if self.clear then if self.clear then
if self:qualifiesForMRoll() then if self:qualifiesForMRoll() then
if self.lines >= 32 and self.roll_frames > 3694 then love.graphics.setColor(1, 0.5, 0, 1) if self.lines >= 32 and self.roll_frames > 3701 then love.graphics.setColor(1, 0.5, 0, 1)
else love.graphics.setColor(0, 1, 0, 1) end else love.graphics.setColor(0, 1, 0, 1) end
else else
if self.roll_frames > 3694 then love.graphics.setColor(1, 0.5, 0, 1) if self.roll_frames > 3701 then love.graphics.setColor(1, 0.5, 0, 1)
else love.graphics.setColor(0, 1, 0, 1) end else love.graphics.setColor(0, 1, 0, 1) end
end end
end end