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

Revert "Default line clear animation set to fadeout"

Browse Source 
Please, reminder to self, TEST YOUR COMMITS.
This reverts commit 288961e12a.
This commit is contained in:
Ishaan Bhardwaj 2021-02-10 22:46:58 -05:00
parent 288961e12a
commit b644c8e457
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tetris/modes/gamemode.lua
View File

@ -58,14 +58,6 @@ function GameMode:new(secret_inputs)
"S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9", "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9",
"GM" "GM"
} }
self.line_clear_animation = function(x, y, skin, colour)
return {
1, 1, 1,
-0.25 + 1.25 * (self.lcd / self:getLineClearDelay()),
skin, colour,
48 + x * 16, y * 16
}
end
-- variables related to configurable parameters -- variables related to configurable parameters
self.drop_locked = false self.drop_locked = false
self.hard_drop_locked = false self.hard_drop_locked = false
@ -551,7 +543,7 @@ function GameMode:drawLineClearAnimation()
-- returns: table with RGBA, skin, colour, x, y -- returns: table with RGBA, skin, colour, x, y
-- Fadeout (default) -- Fadeout (default)
--[[ -- [[
function animation(x, y, skin, colour) function animation(x, y, skin, colour)
return { return {
1, 1, 1, 1, 1, 1,
@ -593,7 +585,7 @@ function GameMode:drawLineClearAnimation()
for y, row in pairs(self.cleared_block_table) do for y, row in pairs(self.cleared_block_table) do
for x, block in pairs(row) do for x, block in pairs(row) do
local animation_table = self.line_clear_animation(x, y, block.skin, block.colour) local animation_table = animation(x, y, block.skin, block.colour)
love.graphics.setColor( love.graphics.setColor(
animation_table[1], animation_table[2], animation_table[1], animation_table[2],
animation_table[3], animation_table[4] animation_table[3], animation_table[4]