X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgamestate.py;h=19051a42b8c1d450d4f4b43a0662610f4ad56825;hb=87a82ccb10b6f7b07c48f8e9993243b9592e00b4;hp=a2ed6e0d70225dc0f50d1a6e70eeca52d5372766;hpb=acd4bdc5372677dd7f904fdb26cbfcc81c6b51ea;p=naja.git

diff --git a/naja/gamestate.py b/naja/gamestate.py
index a2ed6e0..19051a4 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -18,12 +18,17 @@ 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.
-        locations_deck = load_location_deck('standard')
-        # locations_deck = load_location_deck('test')
-        self.gameboard = GameBoard.new_game(locations_deck['cards'])
+    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):