X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=data%2Flocation_decks%2Fintroduction.yaml;h=dfb4bf30a8769530964c800ab2dcbd096de9d7e7;hb=eebda4cec6952e9e6850ef9983a2f64bfb400933;hp=c6a47870cb20b237dda5d0773264c129dc8ba3ef;hpb=e6c9584589c3e3565be85f9b0f0eb5923a394a86;p=naja.git

diff --git a/data/location_decks/introduction.yaml b/data/location_decks/introduction.yaml
index c6a4787..dfb4bf3 100644
--- a/data/location_decks/introduction.yaml
+++ b/data/location_decks/introduction.yaml
@@ -19,7 +19,7 @@ _action_definitions:
     action_class: 'DoNothing'
     required_bits: []
     data:
-      message: "Welcome to the game. You can only move to chequered squares, therefore you can stay here or move right."
+      message: "Welcome to the tutorial! You can select any tile, but only move {NORTH,SOUTH,EAST} or {WEST} if those bits are set — allowed tiles are chequered.\nRight now you can stay on this tile or move {EAST}.\nSelect {EAST} tile and press {RETURN}."
 
   - &STEP1-CARD
     card_name: 'step1'
@@ -30,19 +30,26 @@ _action_definitions:
     action_class: 'SetBits'
     required_bits: []
     data:
-      message: "Moving to a tile requires picking an action. Some tiles' actions set bits on your robot. Such as the {SOUTH} bit."
+      message: "When you move to a tile, you must pick an action. This tile has 2 actions. Both this tile's actions set bits on your robot, the {SOUTH} bit."
+
+  - &STEP2-ACTION-NULL
+    action_class: 'SetBits'
+    required_bits: []
+    data:
+      message: "This is the second choice."
 
   - &STEP2-CARD
     card_name: 'step2'
     bits: [SOUTH]
     actions:
       - *STEP2-ACTION
+      - *STEP2-ACTION-NULL
 
   - &STEP3-ACTION
     action_class: 'ClearBits'
     required_bits: []
     data:
-      message: "Other tiles' actions clear bits. {SOUTH} or {EAST}. For the next part of the tutorial, we are  going to strictly control your movement bits."
+      message: "Other tiles' actions clear bits. This will clear {SOUTH} or {EAST}.\nFor the next part of the tutorial, we are going to control your movement bits strictly, so you don't get lost."
 
   - &STEP3-CARD-1
     card_name: 'step3-1'
@@ -60,19 +67,26 @@ _action_definitions:
     action_class: 'SetBits'
     required_bits: []
     data:
-      message: "There are key bits that can be set, such as {RED}. They may be required by actions."
+      message: "This action sets {EAST,SOUTH} and {RED}."
+
+  - &STEP4-ACTION-GREEN
+    action_class: 'GainHealth'
+    required_bits: [GREEN]
+    data:
+      message: "Some actions require one or more key bits to be set.\nIf you haven't got {GREEN} yet, this action is greyed out to show that you can't use it."
 
   - &STEP4-CARD
     card_name: 'step4'
     bits: [RED, SOUTH, EAST]
     actions:
+      - *STEP4-ACTION-GREEN
       - *STEP4-ACTION
 
   - &STEP5-ACTION-BLUE
     action_class: 'GenericBits'
     required_bits: [BLUE]
     data:
-      message: "You need to have the {BLUE} bit, to use this action and continue. Some actions have more complex requirements."
+      message: "You need to have the {BLUE} bit to use this action to set {EAST} so that you can continue. This action clears {NORTH,SOUTH,WEST}."
       set: [EAST]
       clear: [NORTH, SOUTH, WEST]
 
@@ -80,13 +94,13 @@ _action_definitions:
     action_class: 'GenericBits'
     required_bits: []
     data:
-      message: "Go back."
+      message: "Go back: set {WEST} and clear {NORTH,SOUTH,EAST}."
       set: [WEST]
       clear: [EAST, SOUTH, NORTH]
 
   - &STEP5-CARD
     card_name: 'step5'
-    bits: []
+    bits: [NORTH, SOUTH, EAST, WEST]
     actions:
       - *STEP5-ACTION-BLUE
       - *STEP5-ACTION-DEFAULT
@@ -95,7 +109,7 @@ _action_definitions:
     action_class: 'GenericBits'
     required_bits: [RED]
     data:
-      message: "You need to have the {RED} bit, to use this action to set the {BLUE} bit."
+      message: "You need to have the {RED} bit to use this action to set {NORTH,BLUE}. This action also clears {SOUTH,EAST,WEST}."
       set: [NORTH, BLUE]
       clear: [SOUTH, EAST, WEST]
 
