Use multi-color images

diff --git a/naja/constants.py b/naja/constants.py
index 45ffa3c0b6a065ea9cad4d30a982e11d1c5d12b5..efed55cd631cb337bdea31109ec6148258c0ff82 100644 (file)
--- a/naja/constants.py
+++ b/naja/constants.py
@@ -47,6 +47,7 @@ PLAYER_DEFAULTS = AttrDict({
 
 # Game size constants
 TILE_SIZE = (96, 96)
+LOCK_HEIGHT = 48
 BOARD_SIZE = (5 * TILE_SIZE[0], 5 * TILE_SIZE[1])
 BIT_SIZE = (5 * TILE_SIZE[0], (SCREEN[1] - 5 * TILE_SIZE[1]) // 2)
 INFO_SIZE = (SCREEN[0] - 5 * TILE_SIZE[0], SCREEN[1])

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 4823144435f1d8a197cbc7530c36937fbf66c1ab..66574b98b1c68490d3e97fec87e98ae72394ea23 100644 (file)
--- 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',
     }
 
 
@@ -44,15 +48,12 @@ 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
+                img = resources.get_image(BIT_MAP[pattern],
+                                          transforms=(EIGHT_BIT,))
+                self.surface.blit(img, (5, y_offset))
+                y_offset += LOCK_HEIGHT
 
     def draw(self, surface):
         surface.blit(self.surface, self.pos)