The Great Renaming of locks and keys.
authorJeremy Thurgood <firxen@gmail.com>
Thu, 15 May 2014 19:07:18 +0000 (21:07 +0200)
committerJeremy Thurgood <firxen@gmail.com>
Thu, 15 May 2014 19:07:33 +0000 (21:07 +0200)
54 files changed:
data/images/bits/blue_off.png [new file with mode: 0644]
data/images/bits/blue_on.png [new file with mode: 0644]
data/images/bits/cyan_off.png [deleted file]
data/images/bits/cyan_on.png [deleted file]
data/images/bits/green_off.png [new file with mode: 0644]
data/images/bits/green_on.png [new file with mode: 0644]
data/images/bits/magenta_off.png [deleted file]
data/images/bits/magenta_on.png [deleted file]
data/images/bits/red_off.png [new file with mode: 0644]
data/images/bits/red_on.png [new file with mode: 0644]
data/images/bits/yellow_off.png [deleted file]
data/images/bits/yellow_on.png [deleted file]
data/images/board/robot_blue.png [new file with mode: 0644]
data/images/board/robot_cyan.png [deleted file]
data/images/board/robot_green.png [new file with mode: 0644]
data/images/board/robot_magenta.png [deleted file]
data/images/board/robot_red.png [new file with mode: 0644]
data/images/board/robot_yellow.png [deleted file]
data/images/board/tile_blue.png [new file with mode: 0644]
data/images/board/tile_blue_small.png [new file with mode: 0644]
data/images/board/tile_cyan.png [deleted file]
data/images/board/tile_cyan_magenta.png [deleted file]
data/images/board/tile_cyan_magenta_small.png [deleted file]
data/images/board/tile_cyan_magenta_yellow.png [deleted file]
data/images/board/tile_cyan_magenta_yellow_small.png [deleted file]
data/images/board/tile_cyan_small.png [deleted file]
data/images/board/tile_cyan_yellow.png [deleted file]
data/images/board/tile_cyan_yellow_small.png [deleted file]
data/images/board/tile_green.png [new file with mode: 0644]
data/images/board/tile_green_blue.png [new file with mode: 0644]
data/images/board/tile_green_blue_small.png [new file with mode: 0644]
data/images/board/tile_green_small.png [new file with mode: 0644]
data/images/board/tile_magenta.png [deleted file]
data/images/board/tile_magenta_small.png [deleted file]
data/images/board/tile_magenta_yellow.png [deleted file]
data/images/board/tile_magenta_yellow_small.png [deleted file]
data/images/board/tile_red.png [new file with mode: 0644]
data/images/board/tile_red_blue.png [new file with mode: 0644]
data/images/board/tile_red_blue_small.png [new file with mode: 0644]
data/images/board/tile_red_green.png [new file with mode: 0644]
data/images/board/tile_red_green_blue.png [new file with mode: 0644]
data/images/board/tile_red_green_blue_small.png [new file with mode: 0644]
data/images/board/tile_red_green_small.png [new file with mode: 0644]
data/images/board/tile_red_small.png [new file with mode: 0644]
data/images/board/tile_yellow.png [deleted file]
data/images/board/tile_yellow_small.png [deleted file]
data/location_decks/test.yaml
naja/actions.py
naja/constants.py
naja/tests/test_actions.py
naja/tests/test_player.py
naja/widgets/player_bits.py
naja/widgets/robot.py
naja/widgets/tile.py

