More location deck things.

diff --git a/data/location_decks/test.yaml b/data/location_decks/test.yaml
index 75f8690a88df0f0ff109eb5be162ab73a40bdd7d..b5df649d1a1c2d573841b7d951a4ac08a13aa508 100644 (file)
--- a/data/location_decks/test.yaml
+++ b/data/location_decks/test.yaml
@@ -1,10 +1,16 @@
-- actions: []
-- actions:
-  - action_class: 'DoNothing'
-    required_bits: [CYAN]
-- actions:
-  - action_class: 'DoNothing'
-    required_bits: [YELLOW]
-- actions:
-  - action_class: 'DoNothing'
-    required_bits: [YELLOW, MAGENTA]
+description: "Test location deck."
+cards:
+  - actions: []
+  - actions:
+    - action_class: 'LoseHealthOrMSB'
+      required_bits: []
+    - action_class: 'ToggleBits'
+      required_bits: [CYAN]
+    - action_class: 'SetBits'
+      required_bits: [YELLOW, MAGENTA]
+  - actions:
+    - action_class: 'ToggleBits'
+      required_bits: [YELLOW]
+  - actions:
+    - action_class: 'SetBits'
+      required_bits: [YELLOW, CYAN]

diff --git a/naja/gamestate.py b/naja/gamestate.py
index c812c564e2e9c06be35a346f08eddb178af5612b..c8bbbc7acc67c54ec1d5827c3e3ddcb70be3bfd7 100644 (file)
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -21,8 +21,8 @@ class GameState(object):
     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=load_location_deck('test'))
+        locations_deck = load_location_deck('test')
+        self.gameboard = GameBoard.new_game(locations_deck['cards'])
 
     @property
     def player(self):