clockwise and anticlockwise were swapped because I thought west was east

[naja.git] / naja / gameboard.py

diff --git a/naja/gameboard.py b/naja/gameboard.py
index 8a1daa7673b28d34dc1c264f5c5d0c3b3b3d5325..5e12568ded530dc8386a5a90542338f0771746b1 100644 (file)
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -6,6 +6,7 @@ from naja.constants import(
 from naja.options import options
 from naja.player import Player
 from naja import actions
+from naja.sound import sound
 
 
 class GameBoard(object):
@@ -23,6 +24,7 @@ class GameBoard(object):
         self.player = player
         self.board_locations = board_locations
         self.player_mode = state.get('player_mode', EXAMINE)
+        self.has_cheated = state.get('cheater', options.cheat_enabled)
 
     @classmethod
     def new_game(cls, deck,
@@ -54,7 +56,7 @@ class GameBoard(object):
         return cls(state, player, board_locations)
 
     def export(self):
-        return {
+        data = {
             'max_health': self.max_health,
             'health': self.health,
             'wins_required': self.wins_required,
@@ -65,6 +67,9 @@ class GameBoard(object):
             'board_locations': self.export_board_locations(),
             'player_mode': self.player_mode,
         }
+        if self.has_cheated:
+            data['cheater'] = True
+        return data
 
     @classmethod
     def import_locations(cls, locations_definition):
@@ -176,14 +181,17 @@ class GameBoard(object):
         if px > 0:
             locations_to_rotate.append((px - 1, py))
 
+        print "rotating", direction
+
         if ROTATION[direction] == ROTATION.CLOCKWISE:
+            print "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])
+            print "ANTICLOCKWISE"
+            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)
 
@@ -205,6 +213,7 @@ class GameBoard(object):
         from naja.events import SceneChangeEvent
         from naja.scenes.lose import LoseScene
         from naja.scenes.win import WinScene
+        sound.stop()
         if win:
             SceneChangeEvent.post(WinScene)
         else: