X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fconstants.py;h=6e3973da25b26640ac13b9ffcc14d3403833b476;hb=616e138c8fa95c96280bc367e908178737ca180b;hp=b6fce4e9a7b897b302b932426231f57ca9f4596f;hpb=42e40dc4e5a5ae8a11934b5f718c9bd4e91f06ce;p=naja.git

diff --git a/naja/constants.py b/naja/constants.py
index b6fce4e..6e3973d 100644
--- a/naja/constants.py
+++ b/naja/constants.py
@@ -1,3 +1,5 @@
+import pygame.locals as pgl
+
 from naja.attrdict import AttrDict
 
 
@@ -24,22 +26,22 @@ DEFAULT_MUSIC_VOLUME = 0.3  # music volume
 # Player bits
 BITS = AttrDict({
     # Direction bits
-    'NORTH': 1,
-    'SOUTH': 2,
-    'EAST': 4,
-    'WEST': 8,
+    'NORTH': 0,
+    'SOUTH': 1,
+    'EAST': 2,
+    'WEST': 3,
     # Condition bits
-    'CYAN': 16,
-    'MAGENTA': 32,
-    'YELLOW': 64,
-    'MSB': 128,
+    'CYAN': 4,
+    'MAGENTA': 5,
+    'YELLOW': 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)
 
 # Player defaults
 PLAYER_DEFAULTS = AttrDict({
-    'INITIAL_BITS': BITS.NORTH | BITS.SOUTH | BITS.EAST | BITS.WEST,
+    'INITIAL_BITS': 0x0f,
     'INITIAL_POS': (2, 2),
     'MAX_HEALTH': 4,
     'WINS_REQUIRED': 4,
@@ -56,3 +58,13 @@ PLAYER_SIZE = (64, 96)
 # Player States
 MOVE = 1
 ACT = 2
+
+KEYS = AttrDict({
+    'UP': (pgl.K_UP, pgl.K_w, pgl.K_COMMA),
+    'DOWN': (pgl.K_DOWN, pgl.K_s, pgl.K_o),
+    'LEFT': (pgl.K_LEFT, pgl.K_a),
+    'RIGHT': (pgl.K_RIGHT, pgl.K_d, pgl.K_e),
+
+    'SELECT': (pgl.K_RETURN, pgl.K_KP_ENTER),
+    'QUIT': (pgl.K_ESCAPE, pgl.K_q),
+})