SashLilac/cambridge-modpack
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge-modpack.git synced 2024-11-22 22:09:02 -06:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: SashLilac:21beb5e3c0c2fa135a29668e4897127828ad5492
Branches Tags
SashLilac:main
..
compare: SashLilac:0e72e403e024646687e9ad1c0e123f1fbafedbca
Branches Tags
SashLilac:main

No commits in common. "21beb5e3c0c2fa135a29668e4897127828ad5492" and "0e72e403e024646687e9ad1c0e123f1fbafedbca" have entirely different histories.
21beb5e3c0 ... 0e72e403e0

2 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

10
tetris/modes/hero.lua
View File

@ -127,19 +127,17 @@ function TheTrueHero:advanceOneFrame(inputs, ruleset)
self.section_frames = 0 self.section_frames = 0
self.attack_number = self.attack_number + 1 self.attack_number = self.attack_number + 1
local prev_attack = self.current_attack local prev_attack = self.current_attack
self.current_attack = -1
local attack_rolls = 0 local attack_rolls = 0
while (( repeat
prev_attack == self.current_attack or
self.current_attack == 5
) and (attack_rolls < 2)) or attack_rolls == 0 do
attack_rolls = attack_rolls + 1 attack_rolls = attack_rolls + 1
if self.attack_number > 20 then if self.attack_number > 20 then
self.current_attack = math.random(#self.attacks) self.current_attack = math.random(#self.attacks)
else else
self.current_attack = math.random(4) self.current_attack = math.random(4)
end end
end until prev_attack ~= self.current_attack and (
self.current_attack ~= 5 or attack_rolls == 2
)
if self.current_attack == 1 then if self.current_attack == 1 then
self.var = math.floor(3 + math.random( self.var = math.floor(3 + math.random(
math.floor(self.attack_number / 4), math.floor(self.attack_number / 4),

1
tetris/rulesets/mizu_rs.lua
View File

@ -140,7 +140,6 @@ function MizuRS:onPieceMove(piece, grid)
end end
function MizuRS:onPieceRotate(piece, grid) function MizuRS:onPieceRotate(piece, grid)
self:checkNewLow(piece)
if piece:isDropBlocked(grid) then if piece:isDropBlocked(grid) then
piece.lock_delay = math.max((piece.lock_delay - piece.ldincrease), 0) piece.lock_delay = math.max((piece.lock_delay - piece.ldincrease), 0)
piece.ldincrease = piece.ldincrease - 1 piece.ldincrease = piece.ldincrease - 1