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

Compare commits

base: SashLilac:828b888810fcb7b84dd4d7d9d62ad17a31c3e9e0
Branches Tags
SashLilac:main
..
compare: SashLilac:b9e96406ca8f3ef9255b7ca73bdc8410f01fb617
Branches Tags
SashLilac:main

No commits in common. "828b888810fcb7b84dd4d7d9d62ad17a31c3e9e0" and "b9e96406ca8f3ef9255b7ca73bdc8410f01fb617" have entirely different histories.
828b888810 ... b9e96406ca

2 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

9
tetris/modes/combo_challenge.lua
View File

@ -78,13 +78,10 @@ function ComboChallenge:hold(inputs, ruleset, ihs)
table.insert(self.next_queue, self:getNextPiece(ruleset)) table.insert(self.next_queue, self:getNextPiece(ruleset))
self.skips = self.skips - 1 self.skips = self.skips - 1
if ihs then playSE("ihs")
else playSE("hold") end
self:onHold() self:onHold()
if ihs then self:onEnterOrHold(inputs, ruleset)
playSE("ihs")
else
playSE("hold")
self:onEnterOrHold(inputs, ruleset)
end
end end
function ComboChallenge:advanceOneFrame() function ComboChallenge:advanceOneFrame()

2
tetris/modes/speed.lua
View File

@ -62,7 +62,7 @@ end
function LudicrousSpeed:advanceOneFrame() function LudicrousSpeed:advanceOneFrame()
if self.ready_frames == 0 then if self.ready_frames == 0 then
self.frames = self.frames + 1 self.frames = self.frames + 1
if self.frames > 60 and self:getPPS() < self.pps_limit then if self:getPPS() < self.pps_limit then
self.time_limit = self.time_limit - 1 self.time_limit = self.time_limit - 1
self.game_over = self.time_limit <= 0 self.game_over = self.time_limit <= 0
else self.time_limit = 300 end else self.time_limit = 300 end