projects
/
naja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d56cb1e
)
Draw tile backgrounds
author
Neil
<neil@dip.sun.ac.za>
Tue, 13 May 2014 08:28:24 +0000
(10:28 +0200)
committer
Neil
<neil@dip.sun.ac.za>
Tue, 13 May 2014 08:28:33 +0000
(10:28 +0200)
naja/widgets/tile.py
patch
|
blob
|
history
diff --git
a/naja/widgets/tile.py
b/naja/widgets/tile.py
index cd0ab3ab33d3eda36d8bce098e7dd92ebf43b2ab..4823144435f1d8a197cbc7530c36937fbf66c1ab 100644
(file)
--- a/
naja/widgets/tile.py
+++ b/
naja/widgets/tile.py
@@
-9,10
+9,10
@@
from naja.widgets.base import Widget
BIT_MAP = {
BIT_MAP = {
-
BITS.CYAN: 'board/tile_cyan.png',
-
BITS.MAGENTA: 'board/tile_magenta.png',
-
BITS.YELLOW: 'board/tile_yellow.png',
-
}
+ BITS.CYAN: 'board/tile_cyan.png',
+ BITS.MAGENTA: 'board/tile_magenta.png',
+ BITS.YELLOW: 'board/tile_yellow.png',
+ }
class TileWidget(Widget):
class TileWidget(Widget):
@@
-23,11
+23,17
@@
class TileWidget(Widget):
self.board_pos = board_pos
def prepare(self):
self.board_pos = board_pos
def prepare(self):
- # Placeholder logic - just draw the outline of a square
+ # 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
+ bg = resources.get_image('board/tile_2.png',
+ transforms=(EIGHT_BIT,))
+ else:
+ bg = resources.get_image('board/tile_1.png',
+ transforms=(EIGHT_BIT,))
self.surface = pygame.surface.Surface(TILE_SIZE)
self.surface = pygame.surface.Surface(TILE_SIZE)
- pygame.draw.lines(self.surface, pgl.color.THECOLORS['yellow'],
- True, [(1, 1), (1, 95), (95, 95), (95, 1)], 2)
- self.surface.convert_alpha(pygame.display.get_surface())
+ self.surface.blit(bg, (0, 0))
# Look up the required bits on the board location
card = self.state.board_locations[self.board_pos]
bits = []
# Look up the required bits on the board location
card = self.state.board_locations[self.board_pos]
bits = []