diff --git a/data/images/bits/blue_off.png b/data/images/bits/blue_off.png
new file mode 100644 (file)
index 0000000..c1a3b48
Binary files /dev/null and b/data/images/bits/blue_off.png differ
diff --git a/data/images/bits/blue_on.png b/data/images/bits/blue_on.png
new file mode 100644 (file)
index 0000000..94c971e
Binary files /dev/null and b/data/images/bits/blue_on.png differ
diff --git a/data/images/bits/cyan_off.png b/data/images/bits/cyan_off.png
deleted file mode 100644 (file)
index 2fc1519..0000000
Binary files a/data/images/bits/cyan_off.png and /dev/null differ
diff --git a/data/images/bits/cyan_on.png b/data/images/bits/cyan_on.png
deleted file mode 100644 (file)
index f349464..0000000
Binary files a/data/images/bits/cyan_on.png and /dev/null differ
diff --git a/data/images/bits/green_off.png b/data/images/bits/green_off.png
new file mode 100644 (file)
index 0000000..2fc1519
Binary files /dev/null and b/data/images/bits/green_off.png differ
diff --git a/data/images/bits/green_on.png b/data/images/bits/green_on.png
new file mode 100644 (file)
index 0000000..f349464
Binary files /dev/null and b/data/images/bits/green_on.png differ
diff --git a/data/images/bits/magenta_off.png b/data/images/bits/magenta_off.png
deleted file mode 100644 (file)
index c1a3b48..0000000
Binary files a/data/images/bits/magenta_off.png and /dev/null differ
diff --git a/data/images/bits/magenta_on.png b/data/images/bits/magenta_on.png
deleted file mode 100644 (file)
index 94c971e..0000000
Binary files a/data/images/bits/magenta_on.png and /dev/null differ
diff --git a/data/images/bits/red_off.png b/data/images/bits/red_off.png
new file mode 100644 (file)
index 0000000..aba374f
Binary files /dev/null and b/data/images/bits/red_off.png differ
diff --git a/data/images/bits/red_on.png b/data/images/bits/red_on.png
new file mode 100644 (file)
index 0000000..ecb139f
Binary files /dev/null and b/data/images/bits/red_on.png differ
diff --git a/data/images/bits/yellow_off.png b/data/images/bits/yellow_off.png
deleted file mode 100644 (file)
index aba374f..0000000
Binary files a/data/images/bits/yellow_off.png and /dev/null differ
diff --git a/data/images/bits/yellow_on.png b/data/images/bits/yellow_on.png
deleted file mode 100644 (file)
index ecb139f..0000000
Binary files a/data/images/bits/yellow_on.png and /dev/null differ
diff --git a/data/images/board/robot_blue.png b/data/images/board/robot_blue.png
new file mode 100644 (file)
index 0000000..0e4275d
Binary files /dev/null and b/data/images/board/robot_blue.png differ
diff --git a/data/images/board/robot_cyan.png b/data/images/board/robot_cyan.png
deleted file mode 100644 (file)
index 1fa1322..0000000
Binary files a/data/images/board/robot_cyan.png and /dev/null differ
diff --git a/data/images/board/robot_green.png b/data/images/board/robot_green.png
new file mode 100644 (file)
index 0000000..1fa1322
Binary files /dev/null and b/data/images/board/robot_green.png differ
diff --git a/data/images/board/robot_magenta.png b/data/images/board/robot_magenta.png
deleted file mode 100644 (file)
index 0e4275d..0000000
Binary files a/data/images/board/robot_magenta.png and /dev/null differ
diff --git a/data/images/board/robot_red.png b/data/images/board/robot_red.png
new file mode 100644 (file)
index 0000000..7cfdefd
Binary files /dev/null and b/data/images/board/robot_red.png differ
diff --git a/data/images/board/robot_yellow.png b/data/images/board/robot_yellow.png
deleted file mode 100644 (file)
index 7cfdefd..0000000
Binary files a/data/images/board/robot_yellow.png and /dev/null differ
diff --git a/data/images/board/tile_blue.png b/data/images/board/tile_blue.png
new file mode 100644 (file)
index 0000000..34554a6
Binary files /dev/null and b/data/images/board/tile_blue.png differ
diff --git a/data/images/board/tile_blue_small.png b/data/images/board/tile_blue_small.png
new file mode 100644 (file)
index 0000000..6ee8d19
Binary files /dev/null and b/data/images/board/tile_blue_small.png differ
diff --git a/data/images/board/tile_cyan.png b/data/images/board/tile_cyan.png
deleted file mode 100644 (file)
index 24b2992..0000000
Binary files a/data/images/board/tile_cyan.png and /dev/null differ
diff --git a/data/images/board/tile_cyan_magenta.png b/data/images/board/tile_cyan_magenta.png
deleted file mode 100644 (file)
index 6b25461..0000000
Binary files a/data/images/board/tile_cyan_magenta.png and /dev/null differ
diff --git a/data/images/board/tile_cyan_magenta_small.png b/data/images/board/tile_cyan_magenta_small.png
deleted file mode 100644 (file)
index fa5bd0b..0000000
Binary files a/data/images/board/tile_cyan_magenta_small.png and /dev/null differ
diff --git a/data/images/board/tile_cyan_magenta_yellow.png b/data/images/board/tile_cyan_magenta_yellow.png
deleted file mode 100644 (file)
index 0f8f214..0000000
Binary files a/data/images/board/tile_cyan_magenta_yellow.png and /dev/null differ
diff --git a/data/images/board/tile_cyan_magenta_yellow_small.png b/data/images/board/tile_cyan_magenta_yellow_small.png
deleted file mode 100644 (file)
index 79e0d25..0000000
Binary files a/data/images/board/tile_cyan_magenta_yellow_small.png and /dev/null differ
diff --git a/data/images/board/tile_cyan_small.png b/data/images/board/tile_cyan_small.png
deleted file mode 100644 (file)
index 0837f08..0000000
Binary files a/data/images/board/tile_cyan_small.png and /dev/null differ
diff --git a/data/images/board/tile_cyan_yellow.png b/data/images/board/tile_cyan_yellow.png
deleted file mode 100644 (file)
index 889e0c8..0000000
Binary files a/data/images/board/tile_cyan_yellow.png and /dev/null differ
diff --git a/data/images/board/tile_cyan_yellow_small.png b/data/images/board/tile_cyan_yellow_small.png
deleted file mode 100644 (file)
index 1b9e7ea..0000000
Binary files a/data/images/board/tile_cyan_yellow_small.png and /dev/null differ
diff --git a/data/images/board/tile_green.png b/data/images/board/tile_green.png
new file mode 100644 (file)
index 0000000..24b2992
Binary files /dev/null and b/data/images/board/tile_green.png differ
diff --git a/data/images/board/tile_green_blue.png b/data/images/board/tile_green_blue.png
new file mode 100644 (file)
index 0000000..6b25461
Binary files /dev/null and b/data/images/board/tile_green_blue.png differ
diff --git a/data/images/board/tile_green_blue_small.png b/data/images/board/tile_green_blue_small.png
new file mode 100644 (file)
index 0000000..fa5bd0b
Binary files /dev/null and b/data/images/board/tile_green_blue_small.png differ
diff --git a/data/images/board/tile_green_small.png b/data/images/board/tile_green_small.png
new file mode 100644 (file)
index 0000000..0837f08
Binary files /dev/null and b/data/images/board/tile_green_small.png differ
diff --git a/data/images/board/tile_magenta.png b/data/images/board/tile_magenta.png
deleted file mode 100644 (file)
index 34554a6..0000000
Binary files a/data/images/board/tile_magenta.png and /dev/null differ
diff --git a/data/images/board/tile_magenta_small.png b/data/images/board/tile_magenta_small.png
deleted file mode 100644 (file)
index 6ee8d19..0000000
Binary files a/data/images/board/tile_magenta_small.png and /dev/null differ
diff --git a/data/images/board/tile_magenta_yellow.png b/data/images/board/tile_magenta_yellow.png
deleted file mode 100644 (file)
index 5f148bf..0000000
Binary files a/data/images/board/tile_magenta_yellow.png and /dev/null differ
diff --git a/data/images/board/tile_magenta_yellow_small.png b/data/images/board/tile_magenta_yellow_small.png
deleted file mode 100644 (file)
index 07ffdee..0000000
Binary files a/data/images/board/tile_magenta_yellow_small.png and /dev/null differ
diff --git a/data/images/board/tile_red.png b/data/images/board/tile_red.png
new file mode 100644 (file)
index 0000000..e4af18a
Binary files /dev/null and b/data/images/board/tile_red.png differ
diff --git a/data/images/board/tile_red_blue.png b/data/images/board/tile_red_blue.png
new file mode 100644 (file)
index 0000000..5f148bf
Binary files /dev/null and b/data/images/board/tile_red_blue.png differ
diff --git a/data/images/board/tile_red_blue_small.png b/data/images/board/tile_red_blue_small.png
new file mode 100644 (file)
index 0000000..07ffdee
Binary files /dev/null and b/data/images/board/tile_red_blue_small.png differ
diff --git a/data/images/board/tile_red_green.png b/data/images/board/tile_red_green.png
new file mode 100644 (file)
index 0000000..889e0c8
Binary files /dev/null and b/data/images/board/tile_red_green.png differ
diff --git a/data/images/board/tile_red_green_blue.png b/data/images/board/tile_red_green_blue.png
new file mode 100644 (file)
index 0000000..0f8f214
Binary files /dev/null and b/data/images/board/tile_red_green_blue.png differ
diff --git a/data/images/board/tile_red_green_blue_small.png b/data/images/board/tile_red_green_blue_small.png
new file mode 100644 (file)
index 0000000..79e0d25
Binary files /dev/null and b/data/images/board/tile_red_green_blue_small.png differ
diff --git a/data/images/board/tile_red_green_small.png b/data/images/board/tile_red_green_small.png
new file mode 100644 (file)
index 0000000..1b9e7ea
Binary files /dev/null and b/data/images/board/tile_red_green_small.png differ
diff --git a/data/images/board/tile_red_small.png b/data/images/board/tile_red_small.png
new file mode 100644 (file)
index 0000000..3c73a55
Binary files /dev/null and b/data/images/board/tile_red_small.png differ
diff --git a/data/images/board/tile_yellow.png b/data/images/board/tile_yellow.png
deleted file mode 100644 (file)
index e4af18a..0000000
Binary files a/data/images/board/tile_yellow.png and /dev/null differ
diff --git a/data/images/board/tile_yellow_small.png b/data/images/board/tile_yellow_small.png
deleted file mode 100644 (file)
index 3c73a55..0000000
Binary files a/data/images/board/tile_yellow_small.png and /dev/null differ
index b577ba34752972c4105a196648bbd76ec35b4878..42a3d0004cd730cdff1dd700a5f945688775e211 100644 (file)
@@ -14,13 +14,13 @@ _standard_actions:
     required_bits: []
   toggle_bits_c: &TOGGLE-BITS-C
     action_class: 'ToggleBits'
