Proper text for the game mode hint.

[naja.git] / naja / gameboard.py

diff --git a/naja/gameboard.py b/naja/gameboard.py
index e02dd3d51b16fc0d0afebfbc5584856f1db64d2a..944f21fadac1ba732de90e4b797b1c5fadab8860 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):
@@ -22,7 +23,8 @@ class GameBoard(object):
         self.puzzle = state.get('puzzle', False)
         self.player = player
         self.board_locations = board_locations
-        self.player_mode = EXAMINE
+        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,
@@ -63,7 +65,11 @@ class GameBoard(object):
             'puzzle': self.puzzle,
             'player': self.player.export(),
             '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):
@@ -178,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)
 
@@ -204,6 +209,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:
@@ -215,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()
@@ -224,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):
@@ -239,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
@@ -253,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):