From: Neil <neil@dip.sun.ac.za>
Date: Sat, 17 May 2014 12:45:22 +0000 (+0200)
Subject: card names should not be lists
X-Git-Tag: 0.1~108
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=22bc697b67a38dccf5bd1b74fbfbaa7f66813311;p=naja.git

card names should not be lists
---

diff --git a/data/location_decks/standard.yaml b/data/location_decks/standard.yaml
index 885070e..92f13e5 100644
--- a/data/location_decks/standard.yaml
+++ b/data/location_decks/standard.yaml
@@ -99,48 +99,41 @@ _action_definitions:
 # we can reference later.
 _card_definitions:
   - &WIN-CARD-1
-    card_name:
-      - 'win1'
+    card_name: 'win1'
     actions:
       - *ACQUIRE-WIN-TOKEN
   - &WIN-CARD-2
-    card_name:
-      - 'win2'
+    card_name: 'win2'
     actions:
       - *BAD-DEFAULT
       - *ACQUIRE-WIN-TOKEN
   - &WIN-CARD-3
-    card_name:
-      - 'win3'
+    card_name: 'win3'
     actions:
       - *SET-BITS-DEFAULT
       - *ACQUIRE-WIN-TOKEN
 
   - &KNIGHT-AND-SET
-    card_name:
-      - 'knight_set'
+    card_name: 'knight_set'
     actions:
       - *BAD-DEFAULT
       - *SET-BITS-B
       - *KNIGHT-MOVE
   - &CASTLE-AND-SET
-    card_name:
-      - 'castle_set'
+    card_name: 'castle_set'
     actions:
       - *BAD-DEFAULT
       - *SET-BITS-G
       - *CASTLE-MOVE
   - &BISHOP-AND-SET
-    card_name:
-      - 'bishop_set'
+    card_name: 'bishop_set'
     actions:
       - *BAD-DEFAULT
       - *SET-BITS-R
       - *BISHOP-MOVE
 
   - &TOGGLE-RG-R
-    card_name:
-      - 'toggle-rg-r'
+    card_name: 'toggle-rg-r'
     bits: [RED, GREEN]  # Colour-blind robot!
     actions:
       - *GAIN-HEALTH-DEFAULT
@@ -149,8 +142,7 @@ _card_definitions:
       - action_class: 'SetBits'
         required_bits: [GREEN, BLUE]
   - &TOGGLE-RG-G
-    card_name:
-      - 'toggle-rg-g'
+    card_name: 'toggle-rg-g'
     bits: [RED, GREEN]  # Colour-blind robot!
     actions:
       - *GAIN-HEALTH-DEFAULT
@@ -160,59 +152,51 @@ _card_definitions:
         required_bits: [RED, BLUE]
 
   - &SHIFT-N-AND-HEAL
-    card_name:
-      - 'shift-n-heal'
+    card_name: 'shift-n-heal'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *SHIFT-N
       - *HEAL-RG
   - &SHIFT-S-AND-HEAL
-    card_name:
-      - 'shift-s-heal'
+    card_name: 'shift-s-heal'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *SHIFT-S
       - *HEAL-RG
   - &SHIFT-E-AND-HEAL
-    card_name:
-      - 'shift-e-heal'
+    card_name: 'shift-e-heal'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *SHIFT-E
       - *HEAL-RB
   - &SHIFT-W-AND-HEAL
-    card_name:
-      - 'shift-w-heal'
+    card_name: 'shift-w-heal'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *SHIFT-W
       - *HEAL-RB
 
   - &ROT-CW-AND-SET
-    card_name:
-      - 'rot-cw-set'
+    card_name: 'rot-cw-set'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *ROT-CW
       - *SET-BITS-B
 
   - &ROT-CCW-AND-SET
-    card_name:
-      - 'rot-ccw-set'
+    card_name: 'rot-ccw-set'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *ROT-CCW
       - *SET-BITS-G
 
   - &SHIFT-E-BITSHIFT
-    card_name:
-      - 'shift-e-bitshift'
+    card_name: 'shift-e-bitshift'
     actions:
       - *SHIFT-E
       - *BITSHIFT-R
   - &SHIFT-W-BITSHIFT
-    card_name:
-      - 'shift-w-bitshift'
+    card_name: 'shift-w-bitshift'
     actions:
       - *SHIFT-W
       - *BITSHIFT-L
diff --git a/data/location_decks/test_puzzle.yaml b/data/location_decks/test_puzzle.yaml
index 8ca9f2d..33dc902 100644
--- a/data/location_decks/test_puzzle.yaml
+++ b/data/location_decks/test_puzzle.yaml
@@ -93,13 +93,11 @@ _action_definitions:
 # we can reference later.
 _card_definitions:
   - &TEST-WIN-CARD
-    card_name:
-      - 'test-win'
+    card_name: 'test-win'
     actions:
       - *TEST-WIN
   - &TEST-BORING
-    card_name:
-      - 'test-boring'
+    card_name: 'test-boring'
     actions:
       - *TEST-NULL