Starting Area Redux

* Tutorial is a quick funnel
* Exits are obvious and open
* New Side Quests
** Valon's Beast Mastery
** Zegas's Barrels
** Magic Wand
* Some Quests stay open after tutorial is done
* House Maggot & Tame Scorpion added
* Made Magic usable for lowbies with Wand

1 files changed, 9 insertions, 15 deletions

diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index d2ba5877..0d71cee3 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
@@ -1,12 +1,11 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 
-042-1.gat,103,92,0|script|Kaan|160,
+042-1.gat,109,87,0|script|Kaan|160,
 {
-    if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
     callfunc "TutorialState";
-    if (@tutorial == 13) goto L_Hasan_Saved;
-    if ($@ScorpionFighter == getcharid(3)) goto L_Run;
+    if ((@hasan_complete) && (@tutorial == 13)) goto L_Hasan_Saved;
+    if (@hasan_complete) goto L_TutDone;
     if (@tutorial == 12) goto L_Plan;
     if ((@tutorial == 11) && ((@sorfina_hasan) || (@tanisha_hasan))) goto L_TrickKnown;
     if (@tutorial == 11) goto L_Trick;
@@ -68,7 +67,7 @@ L_Next:
     callfunc "SetTutorialMask";
     if (hasan)
         menu
-            "A guy named Hasan won't let me enter Tulimshar.",L_Hasan,
+            "A guy named Hasan is bullying someone.",L_Hasan,
             "Thanks for the advice.",L_Close;
     goto L_Out;
 
@@ -82,7 +81,7 @@ L_Hasan:
     mes "[Kaan]";
     mes "\"Hello! How are you? Did you already visit Tulimshar?\"";
     menu
-        "A guy named Hasan won't let me enter Tulimshar.",L_Next1,
+        "A guy named Hasan is bullying someone.",L_Next1,
         "Not yet.",L_Close;
 
 L_Next1:
@@ -130,7 +129,7 @@ L_Explain:
     mes "I'll watch you from this point.\"";
     next;
     mes "\"When you give me the sign, I'll throw the scorpion on him.";
-    mes "While he's distracted with the scorpion, you can pass.\"";
+    mes "I bet that will show him for the coward he really is.\"";
     next;
     mes "\"How's that? We can start as soon as you're ready.\"";
     goto L_Close;
@@ -145,23 +144,18 @@ L_Plan:
 
 L_Hasan_Saved:
     mes "[Kaan]";
-    mes "\"I told you to pass when he's distracted, not to fight the scorpion!";
-    mes "But maybe Hasan is thankful now?\"";
+    mes "\"You did not to fight the scorpion.";
+    mes "But maybe Hasan is more thankful now?\"";
     next;
     mes "\"Why don't you talk to him again and see what he says.\"";
     goto L_Close;
 
-L_Tut_Done:
+L_TutDone:
     mes "[Kaan]";
     mes "\"Hi there. I hope you enjoy your time in Tulimshar.";
     mes "Hasan can be a real troublemaker, but it seems like he has calmed down for now.\"";
     goto L_Close;
 
-L_Run:
-    mes "[Kaan]";
-    mes "\"He's distracted! What are you waiting for?\"";
-    goto L_Close;
-
 L_Close:
     close;
 }