X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fconstants.py;h=d93b45cf8a4b652b5d0d27f40eb59ad04752ea17;hb=0cef06f581d48315a59a19ac06ca1d2be14cbb4c;hp=3f45496558320aac8e3084829879cd5800404b52;hpb=2be70af38592f9eab413e3fe5823cc3e6b00e3de;p=naja.git

diff --git a/naja/constants.py b/naja/constants.py
index 3f45496..d93b45c 100644
--- a/naja/constants.py
+++ b/naja/constants.py
@@ -5,9 +5,9 @@ from naja.attrdict import AttrDict
 
 SCREEN = (800, 600)
 FPS = 40
-FONT = '4x6.pcf'
+FONT = '8x13.pcf'
 FONT_SIZE = 16
-EIGHT_BIT_SCALE = 4
+EIGHT_BIT_SCALE = 2
 
 DEFAULTS = dict(
     debug=False,
@@ -26,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,15 +56,17 @@ INFO_SIZE = (SCREEN[0] - 5 * TILE_SIZE[0], SCREEN[1])
 PLAYER_SIZE = (64, 96)
 
 # Player States
-MOVE = 1
-ACT = 2
+ACT = 1
+EXAMINE = 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),
+    'NOMOVE': (pgl.K_SPACE,),
 
     'SELECT': (pgl.K_RETURN, pgl.K_KP_ENTER),
     'QUIT': (pgl.K_ESCAPE, pgl.K_q),
+    'SWITCH': (pgl.K_TAB,),
 })