X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=data%2Flocation_decks%2Fstandard.yaml;h=d0d4056a04f957f9d2d7fc90e6b01792edd523fc;hb=ae063f219281b426fc31f6fb4becec845ab4549a;hp=ef8ecf94af841b4590cf1ad37f3c425e2d8a46d9;hpb=acd4bdc5372677dd7f904fdb26cbfcc81c6b51ea;p=naja.git

diff --git a/data/location_decks/standard.yaml b/data/location_decks/standard.yaml
index ef8ecf9..d0d4056 100644
--- a/data/location_decks/standard.yaml
+++ b/data/location_decks/standard.yaml
@@ -2,7 +2,7 @@ description: "Standard location deck."
 
 # This field is ignored, but it's a useful place to put some action definitions
 # we can reference later.
-_standard_actions:
+_action_definitions:
   # No-colour actions.
   - &SET-BITS-DEFAULT
     action_class: 'LoseHealthOrMSBAndSetBits'
@@ -45,6 +45,15 @@ _standard_actions:
     required_bits: [GREEN]
     data: {'direction': WEST}
 
+  - &ROT-CW
+    action_class: 'RotateLocations'
+    required_bits: [RED]
+    data: {'rot_direction': CLOCKWISE}
+  - &ROT-CCW
+    action_class: 'RotateLocations'
+    required_bits: [RED]
+    data: {'rot_direction': ANTICLOCKWISE}
+
   # Two-colour actions.
   - &KNIGHT-MOVE
     action_class: 'AllowChessMove'
@@ -71,11 +80,19 @@ _standard_actions:
     action_class: 'AcquireWinToken'
     required_bits: [RED, GREEN, BLUE]
 
-# This field is ignored, but it's a useful place to put some action definitions
+# This field is ignored, but it's a useful place to put some card definitions
 # we can reference later.
-_standard_cards:
-  - &WIN-CARD
+_card_definitions:
+  - &WIN-CARD-1
+    actions:
+      - *ACQUIRE-WIN-TOKEN
+  - &WIN-CARD-2
+    actions:
+      - *BAD-DEFAULT
+      - *ACQUIRE-WIN-TOKEN
+  - &WIN-CARD-3
     actions:
+      - *SET-BITS-DEFAULT
       - *ACQUIRE-WIN-TOKEN
 
   - &KNIGHT-AND-SET
@@ -97,6 +114,7 @@ _standard_cards:
   - &TOGGLE-RG-R
     bits: [RED, GREEN]  # Colour-blind robot!
     actions:
+      - *GAIN-HEALTH-DEFAULT
       - action_class: 'ToggleBits'
         required_bits: [RED]
       - action_class: 'SetBits'
@@ -104,6 +122,7 @@ _standard_cards:
   - &TOGGLE-RG-G
     bits: [RED, GREEN]  # Colour-blind robot!
     actions:
+      - *GAIN-HEALTH-DEFAULT
       - action_class: 'ToggleBits'
         required_bits: [GREEN]
       - action_class: 'SetBits'
@@ -130,8 +149,22 @@ _standard_cards:
       - *SHIFT-W
       - *HEAL-RB
 
+  - &ROT-CW-AND-SET
+    actions:
+      - *TOGGLE-BITS-DEFAULT
+      - *ROT-CW
+      - *SET-BITS-B
+
+  - &ROT-CCW-AND-SET
+    actions:
+      - *TOGGLE-BITS-DEFAULT
+      - *ROT-CCW
+      - *SET-BITS-G
+
 cards:
-  - *WIN-CARD
+  - *WIN-CARD-1
+  - *WIN-CARD-2
+  - *WIN-CARD-3
   - *KNIGHT-AND-SET
   - *CASTLE-AND-SET
   - *BISHOP-AND-SET
@@ -141,3 +174,5 @@ cards:
   - *SHIFT-S-AND-HEAL
   - *SHIFT-E-AND-HEAL
   - *SHIFT-W-AND-HEAL
+  - *ROT-CW-AND-SET
+  - *ROT-CCW-AND-SET