Draw effect glyphs above action text.

[naja.git] / naja / widgets / tile.py

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index b199418e7f12a33481fef3cd893e119a4d7311e2..89a4b4c68854afd8a6c18d655629f9ba772c4505 100644 (file)
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -2,8 +2,7 @@
 import pygame
 
 from naja.constants import (
-    TILE_SIZE, BITS, LOCK_HEIGHT, SMALL_LOCK_HEIGHT, EXAMINE, ACTION_GLYPHS,
-    PALETTE)
+    TILE_SIZE, BITS, LOCK_HEIGHT, SMALL_LOCK_HEIGHT, EXAMINE, PALETTE)
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT, blender
 from naja.widgets.base import Widget
@@ -21,20 +20,6 @@ BIT_MAP = {
 }
 
 
-GLYPH_MAP = {
-    ACTION_GLYPHS.CLEAR_BITS: 'glyphs/bits_clear.png',
-    ACTION_GLYPHS.TOGGLE_BITS: 'glyphs/bits_toggle.png',
-    ACTION_GLYPHS.SET_BITS: 'glyphs/bits_set.png',
-    ACTION_GLYPHS.CHANGE_BOARD: 'glyphs/board.png',
-    ACTION_GLYPHS.DAMAGE: 'glyphs/damage.png',
-    ACTION_GLYPHS.HEAL: 'glyphs/health.png',
-    ACTION_GLYPHS.MOVEMENT: 'glyphs/move.png',
-    ACTION_GLYPHS.WINTOKEN: 'glyphs/win.png',
-    ACTION_GLYPHS.MSB: 'glyphs/msb.png',
-    ACTION_GLYPHS.NOTHING: 'glyphs/do_nothing.png',
-}
-
-
 class TileWidget(Widget):
     """Widget which holds a tile on the game board."""
     def __init__(self, pos, state=None, board_pos=None):
@@ -99,13 +84,12 @@ class TileWidget(Widget):
         x_offset = self._prepare_lock(action, y_offset)
         if self.board_pos != self.state.player.position:
             for glyph in action.GLYPHS:
-                img = resources.get_image(
-                    GLYPH_MAP[glyph], transforms=(EIGHT_BIT,))
+                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:
                 img = resources.get_image(
-                    GLYPH_MAP[action.MSB_GLYPH],
+                    action.MSB_GLYPH,
                     transforms=(EIGHT_BIT, blender(PALETTE.LIGHT_VIOLET)))
                 self.surface.blit(img, (x_offset, y_offset + 4))
                 x_offset += img.get_width()