SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-22 12:39:01 -06:00
Code Issues Projects Releases Wiki Activity

Last LCD added to fix up line clear animations

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2021-03-03 11:54:43 -05:00
parent 163b8f6cc5
commit b85de17e51
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tetris/modes/gamemode.lua
View File

@ -65,6 +65,7 @@ function GameMode:new(secret_inputs)
self.lock_on_soft_drop = false self.lock_on_soft_drop = false
self.lock_on_hard_drop = false self.lock_on_hard_drop = false
self.cleared_block_table = {} self.cleared_block_table = {}
self.last_lcd = 0
self.used_randomizer = nil self.used_randomizer = nil
self.hold_queue = nil self.hold_queue = nil
self.held = false self.held = false
@ -265,6 +266,7 @@ function GameMode:update(inputs, ruleset)
if cleared_row_count > 0 then if cleared_row_count > 0 then
playSE("erase") playSE("erase")
self.lcd = self:getLineClearDelay() self.lcd = self:getLineClearDelay()
self.last_lcd = self.lcd
self.are = ( self.are = (
ruleset.are and self:getLineARE() or 0 ruleset.are and self:getLineARE() or 0
) )
@ -571,7 +573,7 @@ end
function GameMode:animation(x, y, skin, colour) function GameMode:animation(x, y, skin, colour)
return { return {
1, 1, 1, 1, 1, 1,
-0.25 + 1.25 * (self.lcd / self:getLineClearDelay()), -0.25 + 1.25 * (self.lcd / self.last_lcd),
skin, colour, skin, colour,
48 + x * 16, y * 16 48 + x * 16, y * 16
} }
@ -587,7 +589,7 @@ function GameMode:drawLineClearAnimation()
function animation(x, y, skin, colour) function animation(x, y, skin, colour)
return { return {
1, 1, 1, 1, 1, 1,
-0.25 + 1.25 * (self.lcd / self:getLineClearDelay()), -0.25 + 1.25 * (self.lcd / self.last_lcd),
skin, colour, skin, colour,
48 + x * 16, y * 16 48 + x * 16, y * 16
} }
@ -611,7 +613,7 @@ function GameMode:drawLineClearAnimation()
function animation(x, y, skin, colour) function animation(x, y, skin, colour)
local p = 0.5 local p = 0.5
local l = ( local l = (
(self:getLineClearDelay() - self.lcd) / self:getLineClearDelay() (self.last_lcd - self.lcd) / self.last_lcd
) )
local dx = l * (x - (1 + self.grid.width) / 2) local dx = l * (x - (1 + self.grid.width) / 2)
local dy = l * (y - (1 + self.grid.height) / 2) local dy = l * (y - (1 + self.grid.height) / 2)