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

diff --git a/naja/gamestate.py b/naja/gamestate.py
index a2eb77b..a2ed6e0 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,9 +2,15 @@
 The current game state.
 """
 
-from naja.constants import BITS
+import yaml
+
 from naja.gameboard import GameBoard
-from naja.player import Player
+from naja.resources import resources
+
+
+def load_location_deck(name):
+    with resources.get_file('location_decks', '%s.yaml' % (name,)) as deck_fp:
+        return yaml.safe_load(deck_fp)
 
 
 class GameState(object):
@@ -12,14 +18,17 @@ 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)
+        # 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'])
+
+    @property
+    def player(self):
+        return self.gameboard.player
+
+    @property
+    def board_locations(self):
+        return self.gameboard.board_locations