X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgameboard.py;h=934aa3d15b1d308cb12d59d37e6e5d1645a0deae;hb=51c21cef44d0a7f3cb59f4a005d4a1dba9159d51;hp=2ed511afeb81eab12875286c3506899ecb49ec9b;hpb=28e4f8bd08af2ad4385aef7d1bd6521612eeb92a;p=naja.git

diff --git a/naja/gameboard.py b/naja/gameboard.py
index 2ed511a..934aa3d 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
 
 
@@ -46,9 +47,7 @@ class GameBoard(object):
             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)
+                    puzzle_defaults[k] = tuple(v)
             defaults.update(puzzle_defaults)
 
         if initial_bits is None:
@@ -77,7 +76,9 @@ class GameBoard(object):
         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 +86,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 = {
@@ -138,7 +141,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
@@ -297,12 +300,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
@@ -316,14 +318,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()
 
@@ -335,18 +337,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 {