Some score fixes for core TGM modes

This commit is contained in:
Ishaan Bhardwaj
2020-10-29 23:03:54 -04:00
parent 2aafd30253
commit f2862b4d93
7 changed files with 31 additions and 30 deletions

View File

@@ -136,20 +136,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
cleared_lines = cleared_lines / 2
self:updateGrade(cleared_lines)
if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
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)
self.lines = self.lines + cleared_lines
else
self.drop_bonus = 0
self.combo = 1
end
self.drop_bonus = 0
endd
end
function MarathonA2Game:updateSectionTimes(old_level, new_level)