-    required_bits: [CYAN]
+    required_bits: [BLUE]
   set_bits_ym: &SET-BITS-YM
     action_class: 'SetBits'
-    required_bits: [YELLOW, MAGENTA]
+    required_bits: [RED, GREEN]
   acquire_win_token: &ACQUIRE-WIN-TOKEN
     action_class: 'AcquireWinToken'
-    required_bits: [CYAN, MAGENTA, YELLOW]
+    required_bits: [RED, GREEN, BLUE]
 
 cards:
   - actions:
@@ -31,7 +31,7 @@ cards:
     - *SET-BITS-YM
   - actions:
     - action_class: 'ToggleBits'
-      required_bits: [YELLOW]
+      required_bits: [RED]
   - actions:
     - *SET-BITS-YM
   - actions:
@@ -42,5 +42,5 @@ cards:
     - *TOGGLE-BITS-C
   - actions:
     - action_class: 'ShiftLocations'
-      required_bits: [CYAN, MAGENTA]
+      required_bits: [GREEN, BLUE]
       data: {'direction': NORTH}
index 343aeb2735f3169476ce13171964e13895668f59..99e16bf9c9de53a5ac8fb26a63e79ed328aed75b 100644 (file)
@@ -85,7 +85,7 @@ class AcquireWinToken(LocationAction):
     def perform_action(self, board, location):
         board.acquire_win_token()
         board.player.bits.clear_bits(set([
-            BITS.CYAN, BITS.MAGENTA, BITS.YELLOW,
+            BITS.RED, BITS.GREEN, BITS.BLUE,
         ]))
 
 
