SashLilac
/
cambridge-modpack
mirror of https://github.com/SashLilac/cambridge-modpack.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: SashLilac:2ba4a23ebffcb26e279f2f46ca2faf31c97e211c
Branches Tags
SashLilac:main
...
compare: SashLilac:ca0de46f6afeafdf8633ff04f5f90314dc81e5c0
Branches Tags
SashLilac:main

3 Commits
2ba4a23ebf ... ca0de46f6a

Author SHA1 Message Date
Milla ca0de46f6a
aaaaaaaand wrong conditional 2022-08-12 01:48:27 -07:00
Milla ad53c46916
Ludicrous Speed: SPEED UP! text is no longer red on game over 2022-08-12 01:46:06 -07:00
Milla 21d52c8769
Ludicrous Speed: UI rework 2022-08-12 01:43:01 -07:00
1 changed files with 11 additions and 4 deletions
Show Stats Expand all files Collapse all files

15
tetris/modes/speed.lua
View File

@ -56,7 +56,7 @@ function LudicrousSpeed:getPPS()
if #self.delays == 0 then return 0 end
local delays = copy(self.delays)
delays[0] = self.frames - self.last_piece
return (mean(delays) / 60) ^ -1
return 60 / mean(delays)
end
function LudicrousSpeed:advanceOneFrame()
@ -99,6 +99,13 @@ function LudicrousSpeed:drawScoringInfo()
love.graphics.printf("LINES", text_x, 120, 80, "left")
love.graphics.printf("piece/sec", text_x, 180, 80, "left")
love.graphics.printf("REQUIRED PPS", text_x, 240, 120, "left")
if self.time_limit < 300 then
if self.time_limit % 4 < 2 and self.time_limit ~= 0 then
love.graphics.setColor(1, 0.3, 0.3, 1)
end
love.graphics.printf("SPEED UP!", text_x, 300, 120, "left")
love.graphics.setColor(1, 1, 1, 1)
end
love.graphics.print(
self.das.direction .. " " ..
@ -109,13 +116,13 @@ function LudicrousSpeed:drawScoringInfo()
love.graphics.setFont(font_3x5_4)
if self.time_limit < 300 then
love.graphics.printf(formatTime(self.time_limit), text_x, 320, 160, "left")
love.graphics.printf(formatTime(self.time_limit):sub(-4, -1), text_x, 320, 160, "left")
end
love.graphics.setFont(font_3x5_3)
love.graphics.printf(self.lines, text_x, 140, 80, "left")
love.graphics.printf(string.format("%.02f", self:getPPS()), text_x, 200, 80, "left")
love.graphics.printf(string.format("%.02f", self.pps_limit), text_x, 260, 80, "left")
love.graphics.printf(("%.02f"):format(self:getPPS()), text_x, 200, 80, "left")
love.graphics.printf(("%.02f"):format(self.pps_limit), text_x, 260, 80, "left")
love.graphics.setFont(font_8x11)
love.graphics.printf(formatTime(self.frames), 64, 420, 160, "center")