Fix test.

[naja.git] / naja / constants.py

diff --git a/naja/constants.py b/naja/constants.py
index f81cb8f725a935c2fabb40784f80c9880d66eae2..1ce931a871bdcfbc9dad55d38595607c24070746 100644 (file)
--- a/naja/constants.py
+++ b/naja/constants.py
@@ -24,20 +24,21 @@ DEFAULT_SOUND_VOLUME = 1.0  # sound volume
 DEFAULT_MUSIC_VOLUME = 0.3  # music volume
 
 # Player bits
-BITS = AttrDict({
-    # Direction bits
+DIRECTION_BITS = AttrDict({
     'NORTH': 0,
     'SOUTH': 1,
     'EAST': 2,
     'WEST': 3,
-    # Condition bits
+})
+CONDITION_BITS = AttrDict({
     'BLUE': 4,
     'GREEN': 5,
     'RED': 6,
     'MSB': 7,
 })
-DIRECTION_BITS = AttrDict((k, v) for k, v in BITS.items() if v < 4)
-CONDITION_BITS = AttrDict((k, v) for k, v in BITS.items() if v >= 4)
+BITS = AttrDict()
+BITS.update(DIRECTION_BITS)
+BITS.update(CONDITION_BITS)
 
 # PLAYER MOVES
 MOVES = AttrDict({
@@ -60,7 +61,8 @@ PLAYER_DEFAULTS = AttrDict({
 
 # Game size constants
 TILE_SIZE = (96, 96)
-LOCK_HEIGHT = 48
+LOCK_HEIGHT = 32
+SMALL_LOCK_HEIGHT = 24
 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])
@@ -101,3 +103,16 @@ PALETTE = AttrDict({
     'LIGHT_TURQUOISE': (147, 214, 191),
     'WHITE': (255, 255, 255),
 })
+
+ACTION_GLYPHS = AttrDict({
+    'CLEAR_BITS': 0,
+    'TOGGLE_BITS': 1,
+    'SET_BITS': 2,
+    'CHANGE_BOARD': 3,
+    'DAMAGE': 4,
+    'HEAL': 5,
+    'MOVEMENT': 6,
+    'WINTOKEN': 7,
+    'MSB': 8,
+    'NOTHING': 9,
+})