index d93b45cf8a4b652b5d0d27f40eb59ad04752ea17..92162ce1d87fd979eb0081e137ad556f970f4195 100644 (file)
@@ -31,9 +31,9 @@ BITS = AttrDict({
     'EAST': 2,
     'WEST': 3,
     # Condition bits
-    'CYAN': 4,
-    'MAGENTA': 5,
-    'YELLOW': 6,
+    'BLUE': 4,
+    'GREEN': 5,
+    'RED': 6,
     'MSB': 7,
 })
 DIRECTION_BITS = AttrDict((k, v) for k, v in BITS.items() if v < 4)
index 02c07964342df9f4d06ee6c7cca4427d49e62edd..3497ee49c6a47d7971e5e67f3b1ca03ebbf1be42 100644 (file)
@@ -100,11 +100,11 @@ class TestActions(TestCase):
     def test_LoseHealthOrMSBAndSetBits_MSB_clear(self):
         board = self.make_board(player_bits=[])
         state_before = board.export()
-        card = LocationCard(set([BITS.CYAN, BITS.NORTH]), [])
+        card = LocationCard(set([BITS.BLUE, BITS.NORTH]), [])
         actions.LoseHealthOrMSBAndSetBits(set()).perform_action(board, card)
         state_after = board.export()
         self.assertEqual(state_after['health'], state_before['health'] - 1)
