X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=data%2Flocation_decks%2Fstandard.yaml;h=150a6e118ff7a1a0530079d524b8b7515fc2fbf6;hb=d56932610ab443154ece192dac89b9a16de73eaa;hp=885070edfb9d0530109048d1780b653b4970986d;hpb=faf6b0cef3ab0a98eb9899a27505d7bb4a04eef1;p=naja.git

diff --git a/data/location_decks/standard.yaml b/data/location_decks/standard.yaml
index 885070e..150a6e1 100644
--- a/data/location_decks/standard.yaml
+++ b/data/location_decks/standard.yaml
@@ -16,6 +16,22 @@ _action_definitions:
   - &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
@@ -99,48 +115,63 @@ _action_definitions:
 # we can reference later.
 _card_definitions:
   - &WIN-CARD-1
-    card_name:
-      - 'win1'
+    card_name: 'win1'
+    max_number: 1
     actions:
       - *ACQUIRE-WIN-TOKEN
   - &WIN-CARD-2
-    card_name:
-      - 'win2'
+    card_name: 'win2'
+    max_number: 2
     actions:
       - *BAD-DEFAULT
       - *ACQUIRE-WIN-TOKEN
   - &WIN-CARD-3
-    card_name:
-      - 'win3'
+    card_name: 'win3'
+    max_number: 1
     actions:
       - *SET-BITS-DEFAULT
       - *ACQUIRE-WIN-TOKEN
 
   - &KNIGHT-AND-SET
-    card_name:
-      - 'knight_set'
+    card_name: 'knight_set'
     actions:
-      - *BAD-DEFAULT
+      - *SET-MSB-DEFAULT
       - *SET-BITS-B
       - *KNIGHT-MOVE
   - &CASTLE-AND-SET
-    card_name:
-      - 'castle_set'
+    card_name: 'castle_set'
     actions:
-      - *BAD-DEFAULT
+      - *SET-MSB-DEFAULT
       - *SET-BITS-G
       - *CASTLE-MOVE
   - &BISHOP-AND-SET
-    card_name:
-      - 'bishop_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
 
   - &TOGGLE-RG-R
-    card_name:
-      - 'toggle-rg-r'
+    card_name: 'toggle-rg-r'
     bits: [RED, GREEN]  # Colour-blind robot!
     actions:
       - *GAIN-HEALTH-DEFAULT
@@ -149,8 +180,7 @@ _card_definitions:
       - action_class: 'SetBits'
         required_bits: [GREEN, BLUE]
   - &TOGGLE-RG-G
-    card_name:
-      - 'toggle-rg-g'
+    card_name: 'toggle-rg-g'
     bits: [RED, GREEN]  # Colour-blind robot!
     actions:
       - *GAIN-HEALTH-DEFAULT
@@ -160,59 +190,51 @@ _card_definitions:
         required_bits: [RED, BLUE]
 
   - &SHIFT-N-AND-HEAL
-    card_name:
-      - 'shift-n-heal'
+    card_name: 'shift-n-heal'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *SHIFT-N
       - *HEAL-RG
   - &SHIFT-S-AND-HEAL
-    card_name:
-      - 'shift-s-heal'
+    card_name: 'shift-s-heal'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *SHIFT-S
       - *HEAL-RG
   - &SHIFT-E-AND-HEAL
-    card_name:
-      - 'shift-e-heal'
+    card_name: 'shift-e-heal'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *SHIFT-E
       - *HEAL-RB
   - &SHIFT-W-AND-HEAL
-    card_name:
-      - 'shift-w-heal'
+    card_name: 'shift-w-heal'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *SHIFT-W
       - *HEAL-RB
 
   - &ROT-CW-AND-SET
-    card_name:
-      - 'rot-cw-set'
+    card_name: 'rot-cw-set'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *ROT-CW
       - *SET-BITS-B
 
   - &ROT-CCW-AND-SET
-    card_name:
-      - 'rot-ccw-set'
+    card_name: 'rot-ccw-set'
     actions:
       - *TOGGLE-BITS-DEFAULT
       - *ROT-CCW
       - *SET-BITS-G
 
   - &SHIFT-E-BITSHIFT
-    card_name:
-      - 'shift-e-bitshift'
+    card_name: 'shift-e-bitshift'
     actions:
       - *SHIFT-E
       - *BITSHIFT-R
   - &SHIFT-W-BITSHIFT
-    card_name:
-      - 'shift-w-bitshift'
+    card_name: 'shift-w-bitshift'
     actions:
       - *SHIFT-W
       - *BITSHIFT-L
@@ -224,6 +246,9 @@ 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
@@ -234,3 +259,8 @@ cards:
   - *SHIFT-W-BITSHIFT
   - *ROT-CW-AND-SET
   - *ROT-CCW-AND-SET
+
+replacement_params:
+  chance: 0.2
+  min: 4
+  max: 8