adrien/TETRIS3000
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
adrienmalin
2019-01-01 16:24:41 +01:00
parent c8e8890e30
commit 719aeff907
6 changed files with 414 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Tetrominos/TetroT.gd
View File

@ -14,13 +14,13 @@ func rotate(direction):
return false
func detect_t_spin():
var center = to_global(minoes[0].translation)
var a = not get_parent().is_free_cell(center + T_SLOT[orientation])
var b = not get_parent().is_free_cell(center + T_SLOT[(1+orientation)%4])
var c = not get_parent().is_free_cell(center + T_SLOT[(2+orientation)%4])
var d = not get_parent().is_free_cell(center + T_SLOT[(3+orientation)%4])
if a and b and (c or d):
t_spin = T_SPIN
elif c and d and (a or b):
if t_spin != T_SPIN:
if t_spin != T_SPIN:
var center = to_global(minoes[0].translation)
var a = not grid_map.is_free_cell(center + T_SLOT[orientation])
var b = not grid_map.is_free_cell(center + T_SLOT[(1+orientation)%4])
var c = not grid_map.is_free_cell(center + T_SLOT[(2+orientation)%4])
var d = not grid_map.is_free_cell(center + T_SLOT[(3+orientation)%4])
if a and b and (c or d):
t_spin = T_SPIN
elif c and d and (a or b):
t_spin = MINI_T_SPIN

10
Tetrominos/Tetromino.gd
View File

@ -74,11 +74,14 @@ const SUPER_ROTATION_SYSTEM = [
]
var minoes
var grid_map
var orientation = 0
var t_spin = NO_T_SPIN
func _ready():
randomize()
minoes = [$Mino0, $Mino1, $Mino2, $Mino3]
grid_map = get_parent().get_node("GridMap")
func positions():
var p = []
@ -101,8 +104,7 @@ func apply_positions(positions):
minoes[i].translation = to_local(positions[i])
func move(movement):
var new_positions = get_parent().possible_positions(positions(), movement)
if new_positions:
if grid_map.possible_positions(positions(), movement):
translate(movement)
return true
else:
@ -111,10 +113,8 @@ func move(movement):
func rotate(direction):
var rotated_positions = rotated_positions(direction)
var movements = SUPER_ROTATION_SYSTEM[orientation][direction]
var test_position
for movement in movements:
test_position = get_parent().possible_positions(rotated_positions, movement)
if test_position:
if grid_map.possible_positions(rotated_positions, movement):
orientation -= direction
orientation %= NB_MINOES
apply_positions(rotated_positions)