-        self.assert_player_bits(board, BITS.CYAN, BITS.NORTH)
+        self.assert_player_bits(board, BITS.BLUE, BITS.NORTH)
         self.assert_state(
             state_before, state_after, exclude=['health'],
             player_exclude=['bits'])
@@ -112,10 +112,10 @@ class TestActions(TestCase):
     def test_LoseHealthOrMSBAndSetBits_MSB_set(self):
         board = self.make_board(player_bits=[BITS.MSB])
         state_before = board.export()
-        card = LocationCard(set([BITS.CYAN, BITS.NORTH]), [])
+        card = LocationCard(set([BITS.BLUE, BITS.NORTH]), [])
         actions.LoseHealthOrMSBAndSetBits(set()).perform_action(board, card)
         state_after = board.export()
-        self.assert_player_bits(board, BITS.CYAN, BITS.NORTH)
+        self.assert_player_bits(board, BITS.BLUE, BITS.NORTH)
         self.assert_state(state_before, state_after, player_exclude=['bits'])
 
     def test_LoseHealthOrMSBAndSetBits_MSB_set_and_on_card(self):
@@ -129,7 +129,7 @@ class TestActions(TestCase):
 
     def test_AcquireWinToken(self):
         board = self.make_board(
-            player_bits=[BITS.CYAN, BITS.MAGENTA, BITS.YELLOW])
+            player_bits=[BITS.RED, BITS.GREEN, BITS.BLUE])
         state_before = board.export()
         actions.AcquireWinToken(set()).perform_action(board, None)
         state_after = board.export()
@@ -143,7 +143,7 @@ class TestActions(TestCase):
         board = self.make_board(player_bits=[BITS.NORTH])
         board.lose_health()
         state_before = board.export()
-        card = LocationCard(set([BITS.CYAN, BITS.NORTH]), [])
+        card = LocationCard(set([BITS.BLUE, BITS.NORTH]), [])
         actions.GainHealthAndClearBitsOrMSB(set()).perform_action(board, card)
         state_after = board.export()
         self.assertEqual(state_after['health'], state_before['health'] + 1)
@@ -156,7 +156,7 @@ class TestActions(TestCase):
         board = self.make_board(player_bits=[BITS.MSB, BITS.NORTH])
         board.lose_health()
         state_before = board.export()
-        card = LocationCard(set([BITS.CYAN, BITS.NORTH]), [])
+        card = LocationCard(set([BITS.BLUE, BITS.NORTH]), [])
         actions.GainHealthAndClearBitsOrMSB(set()).perform_action(board, card)
         state_after = board.export()
         self.assertEqual(state_after['health'], state_before['health'] + 1)
index 31cc8173395b53d7ae9a6147d06938a0e20cb6a9..1d11637b3cf9df8638617b24c23fdf21791a028e 100644 (file)
@@ -54,35 +54,35 @@ class TestPlayerBits(TestCase):
         bits = PlayerBits(0x03)
         self.assertEqual(bits.check_bits([BITS.NORTH]), True)
         self.assertEqual(bits.check_bits([BITS.NORTH, BITS.SOUTH]), True)
-        self.assertEqual(bits.check_bits([BITS.CYAN]), False)
-        self.assertEqual(bits.check_bits([BITS.CYAN, BITS.MSB]), False)
+        self.assertEqual(bits.check_bits([BITS.BLUE]), False)
+        self.assertEqual(bits.check_bits([BITS.BLUE, BITS.MSB]), False)
         self.assertEqual(
-            bits.check_bits([BITS.NORTH, BITS.SOUTH, BITS.CYAN]), False)
+            bits.check_bits([BITS.NORTH, BITS.SOUTH, BITS.BLUE]), False)
 
     def test_set_bits(self):
         bits = PlayerBits(0x03)
         self.assertEqual(bits._bits, 0x03)
-        bits.set_bits([BITS.NORTH, BITS.CYAN])
+        bits.set_bits([BITS.NORTH, BITS.BLUE])
         self.assertEqual(bits._bits, 0x13)
