Changed the Phantom Mania non-N requirement back to automatic GM at 999.
(Only N should have the 31-tetris rule.)pull/66/head v0.3.2
parent
323c457809
commit
a4b7a41a15
|
@ -1 +1 @@
|
||||||
version = "v0.3.1"
|
version = "v0.3.2"
|
|
@ -28,7 +28,6 @@ function PhantomManiaGame:new()
|
||||||
self.combo = 1
|
self.combo = 1
|
||||||
self.tetrises = 0
|
self.tetrises = 0
|
||||||
self.section_tetrises = {[0] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
|
self.section_tetrises = {[0] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
|
||||||
self.section_req = true
|
|
||||||
self.randomizer = History6RollsRandomizer()
|
self.randomizer = History6RollsRandomizer()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -120,11 +119,6 @@ function PhantomManiaGame:onLineClear(cleared_row_count)
|
||||||
self.level = 999
|
self.level = 999
|
||||||
end
|
end
|
||||||
self.clear = true
|
self.clear = true
|
||||||
for i = 0, 9 do
|
|
||||||
if self.section_tetrises[i] < (i == 9 and 1 or 2) then
|
|
||||||
self.section_req = false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
self.level = new_level
|
self.level = new_level
|
||||||
end
|
end
|
||||||
|
@ -175,6 +169,10 @@ local function getLetterGrade(level, clear)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function PhantomManiaGame:qualifiesForGM()
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
function PhantomManiaGame:drawScoringInfo()
|
function PhantomManiaGame:drawScoringInfo()
|
||||||
PhantomManiaGame.super.drawScoringInfo(self)
|
PhantomManiaGame.super.drawScoringInfo(self)
|
||||||
|
|
||||||
|
@ -195,7 +193,7 @@ function PhantomManiaGame:drawScoringInfo()
|
||||||
if getLetterGrade(self.level, self.clear) ~= "" then
|
if getLetterGrade(self.level, self.clear) ~= "" then
|
||||||
if self.roll_frames > 1982 then love.graphics.setColor(1, 0.5, 0, 1)
|
if self.roll_frames > 1982 then love.graphics.setColor(1, 0.5, 0, 1)
|
||||||
elseif self.level == 999 and self.clear then love.graphics.setColor(0, 1, 0, 1) end
|
elseif self.level == 999 and self.clear then love.graphics.setColor(0, 1, 0, 1) end
|
||||||
if self.level == 999 and self.section_req and self.tetrises >= 31 then
|
if self.level == 999 and self:qualifiesForGM() then
|
||||||
love.graphics.printf("GM", text_x, 140, 90, "left")
|
love.graphics.printf("GM", text_x, 140, 90, "left")
|
||||||
else
|
else
|
||||||
love.graphics.printf(getLetterGrade(self.level, self.clear), text_x, 140, 90, "left")
|
love.graphics.printf(getLetterGrade(self.level, self.clear), text_x, 140, 90, "left")
|
||||||
|
|
|
@ -13,4 +13,14 @@ function PhantomManiaNGame:new()
|
||||||
self.enable_hold = true
|
self.enable_hold = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function PhantomManiaNGame:qualifiesForGM()
|
||||||
|
if self.tetrises < 31 then return false end
|
||||||
|
for i = 0, 9 do
|
||||||
|
if self.section_tetrises[i] < (i == 9 and 1 or 2) then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
return PhantomManiaNGame
|
return PhantomManiaNGame
|
||||||
|
|
Loading…
Reference in New Issue