Merge branch 'master' into haileyjunk

Updated 3694 -> 3701 in other places
Merge pull request #43 from Kirby703/patch-5
2024-11-22 08:29:02 -06:00 · 2021-11-09 14:58:14 +10:00 · 2021-11-03 17:34:34 -04:00 · 2021-11-03 17:32:43 -04:00 · 2021-11-03 17:31:04 -04:00
1 changed files with 3 additions and 3 deletions
--- a/tetris/modes/marathon_a2.lua
+++ b/tetris/modes/marathon_a2.lua
@ -112,7 +112,7 @@ function MarathonA2Game:advanceOneFrame()
 	if self.clear then
 		self.roll_frames = self.roll_frames + 1
 		if self.roll_frames < 0 then return false end
-		if self.roll_frames > 3694 then
+		if self.roll_frames > 3701 then
 			self.completed = true
 			if self.grade == 32 then
 				self.grade = 33
@ -365,10 +365,10 @@ function MarathonA2Game:drawScoringInfo()
 	love.graphics.setFont(font_3x5_3)
 	if self.clear 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
-			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
 		end
 	end
Author	SHA1	Message	Date
Hailey	23b42a534e	Merge branch 'master' into haileyjunk	2021-11-09 14:58:14 +10:00
Ishaan Bhardwaj	9381091110	Updated 3694 -> 3701 in other places	2021-11-03 17:34:34 -04:00
Ishaan Bhardwaj	deb69fe28d	Merge pull request #43 from Kirby703/patch-5 tap roll 3694 -> 3701 frames	2021-11-03 17:32:43 -04:00
Kirby703	3085b765e5	fix roll 3694 -> 3701 frames	2021-11-03 17:31:04 -04:00