SweetSea/cambridge_mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump version to beta6 (also closes #19)

Browse Source
This commit is contained in:
Ishaan Bhardwaj
2021-07-11 14:04:22 -04:00
parent 61d5410f22
commit 7dbfe23059
9 changed files with 121 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tetris/modes/marathon_a2.lua
View File

@@ -19,6 +19,7 @@ function MarathonA2Game:new()
self.roll_frames = 0
self.combo = 1
self.grade_combo = 1
self.randomizer = History6RollsRandomizer()
self.grade = 0
self.grade_points = 0
@@ -135,15 +136,23 @@ function MarathonA2Game:updateScore(level, drop_bonus, cleared_lines)
if cleared_lines >= 4 then
self.tetris_count = self.tetris_count + 1
end
if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
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
if cleared_lines > 1 then
self.grade_combo = self.grade_combo + 1
end
self.score = self.score + (
(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
cleared_lines * self.combo * self.bravo
)
else
self.combo = 1
self.grade_combo = 1
end
self.drop_bonus = 0
else self.lines = self.lines + cleared_lines end
@@ -253,7 +262,7 @@ function MarathonA2Game:updateGrade(cleared_lines)
self.grade_points = self.grade_points + (
math.ceil(
grade_point_bonuses[self.grade + 1][cleared_lines] *
combo_multipliers[math.min(self.combo, 10)][cleared_lines]
combo_multipliers[math.min(self.grade_combo, 10)][cleared_lines]
) * (1 + math.floor(self.level / 250))
)
if self.grade_points >= 100 and self.grade < 31 then