X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgamestate.py;h=d00c7fc182b8af7887b4f1fab472b38f25ebf35f;hb=a1c561e26fae79ce8a9570c9404975a8a0367d65;hp=a2eb77b2de2aea3dae40fee8a08d5e12272af3cd;hpb=ae027d877ab8983517cdfc10a582ee6d9d6d7e8f;p=naja.git

diff --git a/naja/gamestate.py b/naja/gamestate.py
index a2eb77b..d00c7fc 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,9 +2,15 @@
 The current game state.
 """
 
-from naja.constants import BITS
 from naja.gameboard import GameBoard
-from naja.player import Player
+from naja.resources import resources, ResourceNotFound
+
+
+def load_location_deck(name):
+    try:
+        return resources.get_yaml('location_decks', '%s.yaml' % name)
+    except ResourceNotFound:
+        return resources.get_json('location_decks', '%s.json' % name)
 
 
 class GameState(object):
@@ -12,14 +18,22 @@ 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)
+    def __init__(self, gameboard):
+        self.gameboard = gameboard
+
+    @classmethod
+    def new(cls, deck='standard', **kw):
+        deck = load_location_deck(deck)
+        return cls(GameBoard.new_game(deck, **kw))
+
+    @classmethod
+    def load(cls, data):
+        return cls(GameBoard.import_game(data))
+
+    @property
+    def player(self):
+        return self.gameboard.player
+
+    @property
+    def board_locations(self):
+        return self.gameboard.board_locations