From b316d9617bfa887e344c5ba7fa1b48b1078d11c1 Mon Sep 17 00:00:00 2001 From: Joe Zeng Date: Tue, 28 May 2019 21:26:38 -0400 Subject: [PATCH] Updated Marathon A1's combo calculation algorithm. Apparently the 1/6/15/28 multiplier comes from updating combo before calculating the multiplier, not something that gets independently multiplied. --- tetris/modes/marathon_a1.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tetris/modes/marathon_a1.lua b/tetris/modes/marathon_a1.lua index 2356fad..fb4e2ac 100644 --- a/tetris/modes/marathon_a1.lua +++ b/tetris/modes/marathon_a1.lua @@ -142,12 +142,12 @@ end function MarathonA1Game: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 + cleared_lines * self.combo ) - self.lines = self.lines + cleared_lines - self.combo = self.combo + (cleared_lines - 1) * 2 + self.lines = self.lines + cleared_lines else self.drop_bonus = 0 self.combo = 1