From f91cd99dfd1a041ae1dbe610979596a861fe7536 Mon Sep 17 00:00:00 2001
From: Ishaan Bhardwaj <sashlilac109@gmail.com>
Date: Fri, 30 Oct 2020 21:28:39 -0400
Subject: [PATCH] Minor fixes to TGM modes

---
 tetris/modes/marathon_a1.lua | 10 +++++-----
 tetris/modes/survival_a1.lua | 10 +++++-----
 tetris/modes/survival_a2.lua |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tetris/modes/marathon_a1.lua b/tetris/modes/marathon_a1.lua
index 8ae86bc..2f6eaa8 100644
--- a/tetris/modes/marathon_a1.lua
+++ b/tetris/modes/marathon_a1.lua
@@ -165,16 +165,16 @@ end
 
 function MarathonA1Game:checkGMRequirements(old_level, new_level)
 	if old_level < 300 and new_level >= 300 then
-		if self.score > 12000 and self.frames <= frameTime(4,15) then
+		if self.score >= 12000 and self.frames <= frameTime(4,15) then
 			self.gm_conditions["level300"] = true
 		end
 	elseif old_level < 500 and new_level >= 500 then
-		if self.score > 40000 and self.frames <= frameTime(7,30) then
+		if self.score >= 40000 and self.frames <= frameTime(7,30) then
 			self.gm_conditions["level500"] = true
 		end
 	elseif old_level < 999 and new_level >= 999 then
-		if self.score > 126000 and self.frames <= frameTime(13,30) then
-			self.gm_conditions["level900"] = true
+		if self.score >= 126000 and self.frames <= frameTime(13,30) then
+			self.gm_conditions["level999"] = true
 		end
 	end
 end
@@ -210,7 +210,7 @@ function MarathonA1Game:drawScoringInfo()
 
 	love.graphics.setFont(font_3x5_3)
 	love.graphics.printf(self.score, 240, 220, 90, "left")
-	if self.gm_conditions["level300"] and self.gm_conditions["level500"] and self.gm_conditions["level900"] then
+	if self.gm_conditions["level300"] and self.gm_conditions["level500"] and self.gm_conditions["level999"] then
 		love.graphics.printf("GM", 240, 140, 90, "left")
 	else
 		love.graphics.printf(getRankForScore(self.score).rank, 240, 140, 90, "left")
diff --git a/tetris/modes/survival_a1.lua b/tetris/modes/survival_a1.lua
index 74aa954..3a0224c 100644
--- a/tetris/modes/survival_a1.lua
+++ b/tetris/modes/survival_a1.lua
@@ -137,16 +137,16 @@ end
 
 function SurvivalA1Game:checkGMRequirements(old_level, new_level)
 	if old_level < 300 and new_level >= 300 then
-		if self.score > 12000 and self.frames <= frameTime(4,15) then
+		if self.score >= 12000 and self.frames <= frameTime(4,15) then
 			self.gm_conditions["level300"] = true
 		end
 	elseif old_level < 500 and new_level >= 500 then
-		if self.score > 40000 and self.frames <= frameTime(7,30) then
+		if self.score >= 40000 and self.frames <= frameTime(7,30) then
 			self.gm_conditions["level500"] = true
 		end
 	elseif old_level < 999 and new_level >= 999 then
-		if self.score > 126000 and self.frames <= frameTime(13,30) then
-			self.gm_conditions["level900"] = true
+		if self.score >= 126000 and self.frames <= frameTime(13,30) then
+			self.gm_conditions["level999"] = true
 		end
 	end
 end
@@ -179,7 +179,7 @@ function SurvivalA1Game:drawScoringInfo()
 
 	love.graphics.setFont(font_3x5_3)
 	love.graphics.printf(self.score, 240, 220, 90, "left")
-	if self.gm_conditions["level300"] and self.gm_conditions["level500"] and self.gm_conditions["level900"] then
+	if self.gm_conditions["level300"] and self.gm_conditions["level500"] and self.gm_conditions["level999"] then
 		love.graphics.printf("GM", 240, 140, 90, "left")
 	else
 		love.graphics.printf(getRankForScore(self.score).rank, 240, 140, 90, "left")
diff --git a/tetris/modes/survival_a2.lua b/tetris/modes/survival_a2.lua
index 002d096..a2a45c0 100644
--- a/tetris/modes/survival_a2.lua
+++ b/tetris/modes/survival_a2.lua
@@ -88,7 +88,7 @@ function SurvivalA2Game:advanceOneFrame()
 end
 
 function SurvivalA2Game:onPieceEnter()
-	if (self.level % 100 ~= 99 or self.level == 998) and not self.clear and self.frames ~= 0 then
+	if (self.level % 100 ~= 99 or self.level ~= 998) and not self.clear and self.frames ~= 0 then
 		self.level = self.level + 1
 	end
 end