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

Fixed Marathon A3 section times, read comments

Browse Source 
Some modes may not launch currently, will fix
This commit is contained in:
Ishaan Bhardwaj
2021-01-20 10:53:22 -05:00
parent 70a827b477
commit 452879ebab
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tetris/modes/marathon_a3.lua
View File

@@ -30,6 +30,7 @@ function MarathonA3Game:new()
self.secondary_section_times = { [0] = 0 }
self.section_times = { [0] = 0 }
self.section_cool = false
self.piece_active_time = 0
self.randomizer = History6RollsRandomizer()
@@ -147,7 +148,12 @@ function MarathonA3Game:advanceOneFrame()
return true
end
function MarathonA3Game:whilePieceActive()
self.piece_active_time = self.piece_active_time + 1
end
function MarathonA3Game:onPieceEnter()
self.piece_active_time = 0
if (self.level % 100 ~= 99) and self.level ~= 998 and self.frames ~= 0 then
self:updateSectionTimes(self.level, self.level + 1)
self.level = self.level + 1
@@ -315,7 +321,7 @@ local grade_conversion = {
function MarathonA3Game:updateGrade(cleared_lines)
if cleared_lines == 0 then
self.grade_point_decay_counter = self.grade_point_decay_counter + 1
self.grade_point_decay_counter = self.grade_point_decay_counter + self.piece_active_time
if self.grade_point_decay_counter >= grade_point_decays[self.grade + 1] then
self.grade_point_decay_counter = 0
self.grade_points = math.max(0, self.grade_points - 1)
@@ -424,8 +430,8 @@ function MarathonA3Game:drawScoringInfo()
end
-- draw section time data
current_section = math.floor(self.level / 100) + 1
self:drawSectionTimesWithSecondary(current_section)
current_section = self.level >= 999 and 11 or math.floor(self.level / 100) + 1
self:drawSectionTimesWithSecondary(current_section, 10)
--[[
section_x = 530