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

The New ***ris fixed

pull/4/head
Ishaan Bhardwaj 2021-01-12 13:49:48 -05:00
parent 36c6a7c5a5
commit 984ac866cb
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tetris/rulesets/thenext.lua → tetris/rulesets/thenew.lua
View File

@ -1,35 +1,35 @@
local Piece = require 'tetris.components.piece' local Piece = require 'tetris.components.piece'
local Ruleset = require 'tetris.rulesets.ruleset' local Ruleset = require 'tetris.rulesets.ruleset'
local TheNext = Ruleset:extend() local TheNew = Ruleset:extend()
TheNext.name = "The Nextris" TheNew.name = "The Newtris"
TheNext.hash = "TheNext" TheNew.hash = "TheNew"
TheNext.softdrop_lock = false TheNew.softdrop_lock = false
TheNext.harddrop_lock = false TheNew.harddrop_lock = false
TheNext.colourscheme = { TheNew.colourscheme = {
I = "C", I = "C",
J = "B", J = "B",
L = "M", L = "M",
O = "X", O = "F",
S = "G", S = "G",
Z = "R", Z = "R",
T = "Y" T = "Y"
} }
TheNext.spawn_positions = { TheNew.spawn_positions = {
I = { x=5, y=3 }, I = { x=5, y=4 },
J = { x=4, y=4 }, J = { x=4, y=5 },
L = { x=4, y=4 }, L = { x=4, y=5 },
O = { x=5, y=4 }, O = { x=5, y=5 },
S = { x=4, y=4 }, S = { x=4, y=5 },
T = { x=4, y=4 }, T = { x=4, y=5 },
Z = { x=4, y=4 }, Z = { x=4, y=5 },
} }
TheNext.big_spawn_positions = { TheNew.big_spawn_positions = {
I = { x=3, y=2 }, I = { x=3, y=2 },
J = { x=2, y=3 }, J = { x=2, y=3 },
L = { x=2, y=3 }, L = { x=2, y=3 },
@ -39,7 +39,7 @@ TheNext.big_spawn_positions = {
Z = { x=2, y=3 }, Z = { x=2, y=3 },
} }
TheNext.block_offsets = { TheNew.block_offsets = {
T={ T={
{ {x=0, y=-1}, {x=-1, y=-1}, {x=1, y=-1}, {x=0, y=-2} }, { {x=0, y=-1}, {x=-1, y=-1}, {x=1, y=-1}, {x=0, y=-2} },
{ {x=0, y=-1}, {x=0, y=-2}, {x=0, y=0}, {x=1, y=-1} }, { {x=0, y=-1}, {x=0, y=-2}, {x=0, y=0}, {x=1, y=-1} },
@ -84,18 +84,18 @@ TheNext.block_offsets = {
}, },
} }
TheNext.wallkicks_ccw = {{x=-1, y=0}, {x=0, y=1}, {x=1, y=0}, {x=0, y=-1}} TheNew.wallkicks_ccw = {{x=0, y=1}, {x=-1, y=0}, {x=1, y=0}, {x=0, y=-1}}
TheNext.wallkicks_cw = {{x=1, y=0}, {x=0, y=1}, {x=-1, y=0}, {x=0, y=-1}} TheNew.wallkicks_cw = {{x=0, y=1}, {x=1, y=0}, {x=-1, y=0}, {x=0, y=-1}}
function TheNext:attemptWallkicks(piece, new_piece, rot_dir, grid) function TheNew:attemptWallkicks(piece, new_piece, rot_dir, grid)
local kicks local kicks
if piece.shape == "O" then if piece.shape == "O" then
return return
elseif rot_dir == 1 then elseif rot_dir == 1 then
kicks = TheNext.wallkicks_cw kicks = TheNew.wallkicks_cw
else else
kicks = TheNext.wallkicks_ccw kicks = TheNew.wallkicks_ccw
end end
assert(piece.rotation ~= new_piece.rotation) assert(piece.rotation ~= new_piece.rotation)
@ -112,11 +112,11 @@ function TheNext:attemptWallkicks(piece, new_piece, rot_dir, grid)
end end
function TheNext:onPieceDrop(piece, grid) function TheNew:onPieceDrop(piece, grid)
piece.lock_delay = 0 -- step reset piece.lock_delay = 0 -- step reset
end end
function TheNext:get180RotationValue() function TheNew:get180RotationValue()
if config.gamesettings.world_reverse == 1 then if config.gamesettings.world_reverse == 1 then
return 1 return 1
else else
@ -124,6 +124,6 @@ function TheNext:get180RotationValue()
end end
end end
function TheNext:getDefaultOrientation() return 3 end function TheNew:getDefaultOrientation() return 3 end
return TheNext return TheNew