Improve action tests.

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

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index e0923309fcafa35f8de7524ca38c66dffde2e7c4..3e9152a34cf3630f6b49ef214d52e533e9ddee64 100644 (file)
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -5,7 +5,7 @@ import pygame
 import pygame.locals as pgl
 
 from naja.constants import INFO_SIZE, EIGHT_BIT_SCALE, MOVE, ACT, KEYS
-from naja.events import PlayerMoved, finish_event
+from naja.events import finish_event
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 
@@ -36,6 +36,7 @@ class InfoAreaWidget(Widget):
         self.set_position(state.player.position)
 
     def prepare(self):
+        self.set_position(self.state.player.position)
         self.surface = pygame.surface.Surface(INFO_SIZE)
         self.surface.fill((0, 0, 0))
         # Extract actions and such from the card
@@ -44,26 +45,7 @@ class InfoAreaWidget(Widget):
         title.render(self.surface)
         y_offset = title.surface.get_rect().height + 8
         for choice, action in enumerate(self.card.actions):
-            if action.required_bits:
-                img_name = BIT_MAP[action.required_bits].replace(
-                    '.png', '_small.png')
-                img = resources.get_image(img_name,
-                                          transforms=(EIGHT_BIT,))
-                self.surface.blit(img, (0, y_offset))
-                y_offset += 8
-            text = TextBoxWidget(
-                (12, y_offset), action.TEXT,
-                box_width=(INFO_SIZE[0] - 12) // EIGHT_BIT_SCALE,
-                fontsize=28)
-            text.render(self.surface)
-            if choice == self.chosen:
-                colour = (255, 255, 0, 128)
-                bottom = y_offset + text.surface.get_rect().height
-                right = text.surface.get_rect().width + 12
-                pygame.draw.lines(self.surface, colour, True,
-                                  [(12, y_offset), (right, y_offset),
-                                   (right, bottom), (12, bottom)], 4)
-            y_offset += text.surface.get_rect().height + 16
+            y_offset = self.prepare_action(choice, action, y_offset)
         # We cheat horribly for layout reasons
         hint = TextBoxWidget((0, 0), HINTS[self.state.gameboard.player_mode],
                              box_width=INFO_SIZE[0] // EIGHT_BIT_SCALE)
@@ -71,23 +53,47 @@ class InfoAreaWidget(Widget):
         y_offset = INFO_SIZE[1] - hint.surface.get_rect().height
         self.surface.blit(hint.surface, (0, y_offset))
 
+    def prepare_action(self, choice, action, y_offset):
+        if action.required_bits:
+            img_name = BIT_MAP[action.required_bits].replace(
+                '.png', '_small.png')
+            img = resources.get_image(img_name,
+                                      transforms=(EIGHT_BIT,))
+            self.surface.blit(img, (0, y_offset))
+            y_offset += 8
+        text = TextBoxWidget(
+            (12, y_offset), action.TEXT,
+            box_width=(INFO_SIZE[0] - 12) // EIGHT_BIT_SCALE,
+            fontsize=28)
+        text.render(self.surface)
+
+        # self.chosen may be None, in which case we don't draw the border.
+        if choice == self.chosen:
+            colour = (255, 255, 0, 128)
+            bottom = y_offset + text.surface.get_rect().height
+            right = text.surface.get_rect().width + 12
+            pygame.draw.lines(self.surface, colour, True,
+                              [(12, y_offset), (right, y_offset),
+                               (right, bottom), (12, bottom)], 4)
+        return y_offset + text.surface.get_rect().height + 16
+
     def set_position(self, position):
         self.card = self.state.board_locations[position]
-        self.chosen = 0
+        if self.state.gameboard.player_mode == ACT:
+            if self.chosen is None:
+                self.chosen = 0
+        else:
+            self.chosen = None
 
     def draw(self, surface):
         surface.blit(self.surface, self.pos)
 
     def handle_event(self, ev):
-        if PlayerMoved.matches(ev):
-            self.set_position(self.state.player.position)
-            return False
-
         if self.state.gameboard.player_mode == MOVE:
             return super(InfoAreaWidget, self).handle_event(ev)
         if ev.type == pgl.KEYDOWN:
             if ev.key in KEYS.SELECT:
-                player = self.state.gameboard.player
+                player = self.state.player
                 action = self.card.actions[self.chosen]
                 if not action.check_available(player):
                     print "BEEP!"
@@ -95,8 +101,7 @@ class InfoAreaWidget(Widget):
                     action.perform_action(self.state.gameboard, self.card)
                     self.state.gameboard.replace_card(player.position)
                     self.state.gameboard.change_mode()
-                # We haven't moved, but the card may have changed under us.
-                return finish_event(events=[PlayerMoved])
+                return finish_event()
             if ev.key in KEYS.UP:
                 if self.chosen > 0:
                     self.chosen -= 1