SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-22 14:39:02 -06:00
Code Issues Projects Releases Wiki Activity

Fixed how grade points decay in A2 and A3

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2021-01-23 11:34:46 -05:00
parent 6609b642dc
commit 8e7a5418dc
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tetris/modes/marathon_a2.lua
View File

@ -26,7 +26,6 @@ function MarathonA2Game:new()
self.section_start_time = 0 self.section_start_time = 0
self.section_times = { [0] = 0 } self.section_times = { [0] = 0 }
self.section_tetrises = { [0] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } self.section_tetrises = { [0] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
self.piece_active_time = 0
self.tetris_count = 0 self.tetris_count = 0
self.SGnames = { self.SGnames = {
@ -124,11 +123,14 @@ function MarathonA2Game:advanceOneFrame()
end end
function MarathonA2Game:whilePieceActive() function MarathonA2Game:whilePieceActive()
self.piece_active_time = self.piece_active_time + 1 self.grade_point_decay_counter = self.grade_point_decay_counter + 1
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)
end
end end
function MarathonA2Game:onPieceEnter() function MarathonA2Game:onPieceEnter()
self.piece_active_time = 0
if (self.level % 100 ~= 99 and self.level ~= 998) and not self.clear and self.frames ~= 0 then if (self.level % 100 ~= 99 and self.level ~= 998) and not self.clear and self.frames ~= 0 then
self.level = self.level + 1 self.level = self.level + 1
end end
@ -246,13 +248,7 @@ local grade_conversion = {
} }
function MarathonA2Game:updateGrade(cleared_lines) function MarathonA2Game:updateGrade(cleared_lines)
if self.clear then return end if self.clear or cleared_lines == 0 then return end
if cleared_lines == 0 then
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)
end
else else
self.grade_points = self.grade_points + ( self.grade_points = self.grade_points + (
math.ceil( math.ceil(

15
tetris/modes/marathon_a3.lua
View File

@ -30,7 +30,6 @@ function MarathonA3Game:new()
self.secondary_section_times = { [0] = 0 } self.secondary_section_times = { [0] = 0 }
self.section_times = { [0] = 0 } self.section_times = { [0] = 0 }
self.section_cool = false self.section_cool = false
self.piece_active_time = 0
self.randomizer = History6RollsRandomizer() self.randomizer = History6RollsRandomizer()
@ -149,11 +148,14 @@ function MarathonA3Game:advanceOneFrame()
end end
function MarathonA3Game:whilePieceActive() function MarathonA3Game:whilePieceActive()
self.piece_active_time = self.piece_active_time + 1 self.grade_point_decay_counter = self.grade_point_decay_counter + 1
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)
end
end end
function MarathonA3Game:onPieceEnter() function MarathonA3Game:onPieceEnter()
self.piece_active_time = 0
if (self.level % 100 ~= 99) and self.level ~= 998 and self.frames ~= 0 then if (self.level % 100 ~= 99) and self.level ~= 998 and self.frames ~= 0 then
self:updateSectionTimes(self.level, self.level + 1) self:updateSectionTimes(self.level, self.level + 1)
self.level = self.level + 1 self.level = self.level + 1
@ -320,12 +322,7 @@ local grade_conversion = {
} }
function MarathonA3Game:updateGrade(cleared_lines) function MarathonA3Game:updateGrade(cleared_lines)
if cleared_lines == 0 then if cleared_lines == 0 then return end
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)
end
else else
if self.clear then if self.clear then
if self:qualifiesForMRoll() then if self:qualifiesForMRoll() then