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

C99 QoL

pull/4/head
Ishaan Bhardwaj 2021-01-30 23:14:14 -05:00
parent 5b0d83b51c
commit 001ec53711
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tetris/modes/marathon_c99.lua
View File

@ -140,6 +140,10 @@ function MarathonC99Game:startLeftDAS()
end end
end end
function MarathonC99Game:onPieceEnter()
self.piece.last_orientation = self.piece.rotation
end
function MarathonC99Game:advanceOneFrame(inputs, ruleset) function MarathonC99Game:advanceOneFrame(inputs, ruleset)
if self.clear then if self.clear then
if self.level == 17 then if self.level == 17 then
@ -153,13 +157,17 @@ function MarathonC99Game:advanceOneFrame(inputs, ruleset)
self.frames = self.frames + 1 self.frames = self.frames + 1
end end
if self.piece ~= nil then if self.piece ~= nil then
if inputs.rotate_right or inputs.rotate_right2 or if not (
(inputs.rotate_180 and ruleset:get180RotationValue() ~= 3) then 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 self.ccw_bonus = 0
end end
if inputs.down then if inputs.down and not self.piece:isDropBlocked(self.grid) then
self.score = self.score + 1 self.score = self.score + 1
end end
self.piece.last_orientation = self.piece.rotation
end end
end end
@ -199,9 +207,9 @@ function MarathonC99Game:onLineClear(cleared_row_count)
slot_popup.slotnum = 4 slot_popup.slotnum = 4
else else
clear_names = {"SINGLE","DOUBLE","TRIPLE","***RIS"} 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 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.text = "3x"..clear_names[cleared_row_count].."\n+"..score_text
slot_popup.time = 150 slot_popup.time = 150
slot_popup.slotnum = cleared_row_count slot_popup.slotnum = cleared_row_count

2
tetris/rulesets/super302.lua
View File

@ -17,7 +17,7 @@ BONKERS.colourscheme = {
function BONKERS:attemptWallkicks(piece, new_piece, rot_dir, grid) function BONKERS:attemptWallkicks(piece, new_piece, rot_dir, grid)
unfilled_block_offsets = {} unfilled_block_offsets = {}
for y = 4, 23 do for y = 4, grid.height - 1 do
for x = 0, 9 do for x = 0, 9 do
if not grid:isOccupied(x, y) then if not grid:isOccupied(x, y) then
table.insert(unfilled_block_offsets, {x=x-100, y=y-100}) table.insert(unfilled_block_offsets, {x=x-100, y=y-100})