Move player defaults into constants.

[naja.git] / naja / gamestate.py

diff --git a/naja/gamestate.py b/naja/gamestate.py
index a2eb77b2de2aea3dae40fee8a08d5e12272af3cd..4e892f883ef4cf7ab456a871cda2a13f37c5ca7b 100644 (file)
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,9 +2,7 @@
 The current game state.
 """
 
-from naja.constants import BITS
 from naja.gameboard import GameBoard
-from naja.player import Player
 
 
 class GameState(object):
@@ -12,14 +10,10 @@ class GameState(object):
     Naja game state.
     """
 
-    INITIAL_BITS = (
-        BITS.NORTH | BITS.SOUTH |
-        BITS.EAST | BITS.WEST
-    )
-    MAX_HEALTH = 4
-    WINS_REQUIRED = 4
-
     def __init__(self):
-        self.player = Player(self.INITIAL_BITS, (0, 0))
-        self.gameboard = GameBoard(
-            self.player, self.MAX_HEALTH, self.WINS_REQUIRED)
+        self.gameboard = GameBoard.new_game(
+            locations_definition=[])  # TODO: we will need some of these :)
+
+    @property
+    def player(self):
+        return self.gameboard.player