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

Roll roll bugfixes

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2021-01-07 19:52:36 -05:00
parent 29afdcecfc
commit 7d7dd8c3c2
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tetris/modes/sakura.lua
View File

@ -274,7 +274,7 @@ function SakuraGame:new(secret_inputs)
) and History6RollsRandomizer() or SakuraRandomizer() ) and History6RollsRandomizer() or SakuraRandomizer()
) )
self.current_map = 1 self.current_map = 16
self.time_limit = 10800 self.time_limit = 10800
self.cleared_frames = STAGE_TRANSITION_TIME self.cleared_frames = STAGE_TRANSITION_TIME
self.stage_frames = 0 self.stage_frames = 0
@ -408,12 +408,17 @@ function SakuraGame:advanceOneFrame(inputs, ruleset)
self.frames = self.frames + 1 self.frames = self.frames + 1
self.stage_frames = self.stage_frames + 1 self.stage_frames = self.stage_frames + 1
self.time_limit = self.time_limit - 1 self.time_limit = math.max(self.time_limit - 1, 0)
if self.time_limit <= 0 then self.game_over = true end if self.time_limit <= 0 and self.piece == nil then
self.game_over = true
end
if self.piece ~= nil and self.frames % 30 == 0 and if self.piece ~= nil and
effects[self.current_map] == "roll" effects[self.current_map] == "roll" and
self.stage_pieces % 4 == 0
then then
self.piece.colour = "F"
if self.stage_frames % 30 == 0 then
ruleset:attemptRotate( ruleset:attemptRotate(
{[config.gamesettings.world_reverse == 3 or {[config.gamesettings.world_reverse == 3 or
(ruleset.world and config.gamesettings.world_reverse == 2) (ruleset.world and config.gamesettings.world_reverse == 2)
@ -421,6 +426,7 @@ function SakuraGame:advanceOneFrame(inputs, ruleset)
self.piece, self.grid, false self.piece, self.grid, false
) )
end end
end
else else
self.cleared_frames = STAGE_TRANSITION_TIME self.cleared_frames = STAGE_TRANSITION_TIME
if not self.prev_inputs.hold and inputs.hold then if not self.prev_inputs.hold and inputs.hold then