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

Added safe-lock back to Survival CK.

Browse Source
This commit is contained in:
Joe Zeng 2020-11-09 21:13:07 -05:00
parent a8d697064c
commit 843b1e108a
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tetris/components/grid.lua
View File

@ -268,7 +268,11 @@ function Grid:draw()
love.graphics.setColor(1, 1, 1, 1) love.graphics.setColor(1, 1, 1, 1)
love.graphics.draw(blocks[self.grid[y][x].skin]["F"], 48+x*16, y*16) love.graphics.draw(blocks[self.grid[y][x].skin]["F"], 48+x*16, y*16)
else else
love.graphics.setColor(0.5, 0.5, 0.5, 1) if self.grid[y][x].skin == "bone" then
love.graphics.setColor(1, 1, 1, 1)
else
love.graphics.setColor(0.5, 0.5, 0.5, 1)
end
love.graphics.draw(blocks[self.grid[y][x].skin][self.grid[y][x].colour], 48+x*16, y*16) love.graphics.draw(blocks[self.grid[y][x].skin][self.grid[y][x].colour], 48+x*16, y*16)
end end
if self.grid[y][x].skin ~= "bone" then if self.grid[y][x].skin ~= "bone" then

13
tetris/modes/ck.lua
View File

@ -22,6 +22,7 @@ function SurvivalCKGame:new()
self.randomizer = History6RollsRandomizer() self.randomizer = History6RollsRandomizer()
self.lock_drop = true
self.enable_hold = true self.enable_hold = true
self.next_queue_length = 3 self.next_queue_length = 3
@ -153,11 +154,11 @@ function SurvivalCKGame:onLineClear(cleared_row_count)
local new_level = self.level + cleared_row_count * 2 local new_level = self.level + cleared_row_count * 2
self:updateSectionTimes(self.level, new_level) self:updateSectionTimes(self.level, new_level)
if new_level >= 2500 or self:hitTorikan(self.level, new_level) then if new_level >= 2500 or self:hitTorikan(self.level, new_level) then
self.clear = true self.clear = true
if new_level >= 2500 then if new_level >= 2500 then
self.level = 2500 self.level = 2500
self.grid:clear() self.grid:clear()
self.big_mode = true self.big_mode = true
self.roll_frames = -150 self.roll_frames = -150
end end
else else
@ -217,11 +218,11 @@ function SurvivalCKGame:drawGrid()
elseif self.level >= 1600 and self.level < 1700 then elseif self.level >= 1600 and self.level < 1700 then
self.grid:drawInvisible(self.rollOpacityFunction2) self.grid:drawInvisible(self.rollOpacityFunction2)
elseif self.level >= 1700 and self.level < 1800 then elseif self.level >= 1700 and self.level < 1800 then
self.grid:drawInvisible(self.rollOpacityFunction3) self.grid:drawInvisible(self.rollOpacityFunction3)
elseif self.level >= 1800 and self.level < 1900 then elseif self.level >= 1800 and self.level < 1900 then
self.grid:drawInvisible(self.rollOpacityFunction4) self.grid:drawInvisible(self.rollOpacityFunction4)
elseif self.level >= 1900 and self.level < 2000 then elseif self.level >= 1900 and self.level < 2000 then
self.grid:drawInvisible(self.rollOpacityFunction5) self.grid:drawInvisible(self.rollOpacityFunction5)
else else
self.grid:draw() self.grid:draw()
end end

4
tetris/rulesets/ruleset.lua
View File

@ -34,6 +34,8 @@ function Ruleset:new()
C = love.graphics.newImage("res/img/bone.png"), C = love.graphics.newImage("res/img/bone.png"),
B = love.graphics.newImage("res/img/bone.png"), B = love.graphics.newImage("res/img/bone.png"),
M = love.graphics.newImage("res/img/bone.png"), M = love.graphics.newImage("res/img/bone.png"),
F = love.graphics.newImage("res/img/bone.png"),
A = love.graphics.newImage("res/img/bone.png"),
X = love.graphics.newImage("res/img/bone.png"), X = love.graphics.newImage("res/img/bone.png"),
} or { } or {
R = love.graphics.newImage("res/img/bonew.png"), R = love.graphics.newImage("res/img/bonew.png"),
@ -43,6 +45,8 @@ function Ruleset:new()
C = love.graphics.newImage("res/img/bonew.png"), C = love.graphics.newImage("res/img/bonew.png"),
B = love.graphics.newImage("res/img/bonew.png"), B = love.graphics.newImage("res/img/bonew.png"),
M = love.graphics.newImage("res/img/bonew.png"), M = love.graphics.newImage("res/img/bonew.png"),
F = love.graphics.newImage("res/img/bonew.png"),
A = love.graphics.newImage("res/img/bonew.png"),
X = love.graphics.newImage("res/img/bonew.png"), X = love.graphics.newImage("res/img/bonew.png"),
} }
end end