1 files changed, 10 insertions, 20 deletions
diff --git a/world/map/npc/029-1/zegas.txt b/world/map/npc/029-1/zegas.txt
index f9cefcbd..a350447d 100644
--- a/world/map/npc/029-1/zegas.txt
+++ b/world/map/npc/029-1/zegas.txt
@@ -3,26 +3,19 @@
 // Npc
 029-1,45,85,0|script|Zegas|165
 {
-    setarray @npc_loc, 45, 85, 2;
+    set @npc_distance, 2;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Range;
 
-    callfunc "CheckBarrelQuest";
-    if (@barrel_quest == 1)
+    if (QL_ZEGAS == 1)
         goto L_Find;
-    if (@barrel_quest == 2)
+    if (QL_ZEGAS == 2)
         goto L_Looking;
-    if (@barrel_quest == 3)
+    if (QL_ZEGAS == 3)
         goto L_QuestEnd;
-    if (@barrel_quest == 4)
+    if (QL_ZEGAS == 4)
         goto L_Thanks;
     goto L_Meet;
 
-L_Range:
-    message strcharinfo(0), "Whats that? Come closer I can't hear you.";
-    goto L_Close;
-
 L_Meet:
     mes "[Zegas]";
     mes "\"Hey do you have a second?\"";
@@ -32,8 +25,7 @@ L_Meet:
     mes "\"Wouldn't you know it, the bug bomb Eomie gave us is in one of the store room barrels.\"";
     next;
     mes "\"Can you search the barrels for the bug bomb and set it off when you find it?\"";
-    set @barrel_tmp, 1;
-    callfunc "SetBarrelMask";
+    set QL_ZEGAS, 1;
     menu
         "Sure.",L_Start,
         "Maybe some other time.",L_Close;
@@ -49,8 +41,7 @@ L_Find:
 
 L_Start:
     mes "[Zegas]";
-    set @barrel_tmp, 2;
-    callfunc "SetBarrelMask";
+    set QL_ZEGAS, 2;
     mes "\"Thanks, come back and see me once you found the bug bomb and set it off.\"";
     goto L_Close;
 
@@ -62,11 +53,10 @@ L_Looking:
 L_QuestEnd:
     mes "[Zegas]";
     mes "\"From the smell I can see you found the bug bomb!\"";
-    mes "\"Thanks once again, I know it's not much but here is 50 GP for your troubles.\""; 
+    mes "\"Thanks once again, I know it's not much but here is 50 GP for your troubles.\"";
     getexp 50, 0;
     set Zeny, (Zeny + 50);
-    set @barrel_tmp, 4;
-    callfunc "SetBarrelMask";
+    set QL_ZEGAS, 4;
     goto L_Close;
 
 L_Thanks:
@@ -86,7 +76,7 @@ L_Close:
         "No.", L_Close;
 
 L_Reset:
-    set STARTAREA, (STARTAREA & ~(NIBBLE_4_MASK) | (0 << NIBBLE_4_SHIFT));
+    set QL_ZEGAS, 0;
     set STARTAREA, STARTAREA &~ (1 << 20);
     set STARTAREA, STARTAREA &~ (1 << 21);
     set STARTAREA, STARTAREA &~ (1 << 22);