X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=data%2Flocation_decks%2Fstandard.yaml;h=0e95c856afe245f64c8b81390e65ed72f2b816e8;hb=8c08ffd9e2d674558bca43d4f709be5f49e46119;hp=648e1587e8566db951647467c126f4c8f93d773d;hpb=2204be6c8019bb19cb8fe69192012aa7a74d36d7;p=naja.git

diff --git a/data/location_decks/standard.yaml b/data/location_decks/standard.yaml
index 648e158..0e95c85 100644
--- a/data/location_decks/standard.yaml
+++ b/data/location_decks/standard.yaml
@@ -13,9 +13,28 @@ _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'
+    required_bits: []
+    data: {'chesspiece': KNIGHT}
+  - &CASTLE-MSB-DEFAULT
+    action_class: 'AllowChessMoveIfMSB'
+    required_bits: []
+    data: {'chesspiece': CASTLE}
+  - &BISHOP-MSB-DEFAULT
+    action_class: 'AllowChessMoveIfMSB'
+    required_bits: []
+    data: {'chesspiece': BISHOP}
 
   # One-colour actions.
   - &SET-BITS-R
@@ -119,19 +138,38 @@ _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
+
+  - &BISHOP-SET-KNIGHT
+    card_name: 'bishop_set_knight'
+    actions:
+      - *BISHOP-MSB-DEFAULT
+      - *SET-BITS-B
+      - *KNIGHT-MOVE
+  - &KNIGHT-SET-CASTLE
+    card_name: 'knight_set_castle'
+    actions:
+      - *KNIGHT-MSB-DEFAULT
+      - *SET-BITS-G
+      - *CASTLE-MOVE
+  - &CASTLE-SET-BISHOP
+    card_name: 'castle_set_bishop'
+    actions:
+      - *CASTLE-MSB-DEFAULT
       - *SET-BITS-R
       - *BISHOP-MOVE
 
@@ -179,6 +217,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:
@@ -204,6 +267,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
@@ -211,18 +287,27 @@ cards:
   - *KNIGHT-AND-SET
   - *CASTLE-AND-SET
   - *BISHOP-AND-SET
+  - *BISHOP-SET-KNIGHT
+  - *KNIGHT-SET-CASTLE
+  - *CASTLE-SET-BISHOP
   - *TOGGLE-RG-R
   - *TOGGLE-RG-G
   - *SHIFT-N-AND-HEAL
   - *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
-  min: 5
-  max: 15
+  min: 4
+  max: 8