X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgameboard.py;h=123f3be6d6bf059187f4ac97357f306e613cf625;hb=b3db4400695249420f5f941744c2a2692a1bad98;hp=fa768dbad5db3481820d1775f277a2e37cb83d1c;hpb=9299925383d4746e7f9c4e948e083a1bff1e339a;p=naja.git

diff --git a/naja/gameboard.py b/naja/gameboard.py
index fa768db..123f3be 100644
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -1,6 +1,8 @@
 from random import choice
 
 from naja.constants import BITS, DIRECTION_BITS, CONDITION_BITS
+from naja.player import Player
+from naja import actions
 
 
 class GameBoard(object):
@@ -8,12 +10,35 @@ class GameBoard(object):
     A representation of the game board.
     """
 
-    def __init__(self, player, health, wins, state=None):
+    def __init__(self, state, player, board_locations):
+        self.max_health = state['max_health']
+        self.wins_required = state['wins_required']
+        self.health = state['health']
+        self.wins = state['wins']
+        self.locations = self.import_locations(state['locations'])
         self.player = player
+        self.board_locations = board_locations
 
-        if state is None:
-            state = self.generate_state(health, wins)
-        self.update_state(state)
+    @classmethod
+    def new_game(cls, max_health, wins_required, locations_definition):
+        state = {
+            'max_health': max_health,
+            'health': max_health,
+            'wins_required': wins_required,
+            'wins': 0,
+            'locations': locations_definition,
+        }
+        player = Player(0x0f, (2, 2))
+        board_locations = cls.generate_board(locations_definition)
+        return cls(state, player, board_locations)
+
+    @classmethod
+    def import_game(cls, definition):
+        state = definition.copy()
+        player = Player.import_player(state.pop('player'))
+        board_locations = cls.import_board_locations(
+            state.pop('board_locations'))
+        return cls(state, player, board_locations)
 
     def export(self):
         return {
@@ -22,38 +47,34 @@ class GameBoard(object):
             'wins_required': self.wins_required,
             'wins': self.wins,
             'locations': self.export_locations(),
+            'player': self.player.export(),
+            'board_locations': self.export_board_locations(),
         }
 
     def export_locations(self):
-        return dict(
-            (position, location.export())
-            for position, location in self.locations)
+        return [location.export() for location in self.locations]
 
     @classmethod
-    def generate_locations(cls):
-        # TODO: Generate some locations.
-        return {}
-
-    def generate_state(self, max_health, wins_required):
-        return {
-            'max_health': max_health,
-            'health': max_health,
-            'wins_required': wins_required,
-            'wins': 0,
-            'locations': self.generate_locations(),
-        }
+    def import_locations(cls, locations_definition):
+        return [
+            LocationCard.import_location(definition)
+            for definition in locations_definition]
 
-    def update_state(self, state):
-        self.max_health = state['max_health']
-        self.wins_required = state['wins_required']
-        self.health = state['health']
-        self.wins = state['wins']
-        self.locations = self.import_locations(state['locations'])
+    def export_board_locations(self):
+        return dict(
+            (position, location.export())
+            for position, location in self.board_locations)
 
-    def import_locations(self, locations):
+    @classmethod
+    def import_board_locations(cls, board_locations_definition):
         return dict(
             (position, LocationCard.import_location(definition))
-            for position, definition in locations.iteritems())
+            for position, definition in board_locations_definition.iteritems())
+
+    @classmethod
+    def generate_board(cls, locations_definition):
+        # TODO: Choose some locations.
+        return {}
 
     def lose_health(self):
         self.health -= 1
@@ -65,20 +86,29 @@ class LocationCard(object):
     A particular set of options available on a location.
     """
 
-    def __init__(self, bitwise_operand, actions):
+    def __init__(self, bitwise_operand, location_actions):
         self.bitwise_operand = bitwise_operand
-        self.actions = actions
+        self.actions = location_actions
 
     @classmethod
     def import_location(cls, state):
         # TODO: Import real locations.
-        return cls(state['bitwise_operand'], [])
+        location_actions = [
+            cls.build_action(definition) for definition in state['actions']]
+        return cls(state['bitwise_operand'], location_actions)
+
+    @classmethod
+    def build_action(cls, definition):
+        action_class = getattr(actions, definition['action_class'])
+        required_bits = definition['required_bits']
+        data = definition.get('data', {})
+        return action_class(required_bits, **data)
 
     @classmethod
     def new_location(cls, definition):
         return cls.import_location({
             'bitwise_operand': cls.generate_bitwise_operand(),
-            'actions': cls.build_actions(definition),
+            'actions': definition['actions'],
         })
 
     def export(self):
@@ -87,10 +117,6 @@ class LocationCard(object):
             'actions': [action.export() for action in self.actions],
         }
 
-    @classmethod
-    def build_actions(cls, definition):
-        raise NotImplementedError("TODO")
-
     @staticmethod
     def generate_bitwise_operand():
         """