X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftile.py;h=acbc28df7cf3b7fbf2d95907d4f61f62a01f9efe;hb=3386f35f0e475197e227184cd55bc27ca305dbfb;hp=8b71d1fd016f0dca93d54aed89470209cc23ccd5;hpb=1fd94d28fdfa2331a025ce3b0d0f6fecb5af3324;p=naja.git

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 8b71d1f..acbc28d 100644
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -1,22 +1,22 @@
 # These will probably need to go away when we have images
 import pygame
-import pygame.locals as pgl
 
-from naja.constants import TILE_SIZE, BITS, LOCK_HEIGHT, MOVE, EXAMINE
+from naja.constants import TILE_SIZE, BITS, LOCK_HEIGHT, EXAMINE
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.widgets.base import Widget
 
 
 BIT_MAP = {
-    frozenset([BITS.CYAN]): 'board/tile_cyan.png',
-    frozenset([BITS.MAGENTA]): 'board/tile_magenta.png',
-    frozenset([BITS.YELLOW]): 'board/tile_yellow.png',
-    frozenset([BITS.CYAN, BITS.MAGENTA]): 'board/tile_cyan_magenta.png',
-    frozenset([BITS.CYAN, BITS.YELLOW]): 'board/tile_cyan_yellow.png',
-    frozenset([BITS.MAGENTA, BITS.YELLOW]): 'board/tile_magenta_yellow.png',
-    frozenset([BITS.CYAN, BITS.MAGENTA, BITS.YELLOW]): 'board/tile_cyan_magenta_yellow.png',
-    }
+    frozenset([BITS.RED]): 'board/tile_red.png',
+    frozenset([BITS.GREEN]): 'board/tile_green.png',
+    frozenset([BITS.BLUE]): 'board/tile_blue.png',
+    frozenset([BITS.RED, BITS.GREEN]): 'board/tile_red_green.png',
+    frozenset([BITS.RED, BITS.BLUE]): 'board/tile_red_blue.png',
+    frozenset([BITS.GREEN, BITS.BLUE]): 'board/tile_green_blue.png',
+    frozenset([BITS.RED, BITS.GREEN, BITS.BLUE]):
+        'board/tile_red_green_blue.png',
+}
 
 
 class TileWidget(Widget):
@@ -30,23 +30,27 @@ class TileWidget(Widget):
     def prepare(self):
         # Draw background
         x, y = abs(self.board_pos[0] - 2), abs(self.board_pos[1] - 2)
-        legal_move = (self.board_pos in self.state.player.legal_moves())
-        if self.state.gameboard.player_mode in (MOVE, EXAMINE) and legal_move:
-            bg = resources.get_image('board/tile_available.png',
-                                     transforms=(EIGHT_BIT,))
-        elif (x + y) % 2 == 0:
+
+        if (x + y) % 2 == 0:
             bg = resources.get_image('board/tile_2.png',
                                      transforms=(EIGHT_BIT,))
         else:
             bg = resources.get_image('board/tile_1.png',
                                      transforms=(EIGHT_BIT,))
-        overlay = None
+        overlays = []
+
+        legal_move = (self.board_pos in self.state.player.legal_moves())
+
+        if self.state.gameboard.player_mode == EXAMINE and legal_move:
+            overlays.append(resources.get_image('board/tile_available.png',
+                                     transforms=(EIGHT_BIT,)))
         if self.highlighted:
-            overlay = resources.get_image('board/tile_selected.png',
-                                          transforms=(EIGHT_BIT,))
+            overlays.append(resources.get_image('board/tile_selected.png',
+                                          transforms=(EIGHT_BIT,)))
+
         self.surface = pygame.surface.Surface(TILE_SIZE)
         self.surface.blit(bg, (0, 0))
-        if overlay is not None:
+        for overlay in overlays:
             self.surface.blit(overlay, (0, 0))
         # Look up the required bits on the board location
         card = self.state.board_locations[self.board_pos]