Bit shifts!

[naja.git] / data / location_decks / standard.yaml

diff --git a/data/location_decks/standard.yaml b/data/location_decks/standard.yaml
index e085efd0db18037f1cd6ea767ea9aaa070ee266a..0ff3bc6c7ec732e2e32aed90777c6cd46fad9118 100644 (file)
--- 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'
@@ -66,14 +75,29 @@ _standard_actions:
     action_class: 'GainHealth'
     required_bits: [RED, BLUE]
 
+  - &BITSHIFT-L
+    action_class: 'ShiftBits'
+    required_bits: [RED, BLUE]
+    data: {
+      'direction': 'left',
+      'shift': 1,
+    }
+  - &BITSHIFT-R
+    action_class: 'ShiftBits'
+    required_bits: [GREEN, BLUE]
+    data: {
+      'direction': 'right',
+      'shift': 1,
+    }
+
   # Three-colour actions.
   - &ACQUIRE-WIN-TOKEN
     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:
+_card_definitions:
   - &WIN-CARD-1
     actions:
       - *ACQUIRE-WIN-TOKEN
@@ -140,6 +164,27 @@ _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
+
+  - &SHIFT-E-BITSHIFT
+    actions:
+      - *SHIFT-E
+      - *BITSHIFT-R
+  - &SHIFT-W-BITSHIFT
+    actions:
+      - *SHIFT-W
+      - *BITSHIFT-L
+
 cards:
   - *WIN-CARD-1
   - *WIN-CARD-2
@@ -153,3 +198,7 @@ cards:
   - *SHIFT-S-AND-HEAL
   - *SHIFT-E-AND-HEAL
   - *SHIFT-W-AND-HEAL
+  - *SHIFT-E-BITSHIFT
+  - *SHIFT-W-BITSHIFT
+  - *ROT-CW-AND-SET
+  - *ROT-CCW-AND-SET