X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgamestate.py;h=c812c564e2e9c06be35a346f08eddb178af5612b;hb=3beea676f3bd4fc9101e9de1c24e8007011e952b;hp=8d00756f8c85c318f7d30a224683f75c6b274f76;hpb=5d31e52cd3ce4a577a7075b4fbba14923574f207;p=naja.git

diff --git a/naja/gamestate.py b/naja/gamestate.py
index 8d00756..c812c56 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,8 +2,15 @@
 The current game state.
 """
 
+import yaml
+
 from naja.gameboard import GameBoard
-from naja.constants import BITS
+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):
@@ -15,15 +22,7 @@ class GameState(object):
         # 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'}]},
-                ])
+            locations_definition=load_location_deck('test'))
 
     @property
     def player(self):