X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgamestate.py;h=d00c7fc182b8af7887b4f1fab472b38f25ebf35f;hb=31a73cad5d73cca9169a1fb7e59640a8413b18a9;hp=19051a42b8c1d450d4f4b43a0662610f4ad56825;hpb=aa858388f65344396a7b81a82198e3a6fbc1efca;p=naja.git

diff --git a/naja/gamestate.py b/naja/gamestate.py
index 19051a4..d00c7fc 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,15 +2,15 @@
 The current game state.
 """
 
-import yaml
-
 from naja.gameboard import GameBoard
-from naja.resources import resources
+from naja.resources import resources, ResourceNotFound
 
 
 def load_location_deck(name):
-    with resources.get_file('location_decks', '%s.yaml' % (name,)) as deck_fp:
-        return yaml.safe_load(deck_fp)
+    try:
+        return resources.get_yaml('location_decks', '%s.yaml' % name)
+    except ResourceNotFound:
+        return resources.get_json('location_decks', '%s.json' % name)
 
 
 class GameState(object):