Renamed Marathon AX4 to Survival AX, among other things.

This commit is contained in:
Joe Zeng
2020-12-03 00:26:36 -05:00
committed by Joe Z
parent 0f3883e18d
commit 79a25c3954
11 changed files with 285 additions and 73 deletions

View File

@@ -5,15 +5,15 @@ local Piece = require 'tetris.components.piece'
local Bag7NoSZOStartRandomizer = require 'tetris.randomizers.bag7noSZOstart'
local MarathonAX4Game = GameMode:extend()
local SurvivalAXGame = GameMode:extend()
MarathonAX4Game.name = "Marathon AX4"
MarathonAX4Game.hash = "MarathonAX4"
MarathonAX4Game.tagline = "Can you clear the time hurdles when the game goes this fast?"
SurvivalAXGame.name = "Survival AX"
SurvivalAXGame.hash = "SurvivalAX"
SurvivalAXGame.tagline = "Can you clear the time hurdles when the game goes this fast?"
function MarathonAX4Game:new()
MarathonAX4Game.super:new()
function SurvivalAXGame:new()
SurvivalAXGame.super:new()
self.roll_frames = 0
self.randomizer = Bag7NoSZOStartRandomizer()
@@ -29,7 +29,7 @@ function MarathonAX4Game:new()
self.next_queue_length = 3
end
function MarathonAX4Game:getARE()
function SurvivalAXGame:getARE()
if self.lines < 10 then return 18
elseif self.lines < 40 then return 14
elseif self.lines < 60 then return 12
@@ -39,24 +39,24 @@ function MarathonAX4Game:getARE()
else return 6 end
end
function MarathonAX4Game:getLineARE()
function SurvivalAXGame:getLineARE()
return self:getARE()
end
function MarathonAX4Game:getDasLimit()
function SurvivalAXGame:getDasLimit()
if self.lines < 20 then return 10
elseif self.lines < 50 then return 9
elseif self.lines < 70 then return 8
else return 7 end
end
function MarathonAX4Game:getLineClearDelay()
function SurvivalAXGame:getLineClearDelay()
if self.lines < 10 then return 14
elseif self.lines < 30 then return 9
else return 5 end
end
function MarathonAX4Game:getLockDelay()
function SurvivalAXGame:getLockDelay()
if self.lines < 10 then return 28
elseif self.lines < 20 then return 24
elseif self.lines < 30 then return 22
@@ -66,15 +66,15 @@ function MarathonAX4Game:getLockDelay()
else return 13 end
end
function MarathonAX4Game:getGravity()
function SurvivalAXGame:getGravity()
return 20
end
function MarathonAX4Game:getSection()
function SurvivalAXGame:getSection()
return math.floor(level / 100) + 1
end
function MarathonAX4Game:advanceOneFrame()
function SurvivalAXGame:advanceOneFrame()
if self.clear then
self.roll_frames = self.roll_frames + 1
if self.roll_frames < 0 then
@@ -93,7 +93,7 @@ function MarathonAX4Game:advanceOneFrame()
return true
end
function MarathonAX4Game:onLineClear(cleared_row_count)
function SurvivalAXGame:onLineClear(cleared_row_count)
if not self.clear then
local new_lines = self.lines + cleared_row_count
self:updateSectionTimes(self.lines, new_lines)
@@ -106,11 +106,11 @@ function MarathonAX4Game:onLineClear(cleared_row_count)
end
end
function MarathonAX4Game:getSectionTime()
function SurvivalAXGame:getSectionTime()
return self.frames - self.section_start_time
end
function MarathonAX4Game:updateSectionTimes(old_lines, new_lines)
function SurvivalAXGame:updateSectionTimes(old_lines, new_lines)
if math.floor(old_lines / 10) < math.floor(new_lines / 10) then
-- record new section
table.insert(self.section_times, self:getSectionTime())
@@ -119,23 +119,23 @@ function MarathonAX4Game:updateSectionTimes(old_lines, new_lines)
end
end
function MarathonAX4Game:onPieceEnter()
function SurvivalAXGame:onPieceEnter()
self.section_clear = false
end
function MarathonAX4Game:drawGrid(ruleset)
function SurvivalAXGame:drawGrid(ruleset)
self.grid:draw()
end
function MarathonAX4Game:getHighscoreData()
function SurvivalAXGame:getHighscoreData()
return {
lines = self.lines,
frames = self.frames,
}
end
function MarathonAX4Game:drawScoringInfo()
MarathonAX4Game.super.drawScoringInfo(self)
function SurvivalAXGame:drawScoringInfo()
SurvivalAXGame.super.drawScoringInfo(self)
love.graphics.setColor(1, 1, 1, 1)
@@ -165,12 +165,12 @@ function MarathonAX4Game:drawScoringInfo()
love.graphics.setColor(1, 1, 1, 1)
end
function MarathonAX4Game:getSectionEndLines()
function SurvivalAXGame:getSectionEndLines()
return math.floor(self.lines / 10 + 1) * 10
end
function MarathonAX4Game:getBackground()
function SurvivalAXGame:getBackground()
return math.floor(self.lines / 10)
end
return MarathonAX4Game
return SurvivalAXGame