From: adrianna <adrianna.pinska@gmail.com>
Date: Thu, 15 May 2014 17:32:37 +0000 (+0200)
Subject: made available tiles an overlay
X-Git-Tag: 0.1~282
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=a34fd5a937419278ffe06a8d56153f6ace014fac;p=naja.git

made available tiles an overlay
---

diff --git a/data/images/board/tile_available.png b/data/images/board/tile_available.png
index 39485ca..01bf949 100644
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 36b73d0..6606036 100644
--- 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 88e66bc..73aa389 100644
Binary files a/sources/images/square.xcf and b/sources/images/square.xcf differ