More hardness descriptions.

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

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index 97c3daacc261411052e0e379b865c105c12074cc..b4c6e2b2a66208b522d638928eddc300f9118399 100644 (file)
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -12,21 +12,21 @@ from naja.events import finish_event
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT, blender
 from naja.sound import sound
-from naja.utils import bit_glyphs
+from naja.utils import bit_glyphs, Flashlight
 
 from naja.widgets.base import Widget
 from naja.widgets.tile import BIT_MAP
-from naja.widgets.text import TextBoxWidget, TextWidget
+from naja.widgets.text import TextBoxWidget
 from naja import constants
 
 
 HINTS = {
-    ACT: "Choose an action using {NORTH,SOUTH} keys.\n"
-         "Press {RETURN} to execute it.",
+    ACT: "Choose an action using {NORTH,SOUTH}."
+         " 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."
 
 TITLES = {
     ACT: "Choose an Action",
@@ -44,8 +44,7 @@ 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
+        self.flash_light = Flashlight(constants.FPS // 2)
 
     def prepare(self):
         if self.state.gameboard.player_mode == ACT:
@@ -57,24 +56,21 @@ class InfoAreaWidget(Widget):
         y_offset = 0
         pos = lambda: (INFO_LEFT_PADDING, y_offset)
 
-        # Top title
-        title = TextWidget(
-            pos(), TITLES[self.state.gameboard.player_mode],
-            colour=PALETTE.WHITE)
-        title.render(self.surface)
-        y_offset += title.surface.get_rect().height - 4
-
         # 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:
             bits_text = '%s %s' % (
                 bits_text, bit_glyphs(self.card.bitwise_operand))
         card_bits = TextBoxWidget(
-            pos(), bits_text, box_width=box_width,
-            colour=PALETTE.LIGHT_TURQUOISE, bg_colour=PALETTE.BLACK)
-        card_bits.render(self.surface)
-        y_offset += card_bits.surface.get_rect().height + 4
+            (0, 0), bits_text, padding=4, centre=True,
+            colour=PALETTE.WHITE, border=2,
+            bg_colour=PALETTE.BLACK, border_colour=PALETTE.BLUE,
+            box_width=box_width)
+        card_bits.prepare()
+        self.surface.blit(card_bits.surface, pos())
+        y_offset += card_bits.surface.get_rect().height + 12
 
         # Actions
         for choice, action in enumerate(self.card.actions):
@@ -112,14 +108,14 @@ class InfoAreaWidget(Widget):
         if gameboard.puzzle:
             return "PUZZLE"
         return {
-            0: "DEATH", 1: "LUDICROUS",
-            2: "RAMBO", 3: "HARD",
+            0: "DEATH", 1: "NINTENDO HARD",
+            2: "VERY HARD", 3: "HARD",
             4: "STANDARD", 5: "EASY",
         }.get(gameboard.max_health, "UNKNOWN")
 
     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)
@@ -134,7 +130,7 @@ class InfoAreaWidget(Widget):
 
         border_colour = None
         if choice == self.chosen:
-            if self.flash_light:
+            if self.flash_light.on:
                 border_colour = (PALETTE.GREEN if action_viable else
                                  PALETTE.ORANGE)
             else:
@@ -191,10 +187,7 @@ 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
+        if self.flash_light.tick():
             self.prepare()
         surface.blit(self.surface, self.pos)