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

Quest Log example

1 files changed, 10 insertions, 14 deletions

diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index a5d3894b..99e5ea1e 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -12,7 +12,7 @@
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_End;
-    if (@tutorial >= 13)
+    if (QL_BEGIN >= 13)
         goto L_TutDone;
     message strcharinfo(0), "He looks too afraid to say anything.";
     goto L_End;
@@ -33,16 +33,15 @@ L_End:
     goto L_Main;
 
 L_Main:
-    callfunc "TutorialState";
     if ((getcharid(3) == $@ScorpionFighter) || ($@ScorpionFighter && $@ScorpionFighter != getcharid(3)))
         goto L_Afraid;
-    if (@tutorial == 14)
+    if (QL_BEGIN == 14)
         goto L_TutDone;
-    if (@tutorial == 13)
+    if (QL_BEGIN == 13)
         goto L_Thank;
-    if (@tutorial == 12)
+    if (QL_BEGIN == 12)
         goto L_Trick;
-    if ((@tutorial == 9) || (@tutorial == 10) || (@tutorial == 11))
+    if ((QL_BEGIN == 9) || (QL_BEGIN == 10) || (QL_BEGIN == 11))
         goto L_FightAgain;
 
     mes "You over hear some people nearby.";
@@ -60,8 +59,7 @@ L_Main:
     mes "[Scared Man]";
     mes "\"No, please don't. *sob*\"";
     mes "Sounds like this person is in trouble.\"";
-    set @tutorial_tmp, 9;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 9;
     mes "[Unfriendly Guy]";
     mes "\"What are you looking at?\"";
     menu
@@ -112,8 +110,7 @@ L_Thank:
     mes "\"Let me tell you something, I will no longer bully people.";
     mes "And you can have my Sharp Knife.\"";
     getitem "SharpKnife", 1;
-    set @tutorial_tmp, 14;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 14;
     mes "\"You want to go to Hurnscald, right? Shall I tell you how to get there?\"";
     menu
         "Sure, thanks.",L_HasanThanks,
@@ -152,7 +149,7 @@ L_Close:
     close;
 
 OnTouch:
-    if (@tutorial >= 13)
+    if (QL_BEGIN >= 13)
         end;
     goto L_Main;
 }
@@ -187,10 +184,9 @@ OnTimer5000:
 OnScorpionDeath:
     if (getcharid(3) != $@ScorpionFighter)
         goto L_SummonAgain;
-    if (@tutorial != 12)
+    if (QL_BEGIN != 12)
         goto L_Clean;
-    set @tutorial_tmp, 13;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 13;
     message strcharinfo(0), "You saved Hasan.";
     goto L_Clean;