X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fconstants.py;h=96824f4042dc530aa9da433c70fa64c7023bfc54;hb=ae81bf6bf108dfce2ece923587aa4004149feed0;hp=6e3973da25b26640ac13b9ffcc14d3403833b476;hpb=40a95ca09c7a7ca0b4cca019e0ca8eb7670054bc;p=naja.git

diff --git a/naja/constants.py b/naja/constants.py
index 6e3973d..96824f4 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,
@@ -31,9 +31,9 @@ BITS = AttrDict({
     'EAST': 2,
     'WEST': 3,
     # Condition bits
-    'CYAN': 4,
-    'MAGENTA': 5,
-    'YELLOW': 6,
+    'BLUE': 4,
+    'GREEN': 5,
+    'RED': 6,
     'MSB': 7,
 })
 DIRECTION_BITS = AttrDict((k, v) for k, v in BITS.items() if v < 4)
@@ -56,15 +56,37 @@ 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,),
+})
+
+# PALETTE
+
+PALETTE = AttrDict({
+    'BLACK': (0, 0, 0),
+    'DARK_RED': (108, 41, 64),
+    'DARK_VIOLET': (64, 53, 120),
+    'MAGENTA': (217, 60, 240),
+    'DARK_GREEN': (19, 87, 64),
+    'GREY': (128, 128, 128),
+    'BLUE': (38, 151, 240),
+    'LIGHT_VIOLET': (191, 180, 248),
+    'DARK_OLIVE': (64, 75, 7),
+    'ORANGE': (217, 104, 15),
+    'PINK': (236, 168, 191),
+    'GREEN': (38, 195, 15),
+    'LIGHT_OLIVE': (191, 202, 135),
+    'LIGHT_TURQUOISE': (147, 214, 191),
+    'WHITE': (255, 255, 255),
 })