1 files changed, 20 insertions, 43 deletions

diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 8becafd3..f083396c 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -2,19 +2,17 @@
 // Author: Jenalya
 029-2,27,27,0|script|Sorfina|154,0,1
 {
-    setarray @npc_loc, 27, 27, 2;
+    set @npc_distance, 2;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Close;
+    if(@npc_check) end;
     goto L_Main;
 
 L_Main:
-    callfunc "TutorialState";
-    if (@tutorial == 10) goto L_Hasan;
-    if (@tutorial >= 4) goto L_Again;
-    if (@tutorial == 3) goto L_Clothes;
-    if (@tutorial == 2) goto L_Dresser;
-    if (@tutorial == 1) goto L_Carpet;
+    if (QL_BEGIN == 10) goto L_Hasan;
+    if (QL_BEGIN >= 4) goto L_Again;
+    if (QL_BEGIN == 3) goto L_Clothes;
+    if (QL_BEGIN == 2) goto L_Dresser;
+    if (QL_BEGIN == 1) goto L_Carpet;
     goto L_Start;
 
 L_Start:
@@ -60,8 +58,7 @@ L_Carpet:
     mes "Press [###keyMoveUp;] to move up, press [###keyMoveDown;] to move down, ";
     mes "press [###keyMoveLeft;] to move left, press [###keyMoveRight;] to move right ";
     mes " or click on the place you want to go to.\"";
-    set @tutorial_tmp, 1;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 1;
     goto L_Close;
 
 L_Dresser:
@@ -98,8 +95,7 @@ L_Clothes:
     mes "\"And here is some money for you. Don't spend it all in one place.";
     mes "Now go help Tanisha downstairs.\"";
     set Zeny, Zeny + 30;
-    set @tutorial_tmp, 4;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 4;
     goto L_Close;
 
 L_Again:
@@ -225,8 +221,7 @@ L_Next:
     mes "\"If Valon hadn't have come along that moment, Hasan would have died that day.\"";
     mes "\"However, the scorpions poison caused a bad fever and once Hasan had recovered from that, he was even more malicious than before.\"";
     mes "She sighs.";
-    set @tutorial_tmp, 11;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 11;
     goto L_Close;
 
 L_SkipTut:
@@ -246,27 +241,21 @@ L_Bye:
     getitem "CottonShirt", 1;
     getitem "RaggedShorts", 1;
     set Zeny, Zeny + 35; // tanisha gives 5 zeny
-    set @tutorial_tmp, 8;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 8;
     goto L_Close;
 
 L_Close:
     close;
 
 OnTouch:
-    callfunc "TutorialState";
-    if (@tutorial > 0)
+    if (QL_BEGIN > 0)
         end;
     goto L_Start;
 }
 
 029-2,33,27,0|script|#Carpet|32767,1,1
 {
-    end;
-
-OnTouch:
-    callfunc "TutorialState";
-    if (@tutorial != 1)
+    if (QL_BEGIN != 1)
         end;
     mes "[Sorfina]";
     mes "\"You should get dressed now.\"";
@@ -274,20 +263,19 @@ OnTouch:
     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.\"";
     next;
     mes "\"Now get the clothes out of the dresser.\"";
-    set @tutorial_tmp, 2;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 2;
     close;
 }
 
 029-2,29,23,0|script|Dresser#tutorial|400
 {
-    setarray @npc_loc, 29, 23, 2;
+    set @npc_distance, 2;
+    set @distance_handler, 1;
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_CloseDis;
-    callfunc "TutorialState";
-    if (@tutorial > 2) goto L_Empty;
-    if (@tutorial == 2) goto L_Shirt;
+    if (QL_BEGIN > 2) goto L_Empty;
+    if (QL_BEGIN == 2) goto L_Shirt;
     goto L_Walk;
 
 L_Walk:
@@ -304,8 +292,7 @@ L_Shirt:
     mes "\"You can open your inventory by pressing F3 or clicking on the 'Inventory' button in the bar at the upper right corner.\"";
     next;
     mes "\"After we finish talking, click on the clothes and press the equip button.\"";
-    set @tutorial_tmp, 3;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 3;
     close;
 
 L_Empty:
@@ -319,11 +306,7 @@ L_CloseDis:
 
 029-2,44,31,0|script|#DoorOutTut1|45,0,0
 {
-    end;
-
-OnTouch:
-    callfunc "TutorialState";
-    if (@tutorial < 4)
+    if (QL_BEGIN < 4)
         goto L_Block;
     warp "029-2", 112, 85;
     end;
@@ -334,9 +317,6 @@ L_Block:
 }
 029-2,23,24,0|script|#GameRules1|32767,0,1
 {
-    end;
-
-OnTouch:
     if (TUT_var > 0)
         end;
     mes "[Server/Client Notice]";
@@ -347,9 +327,6 @@ OnTouch:
 }
 029-2,21,24,0|script|#GameRules2|32767,0,1
 {
-    end;
-
-OnTouch:
     if (TUT_var > 0)
         end;
     callfunc "GameRules";