Some of the Tonori Area Quests

1 files changed, 8 insertions, 21 deletions

diff --git a/world/map/npc/001-2/fieri.txt b/world/map/npc/001-2/fieri.txt
index dbf12c2e..0d122fb2 100644
--- a/world/map/npc/001-2/fieri.txt
+++ b/world/map/npc/001-2/fieri.txt
@@ -1,13 +1,9 @@
-// Variables used: nibble 0 of QUEST_SouthTulimshar
-
 001-2,114,89,0|script|Fieri|117
 {
-    set @state, ((QUEST_SouthTulimshar & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT);
-
-    if (@state >= 4) goto L_Done2;
-    if (@state == 3) goto L_Progress2;
-    if (@state == 2) goto L_Done1;
-    if (@state == 1) goto L_Progress;
+    if (QL_FIERI >= 4) goto L_Done2;
+    if (QL_FIERI == 3) goto L_Progress2;
+    if (QL_FIERI == 2) goto L_Done1;
+    if (QL_FIERI == 1) goto L_Progress;
 
     set @TEMP, rand(2);
     if(@TEMP == 1) goto L_Opening1;
@@ -50,8 +46,7 @@ L_Req1:
     goto L_Set;
 
 L_Set:
-    set @state, 1;
-    callsub S_Update_Var;
+    set QL_FIERI, 1;
     mes "[Fieri]";
     mes "\"Please bring it to me!\"";
     goto L_Close;
@@ -66,8 +61,7 @@ L_Progress:
     delitem "Beer", 1;
     getexp 100, 0;
     getitem "CherryCake", 5;
-    set @state, 2;
-    callsub S_Update_Var;
+    set QL_FIERI, 2;
     next;
     mes "\"Now let's see...\"";
     goto L_Close;
@@ -82,8 +76,7 @@ L_Progress2:
     delitem "MaggotSlime", 3;
     getexp 100, 0;
     getitem "TonoriDelight", 3;
-    set @state, 4;
-    callsub S_Update_Var;
+    set QL_FIERI, 4;
     goto L_Close;
 
 L_NotEnough:
@@ -103,8 +96,7 @@ L_Done1:
     next;
     mes "\"I need 3 Maggot Slimes for that.\"";
     mes "\"Bring them to me, and I'll give you something nice.\"";
-    set @state, 3;
-    callsub S_Update_Var;
+    set QL_FIERI, 3;
     goto L_Close;
 
 L_Done2:
@@ -116,7 +108,6 @@ L_Done2:
 
 L_Close:
     set @TEMP, 0;
-    set @state, 0;
     close;
 
 L_TooMany:
@@ -124,8 +115,4 @@ L_TooMany:
     mes "[Fieri]";
     mes "\"You don't have room for my reward. I'll wait until you do.\"";
     goto L_Close;
-
-S_Update_Var:
-    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_6_MASK) | (@state << NIBBLE_6_SHIFT));
-    return;
 }