X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftile.py;h=01efdac4ff8a16a5f029864254d72253a760d1eb;hb=42e40dc4e5a5ae8a11934b5f718c9bd4e91f06ce;hp=4823144435f1d8a197cbc7530c36937fbf66c1ab;hpb=372705936bf2ea5bcd6f3ee9beed61ef2a948091;p=naja.git

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 4823144..01efdac 100644
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -2,16 +2,20 @@
 import pygame
 import pygame.locals as pgl
 
-from naja.constants import TILE_SIZE, BITS
+from naja.constants import TILE_SIZE, BITS, LOCK_HEIGHT
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.widgets.base import Widget
 
 
 BIT_MAP = {
-    BITS.CYAN: 'board/tile_cyan.png',
-    BITS.MAGENTA: 'board/tile_magenta.png',
-    BITS.YELLOW: 'board/tile_yellow.png',
+    frozenset([BITS.CYAN]): 'board/tile_cyan.png',
+    frozenset([BITS.MAGENTA]): 'board/tile_magenta.png',
+    frozenset([BITS.YELLOW]): 'board/tile_yellow.png',
+    frozenset([BITS.CYAN, BITS.MAGENTA]): 'board/tile_cyan_magenta.png',
+    frozenset([BITS.CYAN, BITS.YELLOW]): 'board/tile_cyan_yellow.png',
+    frozenset([BITS.MAGENTA, BITS.YELLOW]): 'board/tile_magenta_yellow.png',
+    frozenset([BITS.CYAN, BITS.MAGENTA, BITS.YELLOW]): 'board/tile_cyan_magenta_yellow.png',
     }
 
 
@@ -25,8 +29,7 @@ class TileWidget(Widget):
     def prepare(self):
         # Draw background
         x, y = abs(self.board_pos[0] - 2), abs(self.board_pos[1] - 2)
-        if (x == 1 and y in [0, 1]) or (y == 1 and x in [0, 1]):
-            # Inner ring
+        if (x + y) % 2 == 0:
             bg = resources.get_image('board/tile_2.png',
                                      transforms=(EIGHT_BIT,))
         else:
@@ -36,6 +39,7 @@ class TileWidget(Widget):
         self.surface.blit(bg, (0, 0))
         # Look up the required bits on the board location
         card = self.state.board_locations[self.board_pos]
+        player_pos = self.state.player.position
         bits = []
         for action in card.actions:
             if action.required_bits:
@@ -44,15 +48,23 @@ class TileWidget(Widget):
         self.size = self.surface.get_rect().size
         if bits:
             bits.sort(key=lambda x: len(x))
-            y_offset = TILE_SIZE[1] - 32 * len(bits)
+            y_offset = TILE_SIZE[1] - LOCK_HEIGHT * len(bits)
             for pattern in bits:
-                x_offset = 10
-                for bit in pattern:
-                    img = resources.get_image(BIT_MAP[bit],
-                                              transforms=(EIGHT_BIT,))
-                    self.surface.blit(img, (x_offset, y_offset))
-                    x_offset += 32
-                y_offset += 32
+                if self.board_pos != player_pos:
+                    img_name = BIT_MAP[pattern]
+                    x_offset = 0
+                else:
+                    img_name = BIT_MAP[pattern].replace('.png', '_small.png')
+                    x_offset = 4
+                    if y_offset >= TILE_SIZE[1] // 2:
+                        # FIXME: Hack'ish
+                        # Bump the lock down by some hand-tuned factor
+                        # to not overlap with the robot
+                        y_offset += LOCK_HEIGHT // 2 - 4
+                img = resources.get_image(img_name,
+                                          transforms=(EIGHT_BIT,))
+                self.surface.blit(img, (x_offset, y_offset))
+                y_offset += LOCK_HEIGHT
 
     def draw(self, surface):
         surface.blit(self.surface, self.pos)