@@ -103,13 +117,13 @@ _action_definitions:
     action_class: 'GenericBits'
     required_bits: []
     data:
-      message: "This action doesn't require anything. Go back."
+      message: "This action doesn't require anything. It only sets {NORTH} and clears {SOUTH,EAST,WEST}."
       set: [NORTH]
       clear: [SOUTH, EAST, WEST]
 
   - &STEP6-CARD
     card_name: 'step6'
-    bits: [BLUE]
+    bits: [NORTH, SOUTH, EAST, WEST, BLUE]
     actions:
       - *STEP6-ACTION-RED
       - *STEP6-ACTION-DEFAULT
@@ -118,7 +132,7 @@ _action_definitions:
     action_class: 'SetBits'
     required_bits: []
     data:
-      message: "Almost there. You have free reign on this column. Collect yourself a win bit {WINTOKEN} to finish the level. Good luck!"
+      message: "Almost there. You have free rein in this column.\nFinish the game by collecting enough {WINTOKEN}: 1 in this level.\nGood luck!"
 
   - &STEP7-CARD
     card_name: 'step7'
@@ -160,7 +174,7 @@ _action_definitions:
     required_bits: [GREEN]
     data:
       direction: EAST
-      message: "Some actions change the game board."
+      message: "All of the actions on this tile require {GREEN}. Without it, you can't even enter.\nThis action moves tiles around on the game board."
 
   - &STEP10-CARD
     card_name: 'step10'
@@ -171,12 +185,13 @@ _action_definitions:
     action_class: 'GenericBits'
     required_bits: []
     data:
-      message: "We may have lied to you."
+      message: "We may have lied about restricting you to this column.\nSet {WEST}. Clear {NORTH,SOUTH,EAST}."
       set: [WEST]
       clear: [NORTH, SOUTH, EAST]
 
   - &STEP11-CARD
     card_name: 'step11'
+    bits: [NORTH, SOUTH, EAST, WEST]
     actions:
       - *STEP11-ACTION
 
@@ -184,12 +199,13 @@ _action_definitions:
     action_class: 'GenericBits'
     required_bits: []
     data:
-      message: "In this board, tiles didn't change. In the random games, after taking an action (or the timer expires) the tile will be replaced by another one."
+      message: "On this board, tiles don't change. In random games, after you take an action the tile will be replaced. Some tiles are also replaced when a timer expires.\nSet {NORTH}. Clear {SOUTH,EAST,WEST}."
       set: [NORTH]
       clear: [SOUTH, EAST, WEST]
 
   - &STEP12-CARD
     card_name: 'step12'
+    bits: [NORTH, SOUTH, EAST, WEST]
     actions:
       - *STEP12-ACTION
 
@@ -202,6 +218,7 @@ _action_definitions:
 
   - &STEP13-CARD
     card_name: 'step13'
+    bits: [EAST, NORTH, SOUTH, WEST]
     actions:
       - *STEP13-ACTION
 
@@ -214,6 +231,34 @@ _action_definitions:
     actions:
       - *WIN-ACTION
 
+  - &UNREACHABLE-KNIGHT-ACTION
+    action_class: 'AllowChessMove'
+    required_bits: [RED, GREEN]
+    data:
+      chesspiece: KNIGHT
+      message: "Some cards temporarily change the way you move. For one turn you can be a ♞..."
+
+  - &UNREACHABLE-CASTLE-ACTION
+    action_class: 'AllowChessMove'
+    required_bits: [RED, BLUE]
+    data:
+      chesspiece: CASTLE
+      message: "Or a ♜..."
+
+  - &UNREACHABLE-BISHOP-ACTION
+    action_class: 'AllowChessMove'
+    required_bits: [GREEN, BLUE]
+    data:
+      chesspiece: BISHOP
+      message: "Or a ♝!"
+
+  - &UNREACHABLE-CHESS-CARD
+    card_name: 'chess'
+    actions:
+      - *UNREACHABLE-KNIGHT-ACTION
+      - *UNREACHABLE-CASTLE-ACTION
+      - *UNREACHABLE-BISHOP-ACTION
+
 cards:
   - *STEP1-CARD
   - *STEP2-CARD
@@ -239,7 +284,7 @@ cards:
   - *STEP13-CARD
   - *STEP10-CARD
 
-  - *NULL-CARD
+  - *UNREACHABLE-CHESS-CARD
   - *NULL-CARD
   - *NULL-CARD
   - *STEP12-CARD