Merge pull request #123 from wushin/starting-area-fix

Starting Area Redux

1 files changed, 51 insertions, 21 deletions

diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index 841a667a..4301d124 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
@@ -1,7 +1,33 @@
 // This file is part of the Tutorial
 // Author: Jenalya
+042-2.gat,21,26,0|script|TutDebug|154,
+{
+    mes "[TutDebug]";
+    mes "Reset?";
+    menu
+        "Yes.",L_Reset,
+        "No.",L_End;
+
+L_Reset:
+    set TUT_var, 0;
+    set @tutorial_tmp, 0;
+    set TUTORIAL, (TUTORIAL & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
+    set TUTORIAL, TUTORIAL &~ $@SorfinaHasanBit;
+    set TUTORIAL, TUTORIAL &~ $@TanishaHasanBit;
+    set TUTORIAL, TUTORIAL &~ $@HasanCompleteBit;
+    set FLAGS, FLAGS &~ FLAG_TUTORIAL_DONE;
+    mes "Reset!";
+    goto L_End;
+
+L_End:
+    end;
 
-042-2.gat,28,26,0|script|Sorfina|154,4,4
+OnInit:
+    if(!debug)
+        disablenpc "TutDebug";
+    end;
+}
+042-2.gat,28,26,0|script|Sorfina|154,1,4
 {
     callfunc "TutorialState";
 
@@ -17,8 +43,8 @@ L_Heal:
     goto L_Main;
 
 L_Main:
-    if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again;
     if ((@tutorial == 11) && !(@sorfina_hasan)) goto L_Hasan;
+    if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again;
     if (@tutorial >= 4) goto L_Again;
     if (@tutorial == 3) goto L_Clothes;
     if (@tutorial == 2) goto L_Chest;
@@ -66,7 +92,9 @@ L_Tut:
 L_Carpet:
     mes "[Sorfina]";
     mes "\"Try to take a few steps and walk to that red carpet over there.";
-    mes "Just use the arrow keys or click on the place you want to go to.\"";
+    mes "Just use the ###keyMoveUp; to move up, ###keyMoveDown; to move down, ";
+    mes " ###keyMoveLeft; to move left, ###keyMoveRight; to move right ";
+    mes " or click on the place you want to go to.\"";
     set @tutorial_tmp, 1;
     callfunc "SetTutorialMask";
     goto L_Close;
@@ -75,18 +103,18 @@ L_Chest:
     mes "[Sorfina]";
     mes "\"In that chest there are some clothes you can take.\"";
     next;
-    mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.\"";
+    mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press ###keyTargetNPC; to focus and ###keyTalk; to talk/activate.\"";
     next;
     mes "\"Now get the clothes out of the chest.\"";
     goto L_Close;
 
 L_Naked:
     mes "[Sorfina]";
-    mes "\"Press F3 or click on the Inventory button in the bar at the upper right corner to open your bag.\"";
+    mes "\"Press ###keyWindowInventory; or click on the Inventory button in the bar at the upper right corner to open your bag.\"";
     next;
-    mes "\"Once we stop talking, click on the clothes and press the equip button.\"";
+    mes "\"Once we stop talking, double-click on the clothes to equip.\"";
     next;
-    mes "\"Talk to me again after you get dressed. You can either click on me, or press N to focus on me and T to talk.\"";
+    mes "\"Talk to me again after you get dressed. You can either click on me, or press ###keyTargetNPC; to focus on me and ###keyTalk; to talk.\"";
     goto L_Close;
 
 L_Clothes:
@@ -136,23 +164,25 @@ L_Explain:
 L_Walk:
     mes "[Sorfina]";
     mes "\"You can use the arrow keys to walk around.";
-    mes "Or just click on the place you want to go to.";
-    mes "But this only works if that place is reachable and walkable.\"";
+    mes "Just use the ###keyMoveUp; to move up, ###keyMoveDown; to move down, ";
+    mes " ###keyMoveLeft; to move left, ###keyMoveRight; to move right ";
+    mes " or click on the place you want to go to.\"";
+    mes "This only works if that place is reachable and walkable.\"";
     goto L_Close;
 
 L_Talk:
     mes "[Sorfina]";
     mes "\"If you want to talk to a normal person, you can click at him or her.";
-    mes "Or you can press N to focus on the nearest person and then press T to talk.\"";
+    mes "Or you can press ###keyTargetNPC; to focus on the nearest person and then press ###keyTalk; to talk.\"";
     next;
-    mes "\"If you want to talk to other adventurers, press Enter to open your chat window.";
+    mes "\"If you want to talk to other adventurers, press ###keyChat; to open your chat window.";
     mes "Then type your message and press Enter to send.\"";
     next;
     mes "\"You may want to talk privately to another adventurer sometimes. In that case you can whisper.";
-    mes "After pressing Enter type '/whisper [name] [message]'.";
+    mes "After pressing ###keyChat; type '/whisper [name] [message]'.";
     mes "Or you can right click on someone and choose the whisper option.\"";
     next;
-    mes "\"Press F7 to show and hide your chat window.\"";
+    mes "\"Press ###keyWindowChat; to show and hide your chat window.\"";
     goto L_Close;
 
 L_Items:
@@ -171,16 +201,16 @@ L_Items:
     mes "\"Your HitchHikers Towel will return you to your last set soul menhir or here if not set.\"";
     mes "\"It can't be used constantly as the magic needs time to power the jump.\"";
     next;
-    mes "\"Press F3 to open your inventory.";
+    mes "\"Press ###keyWindowInventory; to open your inventory.";
     mes "When placing your cursor over an item there, you can see a box with some information about that item.\"";
     next;
-    mes "\"To use or equip an item, select it by clicking on it.";
-    mes "Then press Use or Equip.\"";
+    mes "\"To use or equip an item, select it by double-clicking on it.";
+    mes "Selecting the item then pressing Use or Equip also works.\"";
     goto L_Close;
 
 L_Shortcut:
     mes "[Sorfina]";
-    mes "\"Press F8  or click the Shortcut button in the bar at the upper right to open your shortcut window.\"";
+    mes "\"Press ###keyOutfitShortcut1; or click the Shortcut button in the bar at the upper right to open your shortcut window.\"";
     next;
     mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\"";
     next;
@@ -207,7 +237,7 @@ L_Hasan:
     mes "[Sorfina]";
     mes "\"Make yourself at home! Do you have any questions?\"";
         menu
-            "A guy named Hasan won't let me enter Tulimshar.",L_Next,
+            "A guy named Hasan is bullying people.",L_Next,
             "Yes, could you explain again about...",L_Explain,
             "No, thanks.",L_Close;
 
@@ -291,7 +321,7 @@ OnTouch:
     close;
 }
 
-042-2.gat,27,23,0|script|Chest#tutorial|111,
+042-2.gat,29,23,0|script|Chest#tutorial|111,
 {
     callfunc "TutorialState";
     if (@tutorial > 2) goto L_Empty;
@@ -320,7 +350,7 @@ L_Empty:
     close;
 }
 
-042-2.gat,44,31,0|script|#DoorOut-@tutorial|45,0,0
+042-2.gat,44,31,0|script|#DoorOutTut1|45,0,0
 {
     end;
 
@@ -328,7 +358,7 @@ OnTouch:
     callfunc "TutorialState";
     if ((@tutorial < 4) && !(FLAGS & FLAG_TUTORIAL_DONE))
             goto L_Block;
-    warp "042-1.gat", 63, 49;
+    warp "042-1.gat", 51, 44;
     end;
 
 L_Block: