Score overhauls

tetris/modes/big_a2.lua

@@ -127,20 +127,21 @@ function MarathonA2Game:onLineClear(cleared_row_count)
 end
 
 function MarathonA2Game:updateScore(level, drop_bonus, cleared_lines)
-	if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
+	if not self.clear then
 		cleared_lines = cleared_lines / 2
 		self:updateGrade(cleared_lines)
+		if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
 		if cleared_lines > 0 then
 			self.combo = self.combo + (cleared_lines - 1) * 2
 			self.score = self.score + (
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 				cleared_lines * self.combo * self.bravo
 			)
-        self.lines = self.lines + cleared_lines
 		else
 			self.combo = 1
 		end
 		self.drop_bonus = 0
+	end
 end
 
 local grade_point_bonuses = {

tetris/modes/ck.lua

@@ -172,17 +172,18 @@ function SurvivalCKGame:onPieceLock(piece, cleared_row_count)
 end
 
 function SurvivalCKGame:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if cleared_lines > 0 then
+			self.combo = self.combo + (cleared_lines - 1) * 2
 			self.score = self.score + (
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
-			cleared_lines * (cleared_lines * 2 - 1) * (self.combo * 2 - 1)
+				cleared_lines * self.combo
 			)
-		self.lines = self.lines + cleared_lines
-		self.combo = self.combo + cleared_lines - 1
 		else
-		self.drop_bonus = 0
 			self.combo = 1
 		end
+		self.drop_bonus = 0
+	end
 end
 
 function SurvivalCKGame:updateSectionTimes(old_level, new_level)

tetris/modes/demon_mode.lua

@@ -187,17 +187,18 @@ function DemonModeGame:updateSectionTimes(old_level, new_level)
 end
 
 function DemonModeGame:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if cleared_lines > 0 then
+			self.combo = self.combo + (cleared_lines - 1) * 2
 			self.score = self.score + (
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
-			cleared_lines * (cleared_lines * 2 - 1) * (self.combo * 2 - 1)
+				cleared_lines * self.combo
 			)
-		self.lines = self.lines + cleared_lines
-		self.combo = self.combo + cleared_lines - 1
 		else
-		self.drop_bonus = 0
 			self.combo = 1
 		end
+		self.drop_bonus = 0
+	end
 end
 
 local letter_grades = {

tetris/modes/marathon_a1.lua

@@ -137,15 +137,15 @@ function MarathonA1Game:onLineClear(cleared_row_count)
     self:checkGMRequirements(self.level, self.level + cleared_row_count)
 	if not self.clear then
 		local new_level = math.min(self.level + cleared_row_count, 999)
-		if self.level == 999 then
+		if new_level == 999 then
 			self.clear = true
 		else
 		self.level = new_level
 	end
-	end
 end
 
 function MarathonA1Game:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if self.grid:checkForBravo(cleared_lines) then
 			self.bravo = 4
 			self.bravos = self.bravos + 1
@@ -156,11 +156,11 @@ function MarathonA1Game:updateScore(level, drop_bonus, cleared_lines)
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 				cleared_lines * self.combo * self.bravo
 			)
-        self.lines = self.lines + cleared_lines
 		else
 			self.combo = 1
 		end
 		self.drop_bonus = 0
+	end
 end
 
 function MarathonA1Game:checkGMRequirements(old_level, new_level)

tetris/modes/marathon_a2.lua

@@ -126,16 +126,20 @@ function MarathonA2Game:onPieceEnter()
 	end
 end
 
-function MarathonA2Game:onLineClear(cleared_row_count)
-    self:updateSectionTimes(self.level, self.level + cleared_row_count)
-    self.level = math.min(self.level + cleared_row_count, 999)
-    if self.level == 999 and not self.clear then
-        self.clear = true
-        if self:qualifiesForMRoll() then
-            self.grade = 32
+function MarathonA2Game:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
+		self:updateGrade(cleared_lines)
+		if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
+		if cleared_lines > 0 then
+			self.combo = self.combo + (cleared_lines - 1) * 2
+			self.score = self.score + (
+				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
+				cleared_lines * self.combo * self.bravo
+			)
+		else
+			self.combo = 1
 		end
-        self.grid:clear()
-        self.roll_frames = -150
+		self.drop_bonus = 0
 	end
 end
 

tetris/modes/marathon_a3.lua

@@ -225,6 +225,7 @@ function MarathonA3Game:updateSectionTimes(old_level, new_level)
 end
 
 function MarathonA3Game:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		self:updateGrade(cleared_lines)
 		if cleared_lines > 0 then
 			self.combo = self.combo + (cleared_lines - 1) * 2
@@ -232,11 +233,11 @@ function MarathonA3Game:updateScore(level, drop_bonus, cleared_lines)
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 				cleared_lines * self.combo
 			)
-        self.lines = self.lines + cleared_lines
 		else
 			self.combo = 1
 		end
 		self.drop_bonus = 0
