Merge branch 'master' into No_movement_mode

[naja.git] / naja / constants.py

diff --git a/naja/constants.py b/naja/constants.py
index 6e3973da25b26640ac13b9ffcc14d3403833b476..d93b45cf8a4b652b5d0d27f40eb59ad04752ea17 100644 (file)
--- 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,
@@ -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,),
 })