From ac7ae91c39027eddf74d6fa188e589a0b2c308ea Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Mon, 12 Oct 2020 22:44:47 -0400 Subject: [PATCH 1/3] Small RPC change --- load/rpc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/load/rpc.lua b/load/rpc.lua index b3de9ea..5dc3de8 100644 --- a/load/rpc.lua +++ b/load/rpc.lua @@ -47,7 +47,7 @@ DiscordRPC.presence = { details = "Loading game...", state = "", largeImageKey = "icon2", - largeImageText = "Original game by Joe Zeng", + largeImageText = "Arcade Stacker", smallImageKey = "", smallImageText = "" } From 3f7fc4b622d44a943a3c2c3eab5f98597116cc56 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Tue, 13 Oct 2020 11:20:46 -0400 Subject: [PATCH 2/3] Rename Mac RPC lib --- libs/{discord-rpc.dylib => discord-rpc} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename libs/{discord-rpc.dylib => discord-rpc} (100%) diff --git a/libs/discord-rpc.dylib b/libs/discord-rpc similarity index 100% rename from libs/discord-rpc.dylib rename to libs/discord-rpc From 4eb3901610b96256a4c6524b502662c190e57ecc Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Tue, 13 Oct 2020 14:16:23 -0400 Subject: [PATCH 3/3] Some big mode fixes --- tetris/modes/big_a2.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tetris/modes/big_a2.lua b/tetris/modes/big_a2.lua index 3d69caf..86c5317 100755 --- a/tetris/modes/big_a2.lua +++ b/tetris/modes/big_a2.lua @@ -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