X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftile.py;h=6062b1ece89bfdaafbd2b7df1b60c25ba634a2e1;hb=a493894e2df2717c113687acf8f259cf6ee6e436;hp=344a924ae27b0dcb99546b6e38d02a77b82aaa92;hpb=db18631120e34670b9f8be526f5b7d5938e1d7fc;p=naja.git

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 344a924..6062b1e 100644
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -2,11 +2,10 @@
 import pygame
 
 from naja.constants import (
-    TILE_SIZE, BITS, LOCK_HEIGHT, SMALL_LOCK_HEIGHT, EXAMINE, PALETTE)
+    TILE_SIZE, BITS, LOCK_HEIGHT, SMALL_LOCK_HEIGHT, PALETTE)
 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 = {
@@ -29,6 +28,7 @@ class TileWidget(Widget):
         self.current_card = None
         self.board_pos = board_pos
         self.highlighted = False
+        self.bright = False
         self.animation = TILE_SIZE[0]
 
     def prepare(self):
@@ -53,14 +53,16 @@ class TileWidget(Widget):
 
         legal_move = (self.board_pos in self.state.player.legal_moves())
 
-        if self.state.gameboard.player_mode == EXAMINE and legal_move:
+        if legal_move:
             overlays.append(resources.get_image(
                 tile_available_name, transforms=(EIGHT_BIT,)))
         if self.highlighted:
+            if self.bright:
+                select_name = 'board/tile_selected_pulse.png'
+            else:
+                select_name = 'board/tile_selected.png'
             overlays.append(resources.get_image(
-                'board/tile_selected.png',
-                transforms=(EIGHT_BIT,)))
-
+                select_name, transforms=(EIGHT_BIT,)))
         self.surface = pygame.surface.Surface(TILE_SIZE)
         self.surface.blit(bg, (0, 0))
         for overlay in overlays:
@@ -75,20 +77,32 @@ class TileWidget(Widget):
         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)
+        self._prepare_countdown(card)
+
+    def _prepare_countdown(self, card):
+        if card.replacement_time is None:
+            return
+        elif card.replacement_time <= 1:
+            glyph = 'glyphs/countdown_1.png'
+        elif card.replacement_time == 2:
+            glyph = 'glyphs/countdown_2.png'
+        elif card.replacement_time == 3:
+            glyph = 'glyphs/countdown_3.png'
+        elif card.replacement_time < 8:
+            glyph = 'glyphs/countdown_4.png'
+        else:
+            glyph = 'glyphs/countdown_5.png'
+        img = resources.get_image(
+            glyph, transforms=(EIGHT_BIT, blender(PALETTE.DARK_VIOLET)))
+        self.surface.blit(img, (TILE_SIZE[0] - 20, 0))
 
     def _prepare_lock(self, action, y_offset):
-        if not action.required_bits:
+        required_keys = action.required_bits & frozenset([
+            BITS.RED, BITS.GREEN, BITS.BLUE])
+        if required_keys not in BIT_MAP:
             return 4
 
-        img_name = BIT_MAP[action.required_bits]
+        img_name = BIT_MAP[required_keys]
 
         if self.board_pos != self.state.player.position:
             x_offset = 0
@@ -102,28 +116,38 @@ class TileWidget(Widget):
                 y_offset += LOCK_HEIGHT - SMALL_LOCK_HEIGHT - 2
 
         img = resources.get_image(img_name, transforms=(EIGHT_BIT,))
+        img_rect = img.get_rect()
         self.surface.blit(img, (x_offset, y_offset))
-        return x_offset + img.get_width() + 2
+
+        if BITS.MSB in action.required_bits:
+            msb = resources.get_image('board/msb_lock_decoration.png',
+                                      transforms=(EIGHT_BIT,))
+            msb_rect = msb.get_rect()
+            self.surface.blit(
+                msb, (x_offset + img_rect.width - msb_rect.width, y_offset)
+            )
+
+        return x_offset + img_rect.width + 2
 
     def _prepare_action(self, action, y_offset):
         x_offset = self._prepare_lock(action, y_offset)
         if self.board_pos != self.state.player.position:
-            for glyph in action.GLYPHS:
+            for glyph in action.get_glyphs():
                 img = resources.get_image(glyph, transforms=(EIGHT_BIT,))
                 self.surface.blit(img, (x_offset, y_offset + 4))
                 x_offset += img.get_width()
-            if action.MSB_GLYPH is not None:
+            if action.get_msb_glyph() is not None:
                 img = resources.get_image(
-                    action.MSB_GLYPH,
+                    action.get_msb_glyph(),
                     transforms=(EIGHT_BIT, blender(PALETTE.LIGHT_VIOLET)))
                 self.surface.blit(img, (x_offset, y_offset + 4))
                 x_offset += img.get_width()
         return y_offset + LOCK_HEIGHT
 
-    def set_highlight(self, pos):
+    def set_highlight(self, pos, bright=False):
         self.highlighted = False
-        if (self.state.gameboard.player_mode == EXAMINE and
-                self.board_pos == pos):
+        self.bright = bright
+        if self.board_pos == pos:
             self.highlighted = True
 
     def draw(self, surface):