SashLilac
/
cambridge
mirror of https://github.com/SashLilac/cambridge.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'HEAD' of https://github.com/SashLilac/cambridge.git

pull/3/head
Oshisaure 2020-10-13 20:26:33 +01:00
parent f6ca79ff91 4eb3901610
commit a48d7c67b5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
libs/discord-rpc.dylib → libs/discord-rpc
View File

2
load/rpc.lua
View File

@ -47,7 +47,7 @@ DiscordRPC.presence = {
details = "Loading game...",
state = "",
largeImageKey = "icon2",
largeImageText = "Original game by Joe Zeng",
largeImageText = "Arcade Stacker",
smallImageKey = "",
smallImageText = ""
}

7
tetris/modes/big_a2.lua
View File

@ -136,15 +136,16 @@ function MarathonA2Game:onLineClear(cleared_row_count)
end
function MarathonA2Game:updateScore(level, drop_bonus, cleared_lines)
if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
cleared_lines = cleared_lines / 2
self:updateGrade(cleared_lines)
if cleared_lines > 0 then
self.score = self.score + (
(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
cleared_lines * (cleared_lines * 2 - 1) * (self.combo * 2 - 1)
(math.ceil((level + cleared_lines) / 4) + 2 * drop_bonus) *
cleared_lines * self.combo * self.bravo
)
self.lines = self.lines + cleared_lines
self.combo = self.combo + cleared_lines - 1
self.combo = self.combo + 2 * (cleared_lines - 1)
else
self.drop_bonus = 0
self.combo = 1