dispense with movement mode

[naja.git] / naja / gameboard.py

diff --git a/naja/gameboard.py b/naja/gameboard.py
index f3e6f58567ecd962db71cb9c356c3b34ec32a561..d62684924a514847634707ff038250de5ed5f33f 100644 (file)
--- 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,56 @@ class GameBoard(object):
         location = LocationCard.new_location(choice(self.locations).copy())
         self.board_locations[position] = location
 
-    def change_mode(self):
+    def shift_locations(self, direction):
+        px, py = self.player.position
+        shifted_locations = {}
+        # TODO: Make this less horrible. Also test it.
+        if BITS[direction] == BITS.NORTH:
+            for y in range(5):
+                if y == py:
+                    continue
+                new_y = y - 1
+                if new_y == py:
+                    new_y -= 1
+                new_y %= 5
+                shifted_locations[(px, new_y)] = self.board_locations[(px, y)]
+        elif BITS[direction] == BITS.SOUTH:
+            for y in range(5):
+                if y == py:
+                    continue
+                new_y = y + 1
+                if new_y == py:
+                    new_y += 1
+                new_y %= 5
+                shifted_locations[(px, new_y)] = self.board_locations[(px, y)]
+        elif BITS[direction] == BITS.EAST:
+            for x in range(5):
+                if x == px:
+                    continue
+                new_x = x + 1
+                if new_x == px:
+                    new_x += 1
+                new_x %= 5
+                shifted_locations[(new_x, py)] = self.board_locations[(x, py)]
+        elif BITS[direction] == BITS.WEST:
+            for x in range(5):
+                if x == px:
+                    continue
+                new_x = x - 1
+                if new_x == px:
+                    new_x -= 1
+                new_x %= 5
+                shifted_locations[(new_x, py)] = self.board_locations[(x, py)]
+
+        self.board_locations.update(shifted_locations)
+
+    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)