From 001ec537113269d6a56b02260e018a6377c40f5d Mon Sep 17 00:00:00 2001
From: Ishaan Bhardwaj <sashlilac109@gmail.com>
Date: Sat, 30 Jan 2021 23:14:14 -0500
Subject: [PATCH] C99 QoL

---
 tetris/modes/marathon_c99.lua | 18 +++++++++++++-----
 tetris/rulesets/super302.lua  |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tetris/modes/marathon_c99.lua b/tetris/modes/marathon_c99.lua
index b221fee..b6b16d6 100644
--- a/tetris/modes/marathon_c99.lua
+++ b/tetris/modes/marathon_c99.lua
@@ -140,6 +140,10 @@ function MarathonC99Game:startLeftDAS()
 	end
 end
 
+function MarathonC99Game:onPieceEnter()
+    self.piece.last_orientation = self.piece.rotation
+end
+
 function MarathonC99Game:advanceOneFrame(inputs, ruleset)
     if self.clear then
         if self.level == 17 then
@@ -153,13 +157,17 @@ function MarathonC99Game:advanceOneFrame(inputs, ruleset)
         self.frames = self.frames + 1
     end
     if self.piece ~= nil then
-        if inputs.rotate_right or inputs.rotate_right2 or
-        (inputs.rotate_180 and ruleset:get180RotationValue() ~= 3) then
+        if not (
+            self.piece.rotation - self.piece.last_orientation == -1 or -- 3 >> 2, 2 >> 1, 1 >> 0
+            self.piece.rotation - self.piece.last_orientation == 3 or -- 0 >> 3
+            self.piece.rotation - self.piece.last_orientation == 0 -- not rotated
+        ) then
             self.ccw_bonus = 0
         end
-        if inputs.down then
+        if inputs.down and not self.piece:isDropBlocked(self.grid) then
             self.score = self.score + 1
         end
+        self.piece.last_orientation = self.piece.rotation
     end
 end
 
@@ -199,9 +207,9 @@ function MarathonC99Game:onLineClear(cleared_row_count)
 				slot_popup.slotnum = 4
             else
 				clear_names = {"SINGLE","DOUBLE","TRIPLE","***RIS"}
-				local score_text = tostring(slots_table[cleared_row_count] * self:getSlotMultiplier())
+				local score_text = tostring(math.min(999999, slots_table[cleared_row_count] * self:getSlotMultiplier()))
 				while #score_text < 6 do score_text = "0"..score_text end
-                self.score = self.score + slots_table[cleared_row_count] * self:getSlotMultiplier()
+                self.score = self.score + math.min(999999, slots_table[cleared_row_count] * self:getSlotMultiplier())
 				slot_popup.text = "3x"..clear_names[cleared_row_count].."\n+"..score_text
 				slot_popup.time = 150
 				slot_popup.slotnum = cleared_row_count
diff --git a/tetris/rulesets/super302.lua b/tetris/rulesets/super302.lua
index 73d1dd1..e18dd7e 100644
--- a/tetris/rulesets/super302.lua
+++ b/tetris/rulesets/super302.lua
@@ -17,7 +17,7 @@ BONKERS.colourscheme = {
 
 function BONKERS:attemptWallkicks(piece, new_piece, rot_dir, grid)
 	unfilled_block_offsets = {}
-	for y = 4, 23 do
+	for y = 4, grid.height - 1 do
 		for x = 0, 9 do
 			if not grid:isOccupied(x, y) then
 				table.insert(unfilled_block_offsets, {x=x-100, y=y-100})