From 57518dc2995d8a4025a61ef35611f494a521f114 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Thu, 4 Mar 2021 15:18:32 -0500 Subject: [PATCH] Removed some future features that I committed by accident --- tetris/modes/gamemode.lua | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/tetris/modes/gamemode.lua b/tetris/modes/gamemode.lua index 2056757..3bd74bb 100644 --- a/tetris/modes/gamemode.lua +++ b/tetris/modes/gamemode.lua @@ -69,7 +69,6 @@ function GameMode:new(secret_inputs) self.used_randomizer = nil self.hold_queue = nil self.held = false - self.bgm_progression = 0 self.section_start_time = 0 self.section_times = { [0] = 0 } self.secondary_section_times = { [0] = 0 } @@ -288,10 +287,6 @@ function GameMode:update(inputs, ruleset) end end end - - -- end-of-frame actions, including music swap - self:swapMusic(self.level) - self.prev_inputs = inputs end @@ -322,8 +317,6 @@ function GameMode:afterLineClear(cleared_row_count) end function GameMode:onPieceEnter() end function GameMode:onHold() end -function GameMode:swapMusic(level) end - function GameMode:onSoftDrop(dropped_row_count) self.drop_bonus = self.drop_bonus + 1 * dropped_row_count end @@ -578,16 +571,11 @@ function GameMode:getHighScoreData() end function GameMode:animation(x, y, skin, colour) - local p = 0.5 - local l = ( - (self.last_lcd - self.lcd) / self.last_lcd - ) - local dx = l * (x - (1 + self.grid.width) / 2) - local dy = l * (y - (1 + self.grid.height) / 2) return { - 1, 1, 1, 1, skin, colour, - 48 + (x + dx) * 16, - (y + dy) * 16 + (464 / (p - 1)) * l * (p - l) + 1, 1, 1, + -0.25 + 1.25 * (self.lcd / self.last_lcd), + skin, colour, + 48 + x * 16, y * 16 } end