dispense with movement mode

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

diff --git a/naja/widgets/board.py b/naja/widgets/board.py
index aa608cef8673c8a4df1b19739b471bbf064c4d25..d4d315af86d2e5a241dd87ac56d6d8fc54da2c1b 100644 (file)
--- a/naja/widgets/board.py
+++ b/naja/widgets/board.py
@@ -3,7 +3,7 @@ Widget that holds the game tiles.
 """
 import pygame.locals as pgl
 
-from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, MOVE, ACT
+from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, EXAMINE, ACT
 from naja.events import finish_event
 
 from naja.widgets.base import Widget
@@ -18,8 +18,9 @@ class BoardWidget(Widget):
         super(BoardWidget, self).__init__(pos, BOARD_SIZE)
         self.info = info
         self.state = state
-        self.pos = (2, 2)
+        self.card_pos = (2, 2)
         self._tiles = []
+        self.legal = False
         for y in range(0, 5):
             for x in range(0, 5):
                 tile_pos = (pos[0] + x * TILE_SIZE[0],
@@ -28,26 +29,27 @@ class BoardWidget(Widget):
 
     def prepare(self):
         for tile in self._tiles:
-            tile.set_highlight(self.pos)
+            tile.set_highlight(self.card_pos)
             tile.prepare()
         self.size = BOARD_SIZE
-        if self.state.gameboard.player_mode in (ACT, MOVE):
-            self.pos = self.state.player.position
+        if self.state.gameboard.player_mode == ACT:
+            self.card_pos = self.state.player.position
 
     def draw(self, surface):
         for tile in self._tiles:
             tile.draw(surface)
 
     def change_pos(self, offset):
-        tpos = (offset[0] + self.pos[0], offset[1] + self.pos[1])
+        tpos = (offset[0] + self.card_pos[0], offset[1] + self.card_pos[1])
         if tpos[0] < 0 or tpos[1] < 0 or tpos[0] > 4 or tpos[1] > 4:
             return False
-        self.pos = tpos
-        self.info.set_position(self.pos)
+        self.card_pos = tpos
+        self.info.set_position(self.card_pos)
+        self.legal = self.card_pos in self.state.player.legal_moves()
         return True
 
     def handle_event(self, ev):
-        if self.state.gameboard.player_mode in (ACT, MOVE):
+        if self.state.gameboard.player_mode == ACT:
             return super(BoardWidget, self).handle_event(ev)
         if ev.type == pgl.KEYDOWN:
             if ev.key in KEYS.UP:
@@ -62,8 +64,9 @@ class BoardWidget(Widget):
             if ev.key in KEYS.RIGHT:
                 if self.change_pos((+1, 0)):
                     return finish_event()
-            if ev.key in KEYS.SWITCH:
-                self.state.gameboard.change_mode(MOVE)
-                self.info.set_position(self.state.player.position)
+            if (ev.key in KEYS.SELECT and
+                    self.state.player.set_position(self.card_pos)):
+                self.state.gameboard.change_mode(ACT)
+                self.info.set_position(self.card_pos)
                 return finish_event()
         return super(BoardWidget, self).handle_event(ev)