made available tiles an overlay

diff --git a/data/images/board/tile_available.png b/data/images/board/tile_available.png
index 39485cab6cc2625c448eb4a349496944279dcac3..01bf9495e8b167bfa671504e12dcdcb4e0b56851 100644 (file)
Binary files a/data/images/board/tile_available.png and b/data/images/board/tile_available.png differ

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 36b73d09ab81248933b51e1ef6142f76c6fc9ee6..660603603b568b5e2d20b491119fad692f85d122 100644 (file)
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -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 == 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 in (MOVE, 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]

diff --git a/sources/images/square.xcf b/sources/images/square.xcf
index 88e66bcaa46ef1c29f677c3cd2708626ac031993..73aa3899dedf5a412adaa998830c6e4e83e0773c 100644 (file)
Binary files a/sources/images/square.xcf and b/sources/images/square.xcf differ