Better location shifting.

[naja.git] / naja / gameboard.py

diff --git a/naja/gameboard.py b/naja/gameboard.py
index d62684924a514847634707ff038250de5ed5f33f..edda43c702c146211ec0fca2f016e44c89f5c626 100644 (file)
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -104,48 +104,31 @@ class GameBoard(object):
         location = LocationCard.new_location(choice(self.locations).copy())
         self.board_locations[position] = location
 
-    def shift_locations(self, direction):
+    def shift_location_row(self, change, is_vertical):
         px, py = self.player.position
         shifted_locations = {}
-        # TODO: Make this less horrible. Also test it.
+        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:
-            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)]
+            self.shift_location_row(-1, is_vertical=True)
         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)]
+            self.shift_location_row(1, is_vertical=True)
         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)]
+            self.shift_location_row(1, is_vertical=False)
         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)
+            self.shift_location_row(-1, is_vertical=False)
 
     def change_mode(self, new_mode):
         """Advance to the next mode"""