Borders and better spacing and game mode for info_area.

[naja.git] / naja / gameboard.py

diff --git a/naja/gameboard.py b/naja/gameboard.py
index da7dbd2c8b2a5614a90888c73dc5535ae721bade..944f21fadac1ba732de90e4b797b1c5fadab8860 100644 (file)
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -184,11 +184,10 @@ class GameBoard(object):
         if ROTATION[direction] == ROTATION.CLOCKWISE:
             new_positions = locations_to_rotate[1:] + [locations_to_rotate[0]]
         elif ROTATION[direction] == ROTATION.ANTICLOCKWISE:
-            new_positions = (
-                [locations_to_rotate[-1]] + locations_to_rotate[:-1])
+            new_positions = ([locations_to_rotate[-1]] + locations_to_rotate[:-1])
 
         for old, new in zip(locations_to_rotate, new_positions):
-            rotated_locations[old] = self.board_locations[new]
+            rotated_locations[new] = self.board_locations[old]
 
         self.board_locations.update(rotated_locations)
 
@@ -222,7 +221,8 @@ class LocationCard(object):
     A particular set of options available on a location.
     """
 
-    def __init__(self, bitwise_operand, location_actions):
+    def __init__(self, card_name, bitwise_operand, location_actions):
+        self.card_name = card_name
         self.bitwise_operand = bitwise_operand
         self.actions = location_actions
         self.check_actions()
@@ -231,7 +231,8 @@ class LocationCard(object):
     def import_location(cls, state):
         location_actions = [
             cls.build_action(definition) for definition in state['actions']]
-        return cls(state['bitwise_operand'], location_actions)
+        return cls(state['card_name'], state['bitwise_operand'],
+                   location_actions)
 
     @classmethod
     def build_action(cls, definition):
@@ -246,9 +247,11 @@ class LocationCard(object):
             bits = cls.parse_bits(definition['bits'])
         else:
             bits = cls.generate_bitwise_operand()
+        card_name = definition['card_name']
         return cls.import_location({
             'bitwise_operand': bits,
             'actions': definition['actions'],
+            'card_name': card_name,
         })
 
     @classmethod
@@ -260,6 +263,7 @@ class LocationCard(object):
         return {
             'bitwise_operand': sorted(self.bitwise_operand),
             'actions': [action.export() for action in self.actions],
+            'card_name': self.card_name,
         }
 
     def check_actions(self):