X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgameboard.py;h=edda43c702c146211ec0fca2f016e44c89f5c626;hb=c7bb477b529380f1dae1953d604a22f729160502;hp=f3e6f58567ecd962db71cb9c356c3b34ec32a561;hpb=ee043bf16a47565d7781bd8a357f803a98bd8a4b;p=naja.git

diff --git a/naja/gameboard.py b/naja/gameboard.py
index f3e6f58..edda43c 100644
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -2,7 +2,7 @@ from random import choice
 
 from naja.constants import(
     BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS,
-    MOVE, ACT)
+    ACT, EXAMINE)
 from naja.player import Player
 from naja import actions
 
@@ -20,7 +20,7 @@ class GameBoard(object):
         self.locations = [item.copy() for item in state['locations']]
         self.player = player
         self.board_locations = board_locations
-        self.player_mode = MOVE
+        self.player_mode = EXAMINE
 
     @classmethod
     def new_game(cls, locations_definition,
@@ -104,12 +104,39 @@ class GameBoard(object):
         location = LocationCard.new_location(choice(self.locations).copy())
         self.board_locations[position] = location
 
-    def change_mode(self):
+    def shift_location_row(self, change, is_vertical):
+        px, py = self.player.position
+        shifted_locations = {}
+        mkpos = lambda i: (px, i) if is_vertical else (i, py)
+
+        for i in range(5):
+            if (px, py) == mkpos(i):
+                continue
+            new_i = (i + change) % 5
+            if (px, py) == mkpos(new_i):
+                new_i = (new_i + change) % 5
+            shifted_locations[mkpos(new_i)] = self.board_locations[mkpos(i)]
+
+        print change, is_vertical, shifted_locations
+        self.board_locations.update(shifted_locations)
+
+    def shift_locations(self, direction):
+        if BITS[direction] == BITS.NORTH:
+            self.shift_location_row(-1, is_vertical=True)
+        elif BITS[direction] == BITS.SOUTH:
+            self.shift_location_row(1, is_vertical=True)
+        elif BITS[direction] == BITS.EAST:
+            self.shift_location_row(1, is_vertical=False)
+        elif BITS[direction] == BITS.WEST:
+            self.shift_location_row(-1, is_vertical=False)
+
+    def change_mode(self, new_mode):
         """Advance to the next mode"""
-        if self.player_mode == MOVE:
-            self.player_mode = ACT
-        elif self.player_mode == ACT:
-            self.player_mode = MOVE
+        if new_mode == self.player_mode:
+            raise RuntimeError("Inconsistent state. Setting mode %s to itself"
+                               % self.player_mode)
+        elif new_mode in (ACT, EXAMINE):
+            self.player_mode = new_mode
         else:
             raise RuntimeError("Illegal player mode %s" % self.player_mode)