X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=data%2Flocation_decks%2Fstandard.yaml;h=58ecaf818239d6392924ecbda38c85e1dc1fb0b2;hb=f6639f9bf0da3b0cbc2ed2b787ed217c332a9fa2;hp=5e14e9d84da0860c2c059e60a09e188966a62ad9;hpb=556f041912b43276d73f6afc9855ab5168c9c3ac;p=naja.git

diff --git a/data/location_decks/standard.yaml b/data/location_decks/standard.yaml
index 5e14e9d..58ecaf8 100644
--- a/data/location_decks/standard.yaml
+++ b/data/location_decks/standard.yaml
@@ -13,9 +13,15 @@ _action_definitions:
   - &TOGGLE-BITS-DEFAULT
     action_class: 'ToggleBits'
     required_bits: []
+  - &TOGGLE-BITS-HARM-DEFAULT
+    action_class: 'ToggleBitsAndHarm'
+    required_bits: []
   - &BAD-DEFAULT
     action_class: 'LoseHealthOrMSB'
     required_bits: []
+  - &SET-MSB-DEFAULT
+    action_class: 'GainMSB'
+    required_bits: []
 
   - &KNIGHT-MSB-DEFAULT
     action_class: 'AllowChessMoveIfMSB'
@@ -108,6 +114,11 @@ _action_definitions:
     action_class: 'AcquireWinToken'
     required_bits: [RED, GREEN, BLUE]
 
+  # Three-colour actions.
+  - &ACQUIRE-WIN-TOKEN-AND-LOSE-HEALTH
+    action_class: 'AcquireWinTokenAndLoseHealth'
+    required_bits: [RED, GREEN, BLUE]
+
 # This field is ignored, but it's a useful place to put some card definitions
 # we can reference later.
 _card_definitions:
@@ -115,13 +126,14 @@ _card_definitions:
     card_name: 'win1'
     max_number: 1
     actions:
+      - *BAD-DEFAULT
       - *ACQUIRE-WIN-TOKEN
   - &WIN-CARD-2
     card_name: 'win2'
     max_number: 2
     actions:
       - *BAD-DEFAULT
-      - *ACQUIRE-WIN-TOKEN
+      - *ACQUIRE-WIN-TOKEN-AND-LOSE-HEALTH
   - &WIN-CARD-3
     card_name: 'win3'
     max_number: 1
@@ -132,19 +144,19 @@ _card_definitions:
   - &KNIGHT-AND-SET
     card_name: 'knight_set'
     actions:
-      - *BAD-DEFAULT
+      - *SET-MSB-DEFAULT
       - *SET-BITS-B
       - *KNIGHT-MOVE
   - &CASTLE-AND-SET
     card_name: 'castle_set'
     actions:
-      - *BAD-DEFAULT
+      - *SET-MSB-DEFAULT
       - *SET-BITS-G
       - *CASTLE-MOVE
   - &BISHOP-AND-SET
     card_name: 'bishop_set'
     actions:
-      - *BAD-DEFAULT
+      - *SET-MSB-DEFAULT
       - *SET-BITS-R
       - *BISHOP-MOVE
 
@@ -211,6 +223,31 @@ _card_definitions:
       - *SHIFT-W
       - *HEAL-RB
 
+  - &SHIFT-N-AND-HARM
+    card_name: 'shift-n-harm'
+    actions:
+      - *TOGGLE-BITS-HARM-DEFAULT
+      - *SHIFT-N
+      - *HEAL-RG
+  - &SHIFT-S-AND-HARM
+    card_name: 'shift-s-harm'
+    actions:
+      - *TOGGLE-BITS-HARM-DEFAULT
+      - *SHIFT-S
+      - *HEAL-RG
+  - &SHIFT-E-AND-HARM
+    card_name: 'shift-e-harm'
+    actions:
+      - *TOGGLE-BITS-HARM-DEFAULT
+      - *SHIFT-E
+      - *HEAL-RB
+  - &SHIFT-W-AND-HARM
+    card_name: 'shift-w-harm'
+    actions:
+      - *TOGGLE-BITS-HARM-DEFAULT
+      - *SHIFT-W
+      - *HEAL-RB
+
   - &ROT-CW-AND-SET
     card_name: 'rot-cw-set'
     actions:
@@ -236,6 +273,19 @@ _card_definitions:
       - *SHIFT-W
       - *BITSHIFT-L
 
+  - &MEAN-CARD
+    card_name: 'mean-card'
+    actions:
+      - *BAD-DEFAULT
+
+  - &REALLY-MEAN-CARD
+    card_name: 'mean-card'
+    actions:
+      - action_class: 'ClearBitsAndHealth'
+        required_bits: []
+      - action_class: 'LoseHealthOrMSB'
+        required_bits: [RED]
+
 cards:
   - *WIN-CARD-1
   - *WIN-CARD-2
@@ -252,10 +302,16 @@ cards:
   - *SHIFT-S-AND-HEAL
   - *SHIFT-E-AND-HEAL
   - *SHIFT-W-AND-HEAL
+  - *SHIFT-N-AND-HARM
+  - *SHIFT-S-AND-HARM
+  - *SHIFT-E-AND-HARM
+  - *SHIFT-W-AND-HARM
   - *SHIFT-E-BITSHIFT
   - *SHIFT-W-BITSHIFT
   - *ROT-CW-AND-SET
   - *ROT-CCW-AND-SET
+  - *MEAN-CARD
+  - *REALLY-MEAN-CARD
 
 replacement_params:
   chance: 0.2