+	end
 end
 
 local grade_point_bonuses = {

tetris/modes/phantom_mania.lua

@@ -117,17 +117,18 @@ function PhantomManiaGame:onLineClear(cleared_row_count)
 end
 
 function PhantomManiaGame:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if cleared_lines > 0 then
+			self.combo = self.combo + (cleared_lines - 1) * 2
 			self.score = self.score + (
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
-			cleared_lines * (cleared_lines * 2 - 1) * (self.combo * 2 - 1)
+				cleared_lines * self.combo
 			)
-		self.lines = self.lines + cleared_lines
-		self.combo = self.combo + cleared_lines - 1
 		else
-		self.drop_bonus = 0
 			self.combo = 1
 		end
+		self.drop_bonus = 0
+	end
 end
 
 PhantomManiaGame.rollOpacityFunction = function(age)

tetris/modes/phantom_mania2.lua

@@ -181,17 +181,18 @@ function PhantomMania2Game:onHold()
 end
 
 function PhantomMania2Game:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if cleared_lines > 0 then
+			self.combo = self.combo + (cleared_lines - 1) * 2
 			self.score = self.score + (
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
-			cleared_lines * (cleared_lines * 2 - 1) * (self.combo * 2 - 1)
+				cleared_lines * self.combo
 			)
-		self.lines = self.lines + cleared_lines
-		self.combo = self.combo + cleared_lines - 1
 		else
-		self.drop_bonus = 0
 			self.combo = 1
 		end
+		self.drop_bonus = 0
+	end
 end
 
 

tetris/modes/strategy.lua

@@ -99,17 +99,18 @@ function StrategyGame:onLineClear(cleared_row_count)
 end
 
 function StrategyGame:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if cleared_lines > 0 then
+			self.combo = self.combo + (cleared_lines - 1) * 2
 			self.score = self.score + (
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
-			cleared_lines * (cleared_lines * 2 - 1) * (self.combo * 2 - 1)
+				cleared_lines * self.combo
 			)
-		self.lines = self.lines + cleared_lines
-		self.combo = self.combo + cleared_lines - 1
 		else
-		self.drop_bonus = 0
 			self.combo = 1
 		end
+		self.drop_bonus = 0
+	end
 end
 
 function StrategyGame:setNextOpacity(i)

tetris/modes/survival_2020.lua

@@ -174,17 +174,18 @@ function Survival2020Game:onLineClear(cleared_row_count)
 end
 
 function Survival2020Game:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if cleared_lines > 0 then
+			self.combo = self.combo + (cleared_lines - 1) * 2
 			self.score = self.score + (
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
-			cleared_lines * (cleared_lines * 2 - 1) * (self.combo * 2 - 1)
+				cleared_lines * self.combo
 			)
-		self.lines = self.lines + cleared_lines
-		self.combo = self.combo + cleared_lines - 1
 		else
-		self.drop_bonus = 0
 			self.combo = 1
 		end
+		self.drop_bonus = 0
+	end
 end
 
 function Survival2020Game:updateSectionTimes(old_level, new_level)

tetris/modes/survival_a1.lua

@@ -109,7 +109,7 @@ function SurvivalA1Game:onLineClear(cleared_row_count)
     self:checkGMRequirements(self.level, self.level + cleared_row_count)
 	if not self.clear then
 		local new_level = math.min(self.level + cleared_row_count, 999)
-		if self.level == 999 then
+		if new_level == 999 then
 			self.clear = true
 		else
 		self.level = new_level
@@ -118,6 +118,7 @@ function SurvivalA1Game:onLineClear(cleared_row_count)
 end
 
 function SurvivalA1Game:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if self.grid:checkForBravo(cleared_lines) then
 			self.bravo = 4
 			self.bravos = self.bravos + 1
@@ -128,11 +129,11 @@ function SurvivalA1Game:updateScore(level, drop_bonus, cleared_lines)
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 				cleared_lines * self.combo * self.bravo
 			)
-        self.lines = self.lines + cleared_lines
 		else
 			self.combo = 1
 		end
 		self.drop_bonus = 0
+	end
 end
 
 function SurvivalA1Game:checkGMRequirements(old_level, new_level)

tetris/modes/survival_a2.lua

@@ -108,6 +108,7 @@ function SurvivalA2Game:onLineClear(cleared_row_count)
 end
 
 function SurvivalA2Game:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
 		if cleared_lines > 0 then
 			self.combo = self.combo + (cleared_lines - 1) * 2
@@ -115,11 +116,11 @@ function SurvivalA2Game:updateScore(level, drop_bonus, cleared_lines)
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 				cleared_lines * self.combo * self.bravo
 			)
-        self.lines = self.lines + cleared_lines
 		else
 			self.combo = 1
 		end
 		self.drop_bonus = 0
+	end
 end
 
 function SurvivalA2Game:getLetterGrade()

tetris/modes/survival_a3.lua

@@ -166,17 +166,18 @@ function SurvivalA3Game:onPieceLock(piece, cleared_row_count)
 end
 
 function SurvivalA3Game:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if cleared_lines > 0 then
 			self.combo = self.combo + (cleared_lines - 1) * 2
 			self.score = self.score + (
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 				cleared_lines * self.combo
 			)
-        self.lines = self.lines + cleared_lines
 		else
 			self.combo = 1
 		end
 		self.drop_bonus = 0
+	end
 end
 
 function SurvivalA3Game:updateSectionTimes(old_level, new_level)

tetris/modes/tgmplus.lua

@@ -137,6 +137,7 @@ function TGMPlusGame:advanceBottomRow()
 end
 
 function TGMPlusGame:updateScore(level, drop_bonus, cleared_lines)
+	if not self.clear then
 		if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
 		if cleared_lines > 0 then
 			self.combo = self.combo + (cleared_lines - 1) * 2
@@ -144,11 +145,11 @@ function TGMPlusGame:updateScore(level, drop_bonus, cleared_lines)
 				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 				cleared_lines * self.combo * self.bravo
 			)
-        self.lines = self.lines + cleared_lines
 		else
 			self.combo = 1
 		end
 		self.drop_bonus = 0
+	end
 end
 
 function TGMPlusGame:drawGrid(ruleset)