X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftile.py;h=344a924ae27b0dcb99546b6e38d02a77b82aaa92;hb=25495fec3f11a25cdd632a19a352a10cee105d02;hp=3d53f1b89b29c9de256766a9ca37f742d1fbe892;hpb=014367e70a121b18e9b8ceb0f363c0e20087cdc2;p=naja.git

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 3d53f1b..344a924 100644
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -6,6 +6,7 @@ from naja.constants import (
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT, blender
 from naja.widgets.base import Widget
+from naja.widgets.text import TextBoxWidget
 
 
 BIT_MAP = {
@@ -25,17 +26,28 @@ class TileWidget(Widget):
     def __init__(self, pos, state=None, board_pos=None):
         super(TileWidget, self).__init__(pos, TILE_SIZE)
         self.state = state
+        self.current_card = None
         self.board_pos = board_pos
         self.highlighted = False
+        self.animation = TILE_SIZE[0]
 
     def prepare(self):
         # Draw background
         x, y = abs(self.board_pos[0] - 2), abs(self.board_pos[1] - 2)
 
+        if self.state.gameboard.puzzle:
+            tile_1_name = 'board/tile_1.png'
+            tile_2_name = 'board/tile_2_puzzle.png'
+            tile_available_name = 'board/tile_available_puzzle.png'
+        else:
+            tile_1_name = 'board/tile_1.png'
+            tile_2_name = 'board/tile_2.png'
+            tile_available_name = 'board/tile_available.png'
+
         if (x + y) % 2 == 0:
-            bg_name = 'board/tile_2.png'
+            bg_name = tile_2_name
         else:
-            bg_name = 'board/tile_1.png'
+            bg_name = tile_1_name
         bg = resources.get_image(bg_name, transforms=(EIGHT_BIT,))
         overlays = []
 
@@ -43,11 +55,11 @@ class TileWidget(Widget):
 
         if self.state.gameboard.player_mode == EXAMINE and legal_move:
             overlays.append(resources.get_image(
-                'board/tile_available.png', transforms=(EIGHT_BIT,)))
+                tile_available_name, transforms=(EIGHT_BIT,)))
         if self.highlighted:
             overlays.append(resources.get_image(
                 'board/tile_selected.png',
-                transforms=(EIGHT_BIT, blender(PALETTE.PINK))))
+                transforms=(EIGHT_BIT,)))
 
         self.surface = pygame.surface.Surface(TILE_SIZE)
         self.surface.blit(bg, (0, 0))
@@ -55,10 +67,23 @@ class TileWidget(Widget):
             self.surface.blit(overlay, (0, 0))
         # Look up the required bits on the board location
         card = self.state.board_locations[self.board_pos]
+        if card is not self.current_card:
+            self.animation = TILE_SIZE[0]
+            self.current_card = card
+
         y_offset = TILE_SIZE[1] - LOCK_HEIGHT * len(card.actions)
         for action in card.actions:
             y_offset = self._prepare_action(action, y_offset)
 
+        if card.replacement_time is not None:
+            timestr = str(card.replacement_time)
+            if len(timestr) > 1:
+                timestr = '+'
+            countdown_text = TextBoxWidget(
+                (TILE_SIZE[0] - 24, 4), timestr, padding=2,
+                colour=PALETTE.PINK, bg_colour=PALETTE.DARK_RED)
+            countdown_text.render(self.surface)
+
     def _prepare_lock(self, action, y_offset):
         if not action.required_bits:
             return 4
@@ -102,4 +127,12 @@ class TileWidget(Widget):
             self.highlighted = True
 
     def draw(self, surface):
-        surface.blit(self.surface, self.pos)
+        scaled_width = self.surface.get_width() - self.animation
+        scaled_height = self.surface.get_height() - self.animation
+        scaled_position = (self.pos[0] + (self.animation / 2),
+                           self.pos[1] + (self.animation / 2))
+        if self.animation > 0:
+            self.animation = max(0, self.animation - 4)
+        scaled_surface = pygame.transform.scale(
+            self.surface, (scaled_width, scaled_height))
+        surface.blit(scaled_surface, scaled_position)