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

Removed some future features that I committed by accident

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2021-03-04 15:18:32 -05:00
parent 0453a3db97
commit 57518dc299
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tetris/modes/gamemode.lua
View File

@ -69,7 +69,6 @@ function GameMode:new(secret_inputs)
self.used_randomizer = nil self.used_randomizer = nil
self.hold_queue = nil self.hold_queue = nil
self.held = false self.held = false
self.bgm_progression = 0
self.section_start_time = 0 self.section_start_time = 0
self.section_times = { [0] = 0 } self.section_times = { [0] = 0 }
self.secondary_section_times = { [0] = 0 } self.secondary_section_times = { [0] = 0 }
@ -288,10 +287,6 @@ function GameMode:update(inputs, ruleset)
end end
end end
end end
-- end-of-frame actions, including music swap
self:swapMusic(self.level)
self.prev_inputs = inputs self.prev_inputs = inputs
end end
@ -322,8 +317,6 @@ function GameMode:afterLineClear(cleared_row_count) end
function GameMode:onPieceEnter() end function GameMode:onPieceEnter() end
function GameMode:onHold() end function GameMode:onHold() end
function GameMode:swapMusic(level) end
function GameMode:onSoftDrop(dropped_row_count) function GameMode:onSoftDrop(dropped_row_count)
self.drop_bonus = self.drop_bonus + 1 * dropped_row_count self.drop_bonus = self.drop_bonus + 1 * dropped_row_count
end end
@ -578,16 +571,11 @@ function GameMode:getHighScoreData()
end end
function GameMode:animation(x, y, skin, colour) 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 { return {
1, 1, 1, 1, skin, colour, 1, 1, 1,
48 + (x + dx) * 16, -0.25 + 1.25 * (self.lcd / self.last_lcd),
(y + dy) * 16 + (464 / (p - 1)) * l * (p - l) skin, colour,
48 + x * 16, y * 16
} }
end end