X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fboard.py;h=222da6cea9c1122270a45f1be823baa165e4e949;hb=908c70765d278ba33e377687aa2292135d94d818;hp=aa608cef8673c8a4df1b19739b471bbf064c4d25;hpb=2e101a5b1f6b271358fc2dbb56fc1fe6d0d53f37;p=naja.git

diff --git a/naja/widgets/board.py b/naja/widgets/board.py
index aa608ce..222da6c 100644
--- 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, 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,42 +29,44 @@ 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:
                 if self.change_pos((0, -1)):
                     return finish_event()
-            if ev.key in KEYS.DOWN:
+            elif ev.key in KEYS.DOWN:
                 if self.change_pos((0, +1)):
                     return finish_event()
-            if ev.key in KEYS.LEFT:
+            elif ev.key in KEYS.LEFT:
                 if self.change_pos((-1, 0)):
                     return finish_event()
-            if ev.key in KEYS.RIGHT:
+            elif 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)
-                return finish_event()
+            elif ev.key in KEYS.SELECT:
+                if 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)