-        bits.set_bits([BITS.NORTH, BITS.CYAN, BITS.MSB])
+        bits.set_bits([BITS.NORTH, BITS.BLUE, BITS.MSB])
         self.assertEqual(bits._bits, 0x93)
 
     def test_clear_bits(self):
         bits = PlayerBits(0x03)
         self.assertEqual(bits._bits, 0x03)
-        bits.clear_bits([BITS.NORTH, BITS.CYAN])
+        bits.clear_bits([BITS.NORTH, BITS.BLUE])
         self.assertEqual(bits._bits, 0x02)
-        bits.clear_bits([BITS.NORTH, BITS.CYAN, BITS.MSB])
+        bits.clear_bits([BITS.NORTH, BITS.BLUE, BITS.MSB])
         self.assertEqual(bits._bits, 0x02)
 
     def test_toggle_bits(self):
         bits = PlayerBits(0x03)
         self.assertEqual(bits._bits, 0x03)
-        bits.toggle_bits([BITS.NORTH, BITS.CYAN])
+        bits.toggle_bits([BITS.NORTH, BITS.BLUE])
         self.assertEqual(bits._bits, 0x12)
-        bits.toggle_bits([BITS.NORTH, BITS.CYAN])
+        bits.toggle_bits([BITS.NORTH, BITS.BLUE])
         self.assertEqual(bits._bits, 0x03)
-        bits.toggle_bits([BITS.NORTH, BITS.CYAN, BITS.MSB])
+        bits.toggle_bits([BITS.NORTH, BITS.BLUE, BITS.MSB])
         self.assertEqual(bits._bits, 0x92)
 
 
index df122c8342a665c1e5533cbf894adfbf97a1a340..6eeef0905ac0f0b0c76a048c0721aea253e7ab4e 100644 (file)
@@ -32,9 +32,9 @@ class PlayerBitsWidget(Widget):
 
         bits = (
             (BITS.MSB, 'msb', ()),
-            (BITS.YELLOW, 'yellow', ()),
-            (BITS.MAGENTA, 'magenta', ()),
-            (BITS.CYAN, 'cyan', ()),
+            (BITS.RED, 'red', ()),
+            (BITS.GREEN, 'green', ()),
+            (BITS.BLUE, 'blue', ()),
             (BITS.WEST, 'arrow', (R90,)),
             (BITS.EAST, 'arrow', (R270,)),
             (BITS.SOUTH, 'arrow', (R180,)),
index 2eeb1d39cd2d663d514989a17a4e6557e9e7a80b..2fa0d11a178b3dca09f2353ee42d0c658b25172a 100644 (file)
@@ -1,18 +1,15 @@
 """Widget to draw the player on the screen"""
 
-import pygame.locals as pgl
-
 from naja.constants import (PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS)
-from naja.events import finish_event
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.widgets.base import Widget
 
 IMG_MAP = {
-        BITS.CYAN: 'board/robot_cyan.png',
-        BITS.YELLOW: 'board/robot_yellow.png',
-        BITS.MAGENTA: 'board/robot_magenta.png',
-        }
+    BITS.RED: 'board/robot_red.png',
+    BITS.GREEN: 'board/robot_green.png',
+    BITS.BLUE: 'board/robot_blue.png',
+}
 
 
 class RobotWidget(Widget):
index 26a94dad607099a8f8cd4305ccaa2908d6284406..acbc28df7cf3b7fbf2d95907d4f61f62a01f9efe 100644 (file)
@@ -1,6 +1,5 @@
 # These will probably need to go away when we have images
 import pygame
-import pygame.locals as pgl
 
 from naja.constants import TILE_SIZE, BITS, LOCK_HEIGHT, EXAMINE
 from naja.resources import resources
@@ -9,14 +8,15 @@ from naja.widgets.base import Widget
 
 
 BIT_MAP = {
-    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',
-    }
+    frozenset([BITS.RED]): 'board/tile_red.png',
+    frozenset([BITS.GREEN]): 'board/tile_green.png',
+    frozenset([BITS.BLUE]): 'board/tile_blue.png',
+    frozenset([BITS.RED, BITS.GREEN]): 'board/tile_red_green.png',
+    frozenset([BITS.RED, BITS.BLUE]): 'board/tile_red_blue.png',
+    frozenset([BITS.GREEN, BITS.BLUE]): 'board/tile_green_blue.png',
+    frozenset([BITS.RED, BITS.GREEN, BITS.BLUE]):
+        'board/tile_red_green_blue.png',
+}
 
 
 class TileWidget(Widget):