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

diff --git a/naja/gamestate.py b/naja/gamestate.py
index a82cec8..d00c7fc 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -3,6 +3,14 @@ The current game state.
 """
 
 from naja.gameboard import GameBoard
+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):
@@ -10,10 +18,22 @@ class GameState(object):
     Naja game state.
     """
 
-    def __init__(self):
-        self.gameboard = GameBoard.new_game(
-            locations_definition=[{'actions': []}])  # TODO: we will need some of these :)
+    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