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

Made Survival A2/A3 torikans stop your game instead of giving an end roll

Browse Source
This commit is contained in:
Oshisaure 2020-10-21 05:24:11 +01:00
parent cdf6b5cf33
commit 78dcfe43c4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tetris/modes/survival_a2.lua
View File

@ -98,6 +98,9 @@ function SurvivalA2Game:onLineClear(cleared_row_count)
local new_level = math.min(self.level + cleared_row_count, 999) local new_level = math.min(self.level + cleared_row_count, 999)
if self.level == 999 or self:hitTorikan(self.level, new_level) then if self.level == 999 or self:hitTorikan(self.level, new_level) then
self.clear = true self.clear = true
if self.level < 999 then
self.game_over = true
end
else else
self.level = new_level self.level = new_level
end end
@ -121,7 +124,8 @@ end
function SurvivalA2Game:getLetterGrade() function SurvivalA2Game:getLetterGrade()
if self.level >= 999 then return "GM" if self.level >= 999 then return "GM"
elseif self.level >= 500 then return "M" elseif self.level > 500 then return "M"
elseif self.level == 500 and not self.clear then return "M"
else return "" end else return "" end
end end

6
tetris/modes/survival_a3.lua
View File

@ -147,13 +147,15 @@ function SurvivalA3Game:onLineClear(cleared_row_count)
local new_level = self.level + cleared_row_levels[cleared_row_count] local new_level = self.level + cleared_row_levels[cleared_row_count]
self:updateSectionTimes(self.level, new_level) self:updateSectionTimes(self.level, new_level)
if new_level >= 1300 or self:hitTorikan(self.level, new_level) then if new_level >= 1300 or self:hitTorikan(self.level, new_level) then
self.clear = true
if new_level >= 1300 then if new_level >= 1300 then
self.level = 1300 self.level = 1300
end
self.clear = true
self.grid:clear() self.grid:clear()
self.big_mode = true self.big_mode = true
self.roll_frames = -150 self.roll_frames = -150
else
self.game_over = true
end
else else
self.level = math.min(new_level, 1300) self.level = math.min(new_level, 1300)
end end