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

diff --git a/naja/gameboard.py b/naja/gameboard.py
index 123f3be..de0bc1e 100644
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -1,6 +1,7 @@
 from random import choice
 
-from naja.constants import BITS, DIRECTION_BITS, CONDITION_BITS
+from naja.constants import(
+    BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS)
 from naja.player import Player
 from naja import actions
 
@@ -15,12 +16,16 @@ class GameBoard(object):
         self.wins_required = state['wins_required']
         self.health = state['health']
         self.wins = state['wins']
-        self.locations = self.import_locations(state['locations'])
+        self.locations = [item.copy() for item in state['locations']]
         self.player = player
         self.board_locations = board_locations
 
     @classmethod
-    def new_game(cls, max_health, wins_required, locations_definition):
+    def new_game(cls, locations_definition,
+                 initial_bits=PLAYER_DEFAULTS.INITIAL_BITS,
+                 initial_pos=PLAYER_DEFAULTS.INITIAL_POS,
+                 max_health=PLAYER_DEFAULTS.MAX_HEALTH,
+                 wins_required=PLAYER_DEFAULTS.WINS_REQUIRED):
         state = {
             'max_health': max_health,
             'health': max_health,
@@ -28,8 +33,9 @@ class GameBoard(object):
             'wins': 0,
             'locations': locations_definition,
         }
-        player = Player(0x0f, (2, 2))
-        board_locations = cls.generate_board(locations_definition)
+        player = Player(initial_bits, initial_pos)
+        board_locations = cls.import_board_locations(
+            cls.generate_board(locations_definition))
         return cls(state, player, board_locations)
 
     @classmethod
@@ -46,14 +52,11 @@ class GameBoard(object):
             'health': self.health,
             'wins_required': self.wins_required,
             'wins': self.wins,
-            'locations': self.export_locations(),
+            'locations': [item.copy() for item in self.locations],
             'player': self.player.export(),
             'board_locations': self.export_board_locations(),
         }
 
-    def export_locations(self):
-        return [location.export() for location in self.locations]
-
     @classmethod
     def import_locations(cls, locations_definition):
         return [
@@ -63,7 +66,7 @@ class GameBoard(object):
     def export_board_locations(self):
         return dict(
             (position, location.export())
-            for position, location in self.board_locations)
+            for position, location in self.board_locations.iteritems())
 
     @classmethod
     def import_board_locations(cls, board_locations_definition):
@@ -73,8 +76,13 @@ class GameBoard(object):
 
     @classmethod
     def generate_board(cls, locations_definition):
-        # TODO: Choose some locations.
-        return {}
+        board_locations = {}
+        for x in range(5):
+            for y in range(5):
+                board_location = LocationCard.new_location(
+                    choice(locations_definition).copy())
+                board_locations[(x, y)] = board_location.export()
+        return board_locations
 
     def lose_health(self):
         self.health -= 1
@@ -92,7 +100,6 @@ class LocationCard(object):
 
     @classmethod
     def import_location(cls, state):
-        # TODO: Import real locations.
         location_actions = [
             cls.build_action(definition) for definition in state['actions']]
         return cls(state['bitwise_operand'], location_actions)