All puzzles to have cards without default actions.

[naja.git] / naja / gameboard.py

diff --git a/naja/gameboard.py b/naja/gameboard.py
index fcad070a8f9f2be711a607fc5661b61d76148c55..d70a49890f99fc4a183aed48813ca6b7d53b8378 100644 (file)
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -30,27 +30,56 @@ class GameBoard(object):
         self.replacement_params = state.get('replacement_params', None)
 
     @classmethod
-    def new_game(cls, deck,
-                 initial_bits=PLAYER_DEFAULTS.INITIAL_BITS,
-                 initial_pos=PLAYER_DEFAULTS.INITIAL_POS,
-                 max_health=PLAYER_DEFAULTS.MAX_HEALTH,
-                 wins_required=PLAYER_DEFAULTS.WINS_REQUIRED):
+    def new_game(cls, deck, initial_bits=None, initial_pos=None,
+                 max_health=None, wins_required=None):
+
+        defaults = {
+            'initial_bits': PLAYER_DEFAULTS.INITIAL_BITS,
+            'initial_pos': PLAYER_DEFAULTS.INITIAL_POS,
+            'max_health': PLAYER_DEFAULTS.MAX_HEALTH,
+            'wins_required': PLAYER_DEFAULTS.WINS_REQUIRED,
+        }
+
+        puzzle = deck.get('puzzle', False)
+
+        if puzzle:
+            puzzle_defaults = deck.get('defaults', {})
+            for k, v in puzzle_defaults.iteritems():
+                if isinstance(v, list):
+                    puzzle_defaults[k] = [int(x) for x in v]
+                else:
+                    puzzle_defaults[k] = int(v)
+            defaults.update(puzzle_defaults)
+
+        if initial_bits is None:
+            initial_bits = defaults['initial_bits']
+        if initial_pos is None:
+            initial_pos = defaults['initial_pos']
+        if max_health is None:
+            max_health = defaults['max_health']
+        if wins_required is None:
+            wins_required = defaults['wins_required']
+
+        # Overriden by command line
         if options.initial_bits:
             initial_bits = options.initial_bits
+
         state = {
             'max_health': max_health,
             'health': max_health,
             'wins_required': wins_required,
             'wins': 0,
             'locations': deck['cards'],
-            'puzzle': deck.get('puzzle', False),
+            'puzzle': puzzle,
             'clock_count': 0,
             'replacement_params': deck.get('replacement_params', None),
         }
         player = Player(initial_bits, initial_pos)
         board_locations = cls.import_board_locations(
             cls.generate_board(deck))
-        return cls(state, player, board_locations)
+        board = cls(state, player, board_locations)
+        player.set_gameboard(board)
+        return board
 
     @classmethod
     def import_game(cls, definition):
@@ -74,6 +103,8 @@ class GameBoard(object):
             'clock_count': self.clock_count,
             'replacement_params': self.replacement_params,
         }
+        if options.cheat_enabled:
+            self.has_cheated = True
         if self.has_cheated:
             data['cheater'] = True
         return data
@@ -109,7 +140,7 @@ class GameBoard(object):
         board_locations = [
             [(i % 5, i // 5),
              LocationCard.new_location(
-                 card.copy(), replacement_params).export()]
+                 card.copy(), replacement_params, puzzle=True).export()]
             for i, card in enumerate(deck['cards'])
         ]
         return board_locations
@@ -222,7 +253,8 @@ 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[new] = self.board_locations[old]
@@ -267,12 +299,11 @@ class LocationCard(object):
     """
 
     def __init__(self, card_name, bitwise_operand, location_actions,
-                 replacement_time, max_number=25):
+                 replacement_time=None, max_number=25):
         self.card_name = card_name
         self.bitwise_operand = bitwise_operand
         self.actions = location_actions
         self.max_number = max_number
-        self.check_actions()
         self.replacement_time = replacement_time
 
     @classmethod
@@ -291,7 +322,7 @@ class LocationCard(object):
         return action_class(required_bits, **data)
 
     @classmethod
-    def new_location(cls, definition, replacement_params):
+    def new_location(cls, definition, replacement_params=None, puzzle=False):
         if 'bits' in definition:
             bits = cls.parse_bits(definition['bits'])
         else:
@@ -305,13 +336,16 @@ class LocationCard(object):
 
         max_number = definition.get('max_number', 25)
         card_name = definition['card_name']
-        return cls.import_location({
+        location = cls.import_location({
             'bitwise_operand': bits,
             'actions': definition['actions'],
             'max_number': max_number,
             'card_name': card_name,
             'replacement_time': replacement_time,
         })
+        if not puzzle:
+            location.check_actions()
+        return location
 
     @classmethod
     def parse_bits(self, bit_list):
@@ -372,4 +406,3 @@ class LocationCard(object):
             self.replacement_time -= 1
             if self.replacement_time <= 0:
                 board.replace_card(position)
-