kristoferssolo/2048
1
0
Fork 0
mirror of https://github.com/kristoferssolo/2048.git synced 2025-10-21 15:20:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(game): move grid_pos to utils.py file

Browse Source
This commit is contained in:
Kristofers Solo 2023-12-29 23:56:47 +02:00
parent ef09979dba
commit d2d5f9485b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/py2048/block.py
View File

@ -8,12 +8,7 @@ from loguru import logger
from .colors import COLORS
from .config import Config
from .utils import Direction
def _grid_pos(pos: int) -> int:
"""Return the position in the grid."""
return pos // Config.BLOCK_SIZE + 1
from .utils import Direction, grid_pos
class Block(pygame.sprite.Sprite):
@ -52,7 +47,7 @@ class Block(pygame.sprite.Sprite):
return
self.rect.topleft = new_x, new_y
logger.debug(f"Moving block({id(self)}): {self.pos()} => ({_grid_pos(new_x)}, {_grid_pos(new_y)})")
logger.debug(f"Moving block({id(self)}): {self.pos()} => ({grid_pos(new_x)}, {grid_pos(new_y)})")
def _calc_new_pos(self, direction: Direction) -> tuple[int, int]:
"""Calculate the new position of the block."""
@ -109,4 +104,4 @@ class Block(pygame.sprite.Sprite):
def pos(self) -> tuple[int, int]:
"""Return the position of the block"""
return _grid_pos(self.rect.x), _grid_pos(self.rect.y)
return grid_pos(self.rect.x), grid_pos(self.rect.y)

7
src/py2048/utils.py
View File

@ -1,5 +1,12 @@
from enum import Enum
from .config import Config
def grid_pos(pos: int) -> int:
"""Return the position in the grid."""
return pos // Config.BLOCK_SIZE + 1
class Direction(Enum):
UP = (0, -1)