SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2025-04-19 16:52:56 -05:00
Code Issues Projects Releases Wiki Activity

Fixed a bug in the "actual cleared row count" for Big Mode.

Browse Source
This commit is contained in:
Joe Z 2019-06-21 23:52:33 -04:00
parent 35f4aea67d
commit 901f7f2d12
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/rulesets.md
View File

@ -19,4 +19,4 @@ There are six rulesets currently supported:
* ARS - the rotation system from the original Tetris the Grand Master. * ARS - the rotation system from the original Tetris the Grand Master.
* Ti-ARS - ARS with floorkicks! From TGM3: Terror Instinct. * Ti-ARS - ARS with floorkicks! From TGM3: Terror Instinct.
* Ace-ARS - ARS with floorkicks and move reset! * Ace-ARS - ARS with floorkicks and move reset! From TGM ACE.

4
tetris/modes/gamemode.lua
View File

@ -152,6 +152,10 @@ function GameMode:update(inputs, ruleset)
local cleared_row_count = self.grid:getClearedRowCount() local cleared_row_count = self.grid:getClearedRowCount()
if self.big_mode then
cleared_row_count = cleared_row_count / 2
end
self:onPieceLock(self.piece, cleared_row_count) self:onPieceLock(self.piece, cleared_row_count)
self:updateScore(self.level, self.drop_bonus, cleared_row_count) self:updateScore(self.level, self.drop_bonus, cleared_row_count)

4
tetris/modes/phantom_mania2.lua
View File

@ -156,7 +156,7 @@ function PhantomMania2Game:onLineClear(cleared_row_count)
end end
self:advanceBottomRow(-cleared_row_count) self:advanceBottomRow(-cleared_row_count)
else else
self.roll_points = self.roll_points + cleared_row_points[cleared_row_count / 2] self.roll_points = self.roll_points + cleared_row_points[cleared_row_count]
if self.roll_points >= 100 then if self.roll_points >= 100 then
self.roll_points = self.roll_points - 100 self.roll_points = self.roll_points - 100
self.grade = self.grade + 1 self.grade = self.grade + 1
@ -234,7 +234,7 @@ PhantomMania2Game.garbageOpacityFunction = function(age)
end end
function PhantomMania2Game:drawGrid() function PhantomMania2Game:drawGrid()
if not (self.game_over or (self.clear and self.level < 1300)) then if not (self.game_over) then
self.grid:drawInvisible(self.rollOpacityFunction, self.garbageOpacityFunction) self.grid:drawInvisible(self.rollOpacityFunction, self.garbageOpacityFunction)
else else
self.grid:draw() self.grid:draw()