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

Compare commits

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

No commits in common. "ca0de46f6afeafdf8633ff04f5f90314dc81e5c0" and "2ba4a23ebffcb26e279f2f46ca2faf31c97e211c" have entirely different histories.
ca0de46f6a ... 2ba4a23ebf

1 changed files with 4 additions and 11 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 60 / mean(delays)
return (mean(delays) / 60) ^ -1
end
function LudicrousSpeed:advanceOneFrame()
@ -99,13 +99,6 @@ 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 .. " " ..
@ -116,13 +109,13 @@ function LudicrousSpeed:drawScoringInfo()
love.graphics.setFont(font_3x5_4)
if self.time_limit < 300 then
love.graphics.printf(formatTime(self.time_limit):sub(-4, -1), text_x, 320, 160, "left")
love.graphics.printf(formatTime(self.time_limit), 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(("%.02f"):format(self:getPPS()), text_x, 200, 80, "left")
love.graphics.printf(("%.02f"):format(self.pps_limit), text_x, 260, 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.setFont(font_8x11)
love.graphics.printf(formatTime(self.frames), 64, 420, 160, "center")