diff --git a/tetris/modes/marathon_2020.lua b/tetris/modes/marathon_2020.lua index cca9a01..091e0bc 100644 --- a/tetris/modes/marathon_2020.lua +++ b/tetris/modes/marathon_2020.lua @@ -327,10 +327,10 @@ function Marathon2020Game:checkClear(level) end function Marathon2020Game:updateSectionTimes(old_level, new_level) - function sectionCool() + function sectionCool(section) self.section_cool_count = self.section_cool_count + 1 self.delay_level = math.min(20, self.delay_level + 1) - table.insert(self.section_status, "cool") + if section < 10 then table.insert(self.section_status, "cool") end self.cool_timer = 300 end @@ -348,7 +348,7 @@ function Marathon2020Game:updateSectionTimes(old_level, new_level) table.insert(self.section_times, section_time) self.section_start_time = self.frames - if section > 4 then self.delay_level = math.min(20, self.delay_level + 1) end + if section > 5 then self.delay_level = math.min(20, self.delay_level + 1) end self:checkTorikan(section) self:checkClear(new_level) @@ -357,11 +357,11 @@ function Marathon2020Game:updateSectionTimes(old_level, new_level) self.secondary_section_times[section] < self.secondary_section_times[section - 1] + 120 and self.secondary_section_times[section] < cool_cutoffs[section] ) then - sectionCool() + sectionCool(section) elseif self.section_status[section - 1] == "cool" then table.insert(self.section_status, "none") elseif section <= 19 and self.secondary_section_times[section] < cool_cutoffs[section] then - sectionCool() + sectionCool(section) else table.insert(self.section_status, "none") end @@ -423,6 +423,14 @@ function Marathon2020Game:drawGrid() end end +function Marathon2020Game:sectionColourFunction(section) + if self.section_status[section] == "cool" then + return { 0, 1, 0, 1 } + else + return { 1, 1, 1, 1 } + end +end + function Marathon2020Game:drawScoringInfo() Marathon2020Game.super.drawScoringInfo(self) @@ -434,7 +442,7 @@ function Marathon2020Game:drawScoringInfo() love.graphics.printf("GRADE PTS.", text_x, 200, 90, "left") love.graphics.printf("LEVEL", text_x, 320, 40, "left") - self:drawSectionTimesWithSecondary(current_section) + self:drawSectionTimesWithSecondary(current_section, self.sectionColourFunction) if (self.cool_timer > 0) then love.graphics.printf("COOL!!", 64, 400, 160, "center") diff --git a/tetris/modes/phantom_mania2.lua b/tetris/modes/phantom_mania2.lua index a4453fb..cd2bab2 100644 --- a/tetris/modes/phantom_mania2.lua +++ b/tetris/modes/phantom_mania2.lua @@ -255,7 +255,7 @@ PhantomMania2Game.garbageOpacityFunction = function(age) end function PhantomMania2Game:drawGrid() - if not (self.game_over or (self.clear and self.level < 1300)) then + if not (self.game_over) then self.grid:drawInvisible(self.rollOpacityFunction, self.garbageOpacityFunction) else self.grid:draw()