From 468025fc80f93fa1f792d10817befaafb507adb4 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Tue, 3 Nov 2020 12:17:36 -0500 Subject: [PATCH] last commit to core modes before release --- tetris/modes/interval_training.lua | 3 ++- tetris/modes/strategy.lua | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tetris/modes/interval_training.lua b/tetris/modes/interval_training.lua index bb262b0..d4d0169 100644 --- a/tetris/modes/interval_training.lua +++ b/tetris/modes/interval_training.lua @@ -15,6 +15,7 @@ IntervalTrainingGame.tagline = "Can you clear the time hurdles when the game goe function IntervalTrainingGame:new() + self.level = 0 IntervalTrainingGame.super:new() self.roll_frames = 0 self.combo = 1 @@ -77,7 +78,7 @@ function IntervalTrainingGame:advanceOneFrame() end function IntervalTrainingGame:onPieceEnter() - if (self.level % 100 ~= 99 or 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 end end diff --git a/tetris/modes/strategy.lua b/tetris/modes/strategy.lua index 20e4e59..a0b558b 100644 --- a/tetris/modes/strategy.lua +++ b/tetris/modes/strategy.lua @@ -16,7 +16,6 @@ StrategyGame.tagline = "You have lots of time to think! Can you use it to place function StrategyGame:new() StrategyGame.super:new() - self.level = 0 self.clear = false self.completed = false self.roll_frames = 0 @@ -84,7 +83,7 @@ function StrategyGame:advanceOneFrame() end function StrategyGame:onPieceEnter() - if (self.level % 100 ~= 99) 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 end end @@ -136,11 +135,11 @@ function StrategyGame:drawScoringInfo() love.graphics.setFont(font_3x5_3) love.graphics.printf(self.score, text_x, 220, 90, "left") - love.graphics.printf(self.level, text_x, 340, 50, "right") + love.graphics.printf(self.level, text_x, 340, 40, "right") if self.clear then - love.graphics.printf(self.level, text_x, 370, 50, "right") + love.graphics.printf(self.level, text_x, 370, 40, "right") else - love.graphics.printf(math.floor(self.level / 100 + 1) * 100, text_x, 370, 50, "right") + love.graphics.printf(self.level < 900 and math.floor(self.level / 100 + 1) * 100 or 999, text_x, 370, 40, "right") end end