X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgamestate.py;h=a32438170e3c5663366850cde744027507b57ceb;hb=3e460450c1baa9af43f5391ba4673a599071656b;hp=96e55056bf862b5243aed0198bd46e8a0ce097a7;hpb=62a297a628fe85160afa770ecad666e3d1a50126;p=naja.git

diff --git a/naja/gamestate.py b/naja/gamestate.py
index 96e5505..a324381 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,9 +2,23 @@
 The current game state.
 """
 
-from .constants import BITS
-from .gameboard import GameBoard
-from .player import Player
+try:
+    import yaml
+except ImportError:
+    yaml = None
+    import json
+
+from naja.gameboard import GameBoard
+from naja.resources import resources
+
+
+def load_location_deck(name):
+    if yaml:
+        with resources.get_file('location_decks', '%s.yaml' % name) as deck_fp:
+            return yaml.safe_load(deck_fp)
+    else:
+        with resources.get_file('location_decks', '%s.json' % name) as deck_fp:
+            return json.load(deck_fp)
 
 
 class GameState(object):
@@ -12,14 +26,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