Some score fixes for core TGM modes

tetris/modes/big_a2.lua

@@ -140,16 +140,17 @@ function MarathonA2Game:updateScore(level, drop_bonus, cleared_lines)
 	cleared_lines = cleared_lines / 2
 	self:updateGrade(cleared_lines)
 	if cleared_lines > 0 then
+		self.combo = self.combo + (cleared_lines - 1) * 2
 		self.score = self.score + (
-			(math.ceil((level + cleared_lines) / 4) + 2 * drop_bonus) *
+			(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 			cleared_lines * self.combo * self.bravo
 		)
         self.lines = self.lines + cleared_lines
-		self.combo = self.combo + 2 * (cleared_lines - 1)
 	else
-		self.drop_bonus = 0
 		self.combo = 1
 	end
+	self.drop_bonus = 0
+endd
 end
 
 function MarathonA2Game:updateSectionTimes(old_level, new_level)

tetris/modes/marathon_a1.lua

@@ -158,9 +158,9 @@ function MarathonA1Game:updateScore(level, drop_bonus, cleared_lines)
 		)
         self.lines = self.lines + cleared_lines
 	else
-		self.drop_bonus = 0
 		self.combo = 1
 	end
+	self.drop_bonus = 0
 end
 
 function MarathonA1Game:checkGMRequirements(old_level, new_level)

tetris/modes/marathon_a2.lua

@@ -144,16 +144,16 @@ function MarathonA2Game:updateScore(level, drop_bonus, cleared_lines)
 	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) + 2 * drop_bonus) *
+			(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
 			cleared_lines * self.combo * self.bravo
 		)
         self.lines = self.lines + cleared_lines
-		self.combo = self.combo + (cleared_lines - 1) * 2
 	else
-		self.drop_bonus = 0
 		self.combo = 1
 	end
+	self.drop_bonus = 0
 end
 
 function MarathonA2Game:updateSectionTimes(old_level, new_level)

tetris/modes/marathon_a3.lua

@@ -227,16 +227,16 @@ end
 function MarathonA3Game:updateScore(level, drop_bonus, cleared_lines)
 	self:updateGrade(cleared_lines)
 	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
 
 local grade_point_bonuses = {

tetris/modes/survival_a1.lua

@@ -123,16 +123,16 @@ function SurvivalA1Game:updateScore(level, drop_bonus, cleared_lines)
 		self.bravos = self.bravos + 1
 	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.bravo * self.combo
+			cleared_lines * self.combo * self.bravo
 		)
         self.lines = self.lines + cleared_lines
-		self.combo = self.combo + (cleared_lines - 1) * 2
 	else
-		self.drop_bonus = 0
 		self.combo = 1
 	end
+	self.drop_bonus = 0
 end
 
 function SurvivalA1Game:checkGMRequirements(old_level, new_level)

tetris/modes/survival_a2.lua

@@ -110,16 +110,16 @@ end
 function SurvivalA2Game:updateScore(level, drop_bonus, 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.bravo * self.combo
+			cleared_lines * self.combo * self.bravo
 		)
         self.lines = self.lines + cleared_lines
-		self.combo = self.combo + (cleared_lines - 1) * 2
 	else
-		self.drop_bonus = 0
 		self.combo = 1
 	end
+	self.drop_bonus = 0
 end
 
 function SurvivalA2Game:getLetterGrade()

tetris/modes/survival_a3.lua

@@ -169,16 +169,16 @@ end
 
 function SurvivalA3Game:updateScore(level, drop_bonus, cleared_lines)
 	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
 
 function SurvivalA3Game:updateSectionTimes(old_level, new_level)