X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fboard.py;h=f9bb80c189cb32baa1bf4f8296707db38c871909;hb=343dbbaa8126ed72ffec8cb4a3ff45050fd5d06a;hp=d4d315af86d2e5a241dd87ac56d6d8fc54da2c1b;hpb=0cef06f581d48315a59a19ac06ca1d2be14cbb4c;p=naja.git

diff --git a/naja/widgets/board.py b/naja/widgets/board.py
index d4d315a..f9bb80c 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, EXAMINE, ACT
+from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, ACT
 from naja.events import finish_event
 
 from naja.widgets.base import Widget
@@ -39,15 +39,27 @@ class BoardWidget(Widget):
         for tile in self._tiles:
             tile.draw(surface)
 
+    def update_card_pos(self, card_pos):
+        self.card_pos = card_pos
+        self.info.set_position(self.card_pos)
+        self.legal = self.card_pos in self.state.player.legal_moves()
+
     def change_pos(self, offset):
         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.card_pos = tpos
-        self.info.set_position(self.card_pos)
-        self.legal = self.card_pos in self.state.player.legal_moves()
+        self.update_card_pos(tpos)
         return True
 
+    def next_viable_pos(self):
+        moves = self.state.player.legal_moves()
+        try:
+            idx = moves.index(self.card_pos)
+            idx = (idx + 1) % len(moves)
+        except ValueError:
+            idx = 0
+        self.update_card_pos(moves[idx])
+
     def handle_event(self, ev):
         if self.state.gameboard.player_mode == ACT:
             return super(BoardWidget, self).handle_event(ev)
@@ -55,18 +67,21 @@ class BoardWidget(Widget):
             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.SELECT and
-                    self.state.player.set_position(self.card_pos)):
-                self.state.gameboard.change_mode(ACT)
-                self.info.set_position(self.card_pos)
+            elif ev.key in KEYS.SWITCH:
+                self.next_viable_pos()
                 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)