Merge pull request #337 from wushin/quest-log-with-bits

Quest Log example

1 files changed, 8 insertions, 10 deletions

diff --git a/world/map/npc/029-1/kaan.txt b/world/map/npc/029-1/kaan.txt
index 1c3cf0bb..57ab1d4c 100644
--- a/world/map/npc/029-1/kaan.txt
+++ b/world/map/npc/029-1/kaan.txt
@@ -8,13 +8,13 @@
     if (@npc_check)
         goto L_OutOfRange;
 
-    callfunc "TutorialState";
+    set @kaan_talked, (STARTAREA & $@SpokeToKaan);
     if (!(@kaan_talked)) goto L_Tanisha;
-    if (@tutorial >= 13) goto L_TutDone;
-    if (@tutorial == 12) goto L_Plan;
-    if (@tutorial == 11) goto L_TrickKnown;
-    if (@tutorial == 10) goto L_Trick;
-    if (@tutorial == 9) goto L_Hasan;
+    if (QL_BEGIN >= 13) goto L_TutDone;
+    if (QL_BEGIN == 12) goto L_Plan;
+    if (QL_BEGIN == 11) goto L_TrickKnown;
+    if (QL_BEGIN == 10) goto L_Trick;
+    if (QL_BEGIN == 9) goto L_Hasan;
     goto L_Out;
 
 L_OutOfRange:
@@ -69,8 +69,7 @@ L_Next1:
     mes "\"Sometimes he just freaks out and then he's dangerous.";
     mes "He might listen to one of the adult men, but they're all off to work in Hurnscald during the day.\"";
     mes "\"We should think about some kind of trick. Ah, if only I knew his weak point.\"";
-    set @tutorial_tmp, 10;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 10;
     goto L_Trick;
 
 L_Trick:
@@ -91,8 +90,7 @@ L_Next2:
     mes "[Kaan]";
     mes "\"Scorpions?! Right! How could I forget?";
     mes "When he was a child, he nearly died because he fell into a scorpion nest.\"";
-    set @tutorial_tmp, 12;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 12;
     next;
     goto L_Explain;