dispense with movement mode

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

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index 866fb86ba2bea38049163c6548766907f7f2cffb..b5231b2a5ba946030869d2c603c74da97a89deff 100644 (file)
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -4,7 +4,7 @@ Widget for the game board information area.
 import pygame
 import pygame.locals as pgl
 
-from naja.constants import (INFO_SIZE, EIGHT_BIT_SCALE, MOVE, ACT, KEYS,
+from naja.constants import (INFO_SIZE, EIGHT_BIT_SCALE, ACT, KEYS,
                             EXAMINE)
 from naja.events import finish_event
 from naja.resources import resources
@@ -16,16 +16,14 @@ from naja.widgets.text import TextBoxWidget, TextWidget
 
 
 HINTS = {
-        MOVE: "Move using the arrow keys.\nPress SPACE to stay in place\n"
-              "Press TAB to change to Examine mode",
         ACT: "Choose an action using the Up/Down keys.\n"
              "Press Return to execute the action.",
-        EXAMINE: "Select a card to examine using the arrow keys.\n"
-                 "Press TAB to change to Move mode",
+        EXAMINE: "Select a card to examine using the arrow keys."
         }
 
+HINT_LEGAL_MOVE = "\nPress Return to move to this card."
+
 TITLES = {
-        MOVE: "Move the Robot",
         ACT: "Choose an Action",
         EXAMINE: "Select a Card",
         }
@@ -39,10 +37,11 @@ class InfoAreaWidget(Widget):
         super(InfoAreaWidget, self).__init__(pos, INFO_SIZE)
         self.state = state
         self.chosen = None
+        self.card_position = state.player.position
         self.set_position(state.player.position)
 
     def prepare(self):
-        if self.state.gameboard.player_mode in (ACT, MOVE):
+        if self.state.gameboard.player_mode == ACT:
             self.set_position(self.state.player.position)
         self.surface = pygame.surface.Surface(INFO_SIZE)
         self.surface.fill((0, 0, 0))
@@ -62,8 +61,12 @@ class InfoAreaWidget(Widget):
         for choice, action in enumerate(self.card.actions):
             y_offset = self.prepare_action(choice, action, y_offset)
         # We cheat horribly for layout reasons
-        hint = TextBoxWidget((4, 0), HINTS[self.state.gameboard.player_mode],
-                             padding=2,
+        hint_text = HINTS[self.state.gameboard.player_mode]
+        if self.state.gameboard.player_mode == EXAMINE:
+            if self.card_position in self.state.player.legal_moves():
+                hint_text += HINT_LEGAL_MOVE
+
+        hint = TextBoxWidget((4, 0), hint_text, padding=2,
                              box_width=(INFO_SIZE[0] - 4) // EIGHT_BIT_SCALE)
         hint.prepare()
         y_offset = INFO_SIZE[1] - hint.surface.get_rect().height
@@ -95,7 +98,8 @@ class InfoAreaWidget(Widget):
         return y_offset + text.surface.get_rect().height + 16
 
     def set_position(self, position):
-        self.card = self.state.board_locations[position]
+        self.card_position = position
+        self.card = self.state.board_locations[self.card_position]
         if self.state.gameboard.player_mode == ACT:
             if self.chosen is None:
                 self.chosen = 0
@@ -106,7 +110,7 @@ class InfoAreaWidget(Widget):
         surface.blit(self.surface, self.pos)
 
     def handle_event(self, ev):
-        if self.state.gameboard.player_mode in (MOVE, EXAMINE):
+        if self.state.gameboard.player_mode == EXAMINE:
             return super(InfoAreaWidget, self).handle_event(ev)
         if ev.type == pgl.KEYDOWN:
             if ev.key in KEYS.SELECT:
@@ -117,7 +121,8 @@ class InfoAreaWidget(Widget):
                 else:
                     action.perform_action(self.state.gameboard, self.card)
                     self.state.gameboard.replace_card(player.position)
-                    self.state.gameboard.change_mode(MOVE)
+                    self.state.gameboard.change_mode(EXAMINE)
+                    self.set_position(player.position)
                 return finish_event()
             if ev.key in KEYS.UP:
                 if self.chosen > 0: