X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Finfo_area.py;h=97c3daacc261411052e0e379b865c105c12074cc;hb=4bc519aed28267ba4e336e9cb81948a5d6533c34;hp=34bbec746df01e9756ae092e31d1a9811922b96c;hpb=35a06a04c73ef08e058ffa957feda63a705fa96a;p=naja.git

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index 34bbec7..97c3daa 100644
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -7,7 +7,7 @@ import pygame.locals as pgl
 from naja.constants import (
     INFO_SIZE, ACT, KEYS, EXAMINE, PALETTE,
     ACTION_TEXT_OFFSET, INFO_LEFT_PADDING,
-    INFO_RIGHT_PADDING, BIT_SIZE)
+    INFO_RIGHT_PADDING, BIT_SIZE, BITS)
 from naja.events import finish_event
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT, blender
@@ -17,15 +17,16 @@ from naja.utils import bit_glyphs
 from naja.widgets.base import Widget
 from naja.widgets.tile import BIT_MAP
 from naja.widgets.text import TextBoxWidget, TextWidget
+from naja import constants
 
 
 HINTS = {
-    ACT: ("Choose an action using the Up/Down keys.\n"
-          "Press Return to execute the action."),
-    EXAMINE: "Select a tile to examine using the arrow keys.",
+    ACT: "Choose an action using {NORTH,SOUTH} keys.\n"
+         "Press {RETURN} to execute it.",
+    EXAMINE: "Browse the tiles with {NORTH,SOUTH,EAST,WEST} keys.",
 }
 
-HINT_LEGAL_MOVE = "\nPress Return to move to this tile."
+HINT_LEGAL_MOVE = "\nPress {RETURN} to move to this tile."
 
 TITLES = {
     ACT: "Choose an Action",
@@ -43,6 +44,8 @@ class InfoAreaWidget(Widget):
         self.chosen = None
         self.card_position = state.player.position
         self.set_position(state.player.position)
+        self.flash_count = 0
+        self.flash_light = True
 
     def prepare(self):
         if self.state.gameboard.player_mode == ACT:
@@ -85,8 +88,9 @@ class InfoAreaWidget(Widget):
 
         hint = TextBoxWidget(
             (0, 0), hint_text, padding=4,
-            box_width=box_width,
-            border=2, border_colour=PALETTE.GREY)
+            colour=PALETTE.WHITE, border=2,
+            bg_colour=PALETTE.BLACK, border_colour=PALETTE.BLUE,
+            box_width=box_width)
         hint.prepare()
         y_offset = (INFO_SIZE[1] - hint.surface.get_rect().height
                     - BIT_SIZE[1] - 2)
@@ -130,7 +134,13 @@ class InfoAreaWidget(Widget):
 
         border_colour = None
         if choice == self.chosen:
-            border_colour = PALETTE.GREEN if action_viable else PALETTE.ORANGE
+            if self.flash_light:
+                border_colour = (PALETTE.GREEN if action_viable else
+                                 PALETTE.ORANGE)
+            else:
+                border_colour = (PALETTE.DARK_GREEN if action_viable else
+                                 PALETTE.DARK_RED)
+
         if border_colour:
             bottom = y_offset + text.surface.get_rect().height
             right = text.surface.get_rect().width + x_offset
@@ -138,8 +148,10 @@ class InfoAreaWidget(Widget):
                               [(x_offset, y_offset), (right, y_offset),
                                (right, bottom), (x_offset, bottom)], 4)
 
-        if action.required_bits in BIT_MAP:
-            img_name = BIT_MAP[action.required_bits].replace(
+        required_keys = action.required_bits & frozenset([
+            BITS.RED, BITS.GREEN, BITS.BLUE])
+        if required_keys in BIT_MAP:
+            img_name = BIT_MAP[required_keys].replace(
                 '.png', '_small.png')
             img = resources.get_image(img_name,
                                       transforms=(EIGHT_BIT,))
@@ -148,6 +160,14 @@ class InfoAreaWidget(Widget):
         else:
             glyphs_x_offset = INFO_LEFT_PADDING
 
+        if BITS.MSB in action.required_bits:
+            msb = resources.get_image('board/msb_lock_decoration.png',
+                                      transforms=(EIGHT_BIT,))
+            msb_rect = msb.get_rect()
+            self.surface.blit(
+                msb, (glyphs_x_offset - msb_rect.width - 4, glyphs_y_offset)
+            )
+
         for glyph in action.get_glyphs():
             img = resources.get_image(
                 glyph, transforms=(EIGHT_BIT, blender(PALETTE.GREY)))
@@ -171,6 +191,11 @@ class InfoAreaWidget(Widget):
             self.chosen = None
 
     def draw(self, surface):
+        self.flash_count += 1
+        if self.flash_count >= (constants.FPS // 2):
+            self.flash_light = not self.flash_light
+            self.flash_count = 0
+            self.prepare()
         surface.blit(self.surface, self.pos)
 
     def next_action(self, viable_only=False, step=1):