diff --git a/tetris/modes/marathon_a3.lua b/tetris/modes/marathon_a3.lua index 9d6fa83..de29111 100644 --- a/tetris/modes/marathon_a3.lua +++ b/tetris/modes/marathon_a3.lua @@ -30,19 +30,15 @@ function MarathonA3Game:new() self.section_70_times = { [0] = 0 } self.section_times = { [0] = 0 } - - self.SGnames = { - "9", "8", "7", "6", "5", "4", "3", "2", "1", - "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9", - "GM" - } - self.randomizer = History6RollsRandomizer() self.lock_drop = true self.lock_hard_drop = true self.enable_hold = true self.next_queue_length = 3 + + self.coolregret_message = "COOL!!" + self.coolregret_timer = 0 end function MarathonA3Game:getARE() @@ -189,17 +185,23 @@ function MarathonA3Game:updateSectionTimes(old_level, new_level) if section_time > regret_cutoffs[section] then self.section_cool_grade = self.section_cool_grade - 1 table.insert(self.section_status, "regret") + self.coolregret_message = "REGRET!!" + self.coolregret_timer = 300 elseif section <= 9 and self.section_status[section - 1] == "cool" and self.section_70_times[section] < self.section_70_times[section - 1] + 120 then self.section_cool_grade = self.section_cool_grade + 1 self.speed_level = self.speed_level + 100 table.insert(self.section_status, "cool") + self.coolregret_message = "COOL!!" + self.coolregret_timer = 300 elseif self.section_status[section - 1] == "cool" then table.insert(self.section_status, "none") elseif section <= 9 and self.section_70_times[section] < cool_cutoffs[section] then self.section_cool_grade = self.section_cool_grade + 1 self.speed_level = self.speed_level + 100 table.insert(self.section_status, "cool") + self.coolregret_message = "COOL!!" + self.coolregret_timer = 300 else table.insert(self.section_status, "none") end @@ -385,8 +387,8 @@ function MarathonA3Game:drawScoringInfo() love.graphics.printf("GRADE", 240, 120, 40, "left") love.graphics.printf("SCORE", 240, 200, 40, "left") love.graphics.printf("LEVEL", 240, 320, 40, "left") - local sg = self.grid:checkSecretGrade() - if sg >= 5 then + local sg = self.grid:checkSecretGrade() + if sg >= 5 then love.graphics.printf("SECRET GRADE", 240, 430, 180, "left") end @@ -416,16 +418,21 @@ function MarathonA3Game:drawScoringInfo() end love.graphics.printf(formatTime(self.frames - self.section_start_time), current_x, 40 + 20 * current_section, 90, "left") + + if(self.coolregret_timer > 0) then + love.graphics.printf(self.coolregret_message, 64, 400, 160, "center") + self.coolregret_timer = self.coolregret_timer - 1 + end love.graphics.setFont(font_3x5_3) love.graphics.printf(self.score, 240, 220, 90, "left") love.graphics.printf(self:getLetterGrade(), 240, 140, 90, "left") love.graphics.printf(self.level, 240, 340, 40, "right") love.graphics.printf(self:getSectionEndLevel(), 240, 370, 40, "right") - if sg >= 5 then + if sg >= 5 then love.graphics.printf(self.SGnames[sg], 240, 450, 180, "left") end - + love.graphics.setFont(font_8x11) love.graphics.printf(formatTime(self.frames), 64, 420, 160, "center") end diff --git a/tetris/modes/survival_a3.lua b/tetris/modes/survival_a3.lua index a1fa033..5d8c1b9 100644 --- a/tetris/modes/survival_a3.lua +++ b/tetris/modes/survival_a3.lua @@ -34,6 +34,9 @@ function SurvivalA3Game:new() self.lock_drop = true self.enable_hold = true self.next_queue_length = 3 + + self.coolregret_message = "COOL!!" + self.coolregret_timer = 0 end function SurvivalA3Game:getARE() @@ -176,6 +179,9 @@ function SurvivalA3Game:updateSectionTimes(old_level, new_level) self.section_start_time = self.frames if section_time <= frameTime(1,00) then self.grade = self.grade + 1 + else + self.coolregret_message = "REGRET!!" + self.coolregret_timer = 300 end end end @@ -217,6 +223,11 @@ function SurvivalA3Game:drawScoringInfo() if sg >= 5 then love.graphics.printf("SECRET GRADE", 240, 430, 180, "left") end + + if(self.coolregret_timer > 0) then + love.graphics.printf(self.coolregret_message, 64, 400, 160, "center") + self.coolregret_timer = self.coolregret_timer - 1 + end local current_section = math.floor(self.level / 100) + 1 self:drawSectionTimesWithSplits(current_section)