X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Finfo_area.py;h=f9f2573364ff1e93edf21a0fa8a9b681066eb346;hb=c7bb477b529380f1dae1953d604a22f729160502;hp=866fb86ba2bea38049163c6548766907f7f2cffb;hpb=adc94b74d51f5e20faac9b98257463eb918585fd;p=naja.git

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index 866fb86..f9f2573 100644
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -4,11 +4,12 @@ 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
 from naja.resources.mutators import EIGHT_BIT
+from naja.sound import sound
 
 from naja.widgets.base import Widget
 from naja.widgets.tile import BIT_MAP
@@ -16,19 +17,17 @@ 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",
-        }
+    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.",
+}
+
+HINT_LEGAL_MOVE = "\nPress Return to move to this card."
 
 TITLES = {
-        MOVE: "Move the Robot",
-        ACT: "Choose an Action",
-        EXAMINE: "Select a Card",
-        }
+    ACT: "Choose an Action",
+    EXAMINE: "Select a Card",
+}
 
 
 class InfoAreaWidget(Widget):
@@ -39,10 +38,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 +62,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 +99,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,25 +111,29 @@ 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:
                 player = self.state.player
                 action = self.card.actions[self.chosen]
                 if not action.check_available(player):
+                    sound.play_sound('error.ogg')
                     print "BEEP!"
                 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:
                     self.chosen -= 1
+                    sound.play_sound('change_action.ogg')
                 return finish_event()
             if ev.key in KEYS.DOWN:
                 if self.chosen + 1 < len(self.card.actions):
+                    sound.play_sound('change_action.ogg')
                     self.chosen += 1
                 return finish_event()
         return super(InfoAreaWidget, self).handle_event(ev)