X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=data%2Flocation_decks%2Fpuzzles%2Fchess.yaml;h=dca1a9f8931c86ea25a18e1292f10d7235fd346f;hb=b07be6d16b82960992e90989d2fc773490785889;hp=d98e400fdfe1524a6c203b53827ef384a33e0c08;hpb=7894d452b28e9e21a151ff1ac68ac512c1c16f8a;p=naja.git

diff --git a/data/location_decks/puzzles/chess.yaml b/data/location_decks/puzzles/chess.yaml
index d98e400..dca1a9f 100644
--- a/data/location_decks/puzzles/chess.yaml
+++ b/data/location_decks/puzzles/chess.yaml
@@ -1,6 +1,18 @@
 description: "Kasparov to F3"
 puzzle: true
 
+# This field is ignored, but it's a useful place to put some action definitions
+# we can reference later.
+_action_defitions:
+  - &PYRRHIC-VICTORY
+    action_class: GenericBits
+    required_bits: [RED, GREEN, BLUE]
+    data:
+      clear: [NORTH, SOUTH, EAST, WEST, RED, GREEN, BLUE, MSB]
+      acquire_win: true
+      lose_health: true
+      once: true
+
 # This field is ignored, but it's a useful place to put some card definitions
 # we can reference later.
 _card_definitions:
@@ -11,13 +23,7 @@ _card_definitions:
         required_bits: []
         data:
           chesspiece: BISHOP
-      - action_class: GenericBits
-        required_bits: [RED, GREEN, BLUE]
-        data:
-          clear: [NORTH, SOUTH, EAST, WEST, RED, GREEN, BLUE, MSB]
-          acquire_win: true
-          lose_health: true
-          once: true
+      - *PYRRHIC-VICTORY
   - &CHESS-WIN-CARD-CASTLE
     card_name: 'chess-win-rook'
     actions:
@@ -25,10 +31,7 @@ _card_definitions:
         required_bits: []
         data:
           chesspiece: CASTLE
-      - action_class: AcquireWinToken
-        required_bits: [RED, GREEN, BLUE]
-        data:
-          once: true
+      - *PYRRHIC-VICTORY
   - &CHESS-WIN-CARD-KNIGHT
     card_name: 'chess-win-knight'
     actions:
@@ -36,19 +39,13 @@ _card_definitions:
         required_bits: []
         data:
           chesspiece: KNIGHT
-      - action_class: AcquireWinToken
-        required_bits: [RED, GREEN, BLUE]
-        data:
-          once: true
+      - *PYRRHIC-VICTORY
   - &CHESS-WIN-CARD-SEPPUKU
     card_name: 'chess-win-seppuku'
     actions:
       - action_class: LoseHealthOrMSB
         required_bits: []
-      - action_class: AcquireWinToken
-        required_bits: [RED, GREEN, BLUE]
-        data:
-          once: true
+      - *PYRRHIC-VICTORY
   - &TEST-BORING
     card_name: 'test-boring'
     actions:
@@ -72,6 +69,7 @@ _card_definitions:
         data:
           toggle: [RED]
           clear: [NORTH, EAST, WEST]
+          set: [SOUTH]
   - &CHESS-SOUTH
     card_name: 'chess-south'
     bits: [SOUTH, EAST, WEST, RED, GREEN]
@@ -81,6 +79,7 @@ _card_definitions:
         data:
           toggle: [RED, GREEN]
           clear: [SOUTH, EAST, WEST]
+          set: [NORTH]
   - &CHESS-EAST
     card_name: 'chess-east'
     bits: [NORTH, SOUTH, EAST, RED, BLUE]
@@ -90,7 +89,7 @@ _card_definitions:
         data:
           toggle: [RED, BLUE]
           clear: [NORTH, SOUTH, EAST]
-
+          set: [WEST]
   - &CHESS-WEST
     card_name: 'chess-west'
     bits: [NORTH, SOUTH, WEST, BLUE, MSB]
@@ -100,6 +99,7 @@ _card_definitions:
         data:
           toggle: [BLUE, MSB]
           clear: [NORTH, SOUTH, WEST]
+          set: [EAST]
 
 cards:
   - *CHESS-WIN-CARD-BISHOP