New change_action sound.

[naja.git] / naja / widgets / tile.py

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 660603603b568b5e2d20b491119fad692f85d122..acbc28df7cf3b7fbf2d95907d4f61f62a01f9efe 100644 (file)
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -1,6 +1,5 @@
 # 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, EXAMINE
 from naja.resources import resources
@@ -9,14 +8,15 @@ 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):
@@ -41,7 +41,7 @@ class TileWidget(Widget):
 
         legal_move = (self.board_pos in self.state.player.legal_moves())
 
-        if self.state.gameboard.player_mode in (MOVE, EXAMINE) and legal_move:
+        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: