projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tests.
[naja.git]
/
naja
/
widgets
/
tile.py
diff --git
a/naja/widgets/tile.py
b/naja/widgets/tile.py
index d808e1a01ef1dcd5095c6de491bc1834cb6f81d9..01efdac4ff8a16a5f029864254d72253a760d1eb 100644
(file)
--- a/
naja/widgets/tile.py
+++ b/
naja/widgets/tile.py
@@
-29,8
+29,7
@@
class TileWidget(Widget):
def prepare(self):
# Draw background
x, y = abs(self.board_pos[0] - 2), abs(self.board_pos[1] - 2)
def prepare(self):
# Draw background
x, y = abs(self.board_pos[0] - 2), abs(self.board_pos[1] - 2)
- if (x == 1 and y in [0, 1]) or (y == 1 and x in [0, 1]):
- # Inner ring
+ if (x + y) % 2 == 0:
bg = resources.get_image('board/tile_2.png',
transforms=(EIGHT_BIT,))
else:
bg = resources.get_image('board/tile_2.png',
transforms=(EIGHT_BIT,))
else:
@@
-53,11
+52,18
@@
class TileWidget(Widget):
for pattern in bits:
if self.board_pos != player_pos:
img_name = BIT_MAP[pattern]
for pattern in bits:
if self.board_pos != player_pos:
img_name = BIT_MAP[pattern]
+ x_offset = 0
else:
img_name = BIT_MAP[pattern].replace('.png', '_small.png')
else:
img_name = BIT_MAP[pattern].replace('.png', '_small.png')
+ x_offset = 4
+ if y_offset >= TILE_SIZE[1] // 2:
+ # FIXME: Hack'ish
+ # Bump the lock down by some hand-tuned factor
+ # to not overlap with the robot
+ y_offset += LOCK_HEIGHT // 2 - 4
img = resources.get_image(img_name,
transforms=(EIGHT_BIT,))
img = resources.get_image(img_name,
transforms=(EIGHT_BIT,))
- self.surface.blit(img, (
5
, y_offset))
+ self.surface.blit(img, (
x_offset
, y_offset))
y_offset += LOCK_HEIGHT
def draw(self, surface):
y_offset += LOCK_HEIGHT
def draw(self, surface):