From f6932374aba84c3629e1f94d8e62696d601d3722 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefano@rivera.za.net>
Date: Sat, 17 May 2014 23:28:01 +0200
Subject: [PATCH] Address some tutorial usability issues raised by Desilu

---
 data/location_decks/introduction.yaml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/data/location_decks/introduction.yaml b/data/location_decks/introduction.yaml
index e1011f0..ac72c89 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!\nYou can see everything, but only move in directions that you have bits set for. Now, only {EAST}.\nYour movement options are shown as chequered squares."
 
   - &STEP1-CARD
     card_name: 'step1'
@@ -32,17 +32,24 @@ _action_definitions:
     data:
       message: "Moving to a tile requires picking an action. Some tiles' actions set bits on your robot. Such as the {SOUTH} bit."
 
+  - &STEP2-ACTION-NULL
+    action_class: 'SetBits'
+    required_bits: []
+    data:
+      message: "So does this one. See, we gave you a 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 strictly control your movement bits, so you don't get lost."
 
   - &STEP3-CARD-1
     card_name: 'step3-1'
@@ -60,7 +67,7 @@ _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. This action also sets some movement bits."
+      message: "There are key bits that can be set, such as {RED}. They may be required by actions.\nThis action also sets {EAST,SOUTH}."
 
   - &STEP4-CARD
     card_name: 'step4'
@@ -72,7 +79,7 @@ _action_definitions:
     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 and continue.\nSome actions have more complex requirements."
       set: [EAST]
       clear: [NORTH, SOUTH, WEST]
 
@@ -80,7 +87,7 @@ _action_definitions:
     action_class: 'GenericBits'
     required_bits: []
     data:
-      message: "Go back. Set {WEST}. Clear {NORTH,SOUTH,EAST}."
+      message: "Go back.\nSet {WEST}. Clear {NORTH,SOUTH,EAST}."
       set: [WEST]
       clear: [EAST, SOUTH, NORTH]
 
@@ -103,7 +110,7 @@ _action_definitions:
     action_class: 'GenericBits'
     required_bits: []
     data:
-      message: "This action doesn't require anything. Go back. Set {NORTH}. Clear {SOUTH,EAST,WEST}."
+      message: "This action doesn't require anything. Go back.\nSet {NORTH}. Clear {SOUTH,EAST,WEST}."
       set: [NORTH]
       clear: [SOUTH, EAST, WEST]
 
@@ -118,7 +125,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 reign on this column.\nFinish the game by collecting enough {WINTOKEN}. 1 in this level.\nGood luck!"
 
   - &STEP7-CARD
     card_name: 'step7'
@@ -171,7 +178,7 @@ _action_definitions:
     action_class: 'GenericBits'
     required_bits: []
     data:
-      message: "We may have lied to you. Set {WEST}. Clear {NORTH,SOUTH,EAST}."
+      message: "We may have lied to you about restricting to this column.\nSet {WEST}. Clear {NORTH,SOUTH,EAST}."
       set: [WEST]
       clear: [NORTH, SOUTH, EAST]
 
@@ -185,7 +192,7 @@ _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. Set {NORTH}. Clear {SOUTH,EAST,WEST}."
+      message: "In this board, tiles didn't change. In the random games, after taking an action (or a timer expires) the tile will be replaced.\nSet {NORTH}. Clear {SOUTH,EAST,WEST}."
       set: [NORTH]
       clear: [SOUTH, EAST, WEST]
 
-- 
2.34.1