X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgameboard.py;h=689c3fd15fcf324d9110763331a6a0eeb93023d2;hb=21decfd74a4f550f4758d8583620110baee72aed;hp=d50ebde3363962b77708461719497182090fae9c;hpb=b8b0dcd343aab16ff2e75a16cf23c6c51cf36153;p=naja.git

diff --git a/naja/gameboard.py b/naja/gameboard.py
index d50ebde..689c3fd 100644
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -7,6 +7,7 @@ from naja.options import options
 from naja.player import Player
 from naja import actions
 from naja.sound import sound
+from naja.utils import parse_bits
 import random
 
 
@@ -40,16 +41,11 @@ class GameBoard(object):
             '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)
+        deck_defaults = deck.get('defaults', {})
+        for k, v in deck_defaults.iteritems():
+            if isinstance(v, list):
+                deck_defaults[k] = tuple(v)
+        defaults.update(deck_defaults)
 
         if initial_bits is None:
             initial_bits = defaults['initial_bits']
@@ -60,6 +56,8 @@ class GameBoard(object):
         if wins_required is None:
             wins_required = defaults['wins_required']
 
+        assert wins_required + max_health == 8
+
         # Overriden by command line
         if options.initial_bits:
             initial_bits = options.initial_bits
@@ -70,14 +68,16 @@ class GameBoard(object):
             'wins_required': wins_required,
             'wins': 0,
             'locations': deck['cards'],
-            'puzzle': puzzle,
+            'puzzle': deck.get('puzzle', False),
             '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):
@@ -85,7 +85,9 @@ class GameBoard(object):
         player = Player.import_player(state.pop('player'))
         board_locations = cls.import_board_locations(
             state.pop('board_locations'))
-        return cls(state, player, board_locations)
+        board = cls(state, player, board_locations)
+        player.set_gameboard(board)
+        return board
 
     def export(self):
         data = {
@@ -101,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
@@ -136,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
@@ -249,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]
@@ -294,13 +299,15 @@ 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
+        if options.debug:
+            for action in self.actions:
+                action.sanity_check(self)
 
     @classmethod
     def import_location(cls, state):
@@ -313,14 +320,14 @@ class LocationCard(object):
     @classmethod
     def build_action(cls, definition):
         action_class = getattr(actions, definition['action_class'])
-        required_bits = cls.parse_bits(definition['required_bits'])
+        required_bits = parse_bits(definition['required_bits'])
         data = definition.get('data', {})
         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'])
+            bits = parse_bits(definition['bits'])
         else:
             bits = cls.generate_bitwise_operand()
 
@@ -332,18 +339,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,
         })
-
-    @classmethod
-    def parse_bits(self, bit_list):
-        # Convert names to numbers if applicable.
-        return frozenset(BITS.get(bit, bit) for bit in bit_list)
+        if not puzzle:
+            location.check_actions()
+        return location
 
     def export(self):
         return {
@@ -399,4 +404,3 @@ class LocationCard(object):
             self.replacement_time -= 1
             if self.replacement_time <= 0:
                 board.replace_card(position)
-