X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;ds=sidebyside;f=naja%2Fgamestate.py;h=a32438170e3c5663366850cde744027507b57ceb;hb=3e460450c1baa9af43f5391ba4673a599071656b;hp=71abcc73a00eff7982eedadd5cb726120f4b3450;hpb=afd42e545649b6e5a3fe1502c063080cb9302c14;p=naja.git

diff --git a/naja/gamestate.py b/naja/gamestate.py
index 71abcc7..a324381 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,8 +2,23 @@
 The current game state.
 """
 
+try:
+    import yaml
+except ImportError:
+    yaml = None
+    import json
+
 from naja.gameboard import GameBoard
-from naja.constants import BITS
+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):
@@ -11,20 +26,22 @@ class GameState(object):
     Naja game state.
     """
 
-    def __init__(self):
-        # This is a very simple deck to allow testing more drawing logic
-        # on tiles. These will need to be replaced with better stuff.
-        self.gameboard = GameBoard.new_game(
-            locations_definition=[
-                {'actions': []},
-                {'actions': [{'required_bits': [BITS['CYAN']],
-                              'action_class': 'DoNothing'}]},
-                {'actions': [{'required_bits': [BITS['YELLOW']],
-                              'action_class': 'DoNothing'}]},
-                {'actions': [{'required_bits': [BITS['YELLOW'], BITS['MAGENTA']],
-                              'action_class': 'DoNothing'}]},
-                ])
+    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