From: Neil Date: Tue, 13 May 2014 08:28:24 +0000 (+0200) Subject: Draw tile backgrounds X-Git-Tag: 0.1~349 X-Git-Url: https://git.ctpug.org.za/?p=naja.git;a=commitdiff_plain;h=372705936bf2ea5bcd6f3ee9beed61ef2a948091 Draw tile backgrounds --- diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py index cd0ab3a..4823144 100644 --- a/naja/widgets/tile.py +++ b/naja/widgets/tile.py @@ -9,10 +9,10 @@ from naja.widgets.base import Widget 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): @@ -23,11 +23,17 @@ class TileWidget(Widget): 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) - 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 = []