X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftile.py;h=4823144435f1d8a197cbc7530c36937fbf66c1ab;hb=372705936bf2ea5bcd6f3ee9beed61ef2a948091;hp=a152f765a102de9511e030b84ec4285337ad04d3;hpb=ee32cda1beebfdc07234f393bf39bb948b36a39a;p=naja.git

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index a152f76..4823144 100644
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -4,14 +4,15 @@ import pygame.locals as pgl
 
 from naja.constants import TILE_SIZE, BITS
 from naja.resources import resources
+from naja.resources.mutators import EIGHT_BIT
 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):
@@ -22,13 +23,19 @@ 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.gameboard.board_locations[self.board_pos]
+        card = self.state.board_locations[self.board_pos]
         bits = []
         for action in card.actions:
             if action.required_bits:
@@ -41,10 +48,11 @@ class TileWidget(Widget):
             for pattern in bits:
                 x_offset = 10
                 for bit in pattern:
-                    img = resources.get_image(BIT_MAP[bit])
+                    img = resources.get_image(BIT_MAP[bit],
+                                              transforms=(EIGHT_BIT,))
                     self.surface.blit(img, (x_offset, y_offset))
                     x_offset += 32
                 y_offset += 32
 
     def draw(self, surface):
-        surface.blit(self.surface, self.rect)
+        surface.blit(self.surface, self.pos)