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

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 344a924..06a0f78 100644
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -6,7 +6,6 @@ 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 = {
@@ -75,20 +74,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,19 +113,29 @@ 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()