Merge branch 'master' of git://ctpug.org.za/naja

[naja.git] / naja / widgets / info_area.py

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index e348048208faf89b74ce209cc3567a8bd7347e43..1ff6bbbd92168e52ec12c4a489cf6f54638f95a7 100644 (file)
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -17,6 +17,7 @@ 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 = {
@@ -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:
@@ -55,6 +58,7 @@ class InfoAreaWidget(Widget):
         pos = lambda: (INFO_LEFT_PADDING, y_offset)
 
         # Bits
+        y_offset += 12
         bits_text = ''.join('1' if bit in self.card.bitwise_operand else '0'
                             for bit in reversed(range(8)))
         if self.card.bitwise_operand:
@@ -67,7 +71,7 @@ class InfoAreaWidget(Widget):
             box_width=box_width)
         card_bits.prepare()
         self.surface.blit(card_bits.surface, pos())
-        y_offset += card_bits.surface.get_rect().height + 4
+        y_offset += card_bits.surface.get_rect().height + 12
 
         # Actions
         for choice, action in enumerate(self.card.actions):
@@ -112,7 +116,7 @@ class InfoAreaWidget(Widget):
 
     def prepare_action(self, choice, action, y_offset, box_width):
         x_offset = INFO_LEFT_PADDING
-        glyphs_x_offset = 0
+        glyphs_x_offset = 2
         glyphs_y_offset = y_offset
         y_offset += ACTION_TEXT_OFFSET
         action_viable = action.check_available(self.state.player)
@@ -127,7 +131,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
@@ -178,6 +188,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):