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

QoL changes to SegaTet

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2020-11-12 16:07:11 -05:00 committed by GitHub
parent 9c02dc305a
commit 5c538153ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tetris/modes/marathon_c88.lua
View File

@ -17,6 +17,8 @@ function MarathonC88Game:new()
self.level_timer = 0 self.level_timer = 0
self.level_lines = 0 self.level_lines = 0
self.last_cleared = 0 self.last_cleared = 0
self.tetrises = 0
self.line_clears = 0
self.randomizer = SegaRandomizer() self.randomizer = SegaRandomizer()
@ -90,6 +92,8 @@ function MarathonC88Game:updateScore(level, drop_bonus, cleared_lines)
self.score = self.score + score_table[cleared_lines] * 100 * self:getScoreMultiplier() * bravo self.score = self.score + score_table[cleared_lines] * 100 * self:getScoreMultiplier() * bravo
self.level_lines = self.level_lines + cleared_lines self.level_lines = self.level_lines + cleared_lines
self.lines = self.lines + cleared_lines self.lines = self.lines + cleared_lines
self.line_clears = self.line_clears + 1
if (cleared_lines == 4) then self.tetrises = self.tetrises + 1
if (cleared_lines == 0 and self.level_timer >= self:getLevelTimerLimit()) or (self.level_lines >= 4) then if (cleared_lines == 0 and self.level_timer >= self:getLevelTimerLimit()) or (self.level_lines >= 4) then
self.level = self.level + 1 self.level = self.level + 1
self.level_lines = 0 self.level_lines = 0
@ -118,6 +122,7 @@ function MarathonC88Game:drawScoringInfo()
love.graphics.print( love.graphics.print(
self.das.direction .. " " .. self.das.direction .. " " ..
self.das.frames .. " " .. self.das.frames .. " " ..
math.floor(self.tetrises / self.line_clears) .. "% " ..
strTrueValues(self.prev_inputs) strTrueValues(self.prev_inputs)
) )
love.graphics.printf("NEXT", 64, 40, 40, "left") love.graphics.printf("NEXT", 64, 40, 40, "left")
@ -126,7 +131,9 @@ function MarathonC88Game:drawScoringInfo()
love.graphics.printf("LEVEL", 240, 280, 40, "left") love.graphics.printf("LEVEL", 240, 280, 40, "left")
love.graphics.setFont(font_3x5_3) love.graphics.setFont(font_3x5_3)
if self.score >= 999999 then love.graphics.setColor(1, 1, 0, 1) end
love.graphics.printf(self.score, 240, 140, 90, "left") love.graphics.printf(self.score, 240, 140, 90, "left")
love.graphics.setColor(1, 1, 1, 1)
love.graphics.printf(self.lines, 240, 220, 90, "left") love.graphics.printf(self.lines, 240, 220, 90, "left")
love.graphics.printf(self.level, 240, 300, 90, "left") love.graphics.printf(self.level, 240, 300, 90, "left")