Some of the Tonori Area Quests

2 files changed, 18 insertions, 37 deletions

diff --git a/world/map/npc/002-3/mining_camp_barrier.txt b/world/map/npc/002-3/mining_camp_barrier.txt
index a6550990..baf815c5 100644
--- a/world/map/npc/002-3/mining_camp_barrier.txt
+++ b/world/map/npc/002-3/mining_camp_barrier.txt
@@ -1,10 +1,6 @@
-//Sandstorm mine barrier
-
 002-3,82,32,0|script|#Sandstorm_Mine_Barrier|45,0,0
 {
-    set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-
-    if (@state >= 8) goto L_Barrier_Open;
+    if (QL_MINEALL >= 8) goto L_Barrier_Open;
 
     message strcharinfo(0), "Some force seems to block your entrance.";
     goto L_End;
@@ -14,6 +10,5 @@ L_Barrier_Open:
     goto L_End;
 
 L_End:
-    set @state, 0;
     end;
 }
diff --git a/world/map/npc/002-3/nathan.txt b/world/map/npc/002-3/nathan.txt
index 125c6a01..bf484907 100644
--- a/world/map/npc/002-3/nathan.txt
+++ b/world/map/npc/002-3/nathan.txt
@@ -1,29 +1,24 @@
-// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
-
 002-3,42,45,6|script|Nathan|109
 {
-    set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-
-    if (@state >= 20) goto L_Nathan_Complete;
-    if (@state == 19) goto L_Nathan_UGQ_Naem;
-    if (@state == 18) goto L_Nathan_Help_Cool;
-    if (@state == 17) goto L_Nathan_Help_Done;
-    if (@state == 16) goto L_Nathan_Waits_3;
-    if (@state == 15) goto L_Nathan_Help_3;
-    if (@state == 14) goto L_Nathan_Waits_2;
-    if (@state == 13) goto L_Nathan_Help_2;
-    if (@state == 12) goto L_Nathan_Waits_1;
-    if (@state == 11) goto L_Nathan_Help_1;
-    if (@state == 9) goto L_Nathan_Cool;
-    if (@state == 8) goto L_Nathan_Okay;
+    if (QL_MINEALL >= 20) goto L_Nathan_Complete;
+    if (QL_MINEALL == 19) goto L_Nathan_UGQ_Naem;
+    if (QL_MINEALL == 18) goto L_Nathan_Help_Cool;
+    if (QL_MINEALL == 17) goto L_Nathan_Help_Done;
+    if (QL_MINEALL == 16) goto L_Nathan_Waits_3;
+    if (QL_MINEALL == 15) goto L_Nathan_Help_3;
+    if (QL_MINEALL == 14) goto L_Nathan_Waits_2;
+    if (QL_MINEALL == 13) goto L_Nathan_Help_2;
+    if (QL_MINEALL == 12) goto L_Nathan_Waits_1;
+    if (QL_MINEALL == 11) goto L_Nathan_Help_1;
+    if (QL_MINEALL == 9) goto L_Nathan_Cool;
+    if (QL_MINEALL == 8) goto L_Nathan_Okay;
 
     mes "[Nathan the Miner]";
     mes "\"It's very dangerous in here. We had a big earthquake here just recently, too... so be careful!\"";
     goto L_Close;
 
 L_Nathan_Okay:
-    set @state, 9;
-    callsub S_Update_Var;
+    set QL_MINEALL, 9;
     mes "[Nathan]";
     mes "\"Hey there!  Just mining away down here. You say Nickos was worried about us?  Nothing down here we can't handle, but you should try to be safe down here yourself. The monsters can be rather aggressive. Come to think of it, you might want to check on Naem to make sure he's okay. You can find him in the southeast parts of the mine.\"";
     goto L_Close;
@@ -34,8 +29,7 @@ L_Nathan_Cool:
     goto L_Close;
 
 L_Nathan_Help_1:
-    set @state, 12;
-    callsub S_Update_Var;
+    set QL_MINEALL, 12;
     mes "[Nathan]";
     mes "\"Oh, hey again!  Nickos told you we need some help down here too?  Yeah, Naem could use a spare pair of hands moving his bags of ore to me. He's got a lot of work built up. Just go talk to him and he'll give you the bags. You might have to make a few trips, but I'll make it worth your troubles.\"";
     goto L_Close;
@@ -46,8 +40,7 @@ L_Nathan_Waits_1:
     goto L_Close;
 
 L_Nathan_Help_2:
-    set @state, 14;
-    callsub S_Update_Var;
+    set QL_MINEALL, 14;
     mes "You give the bag of ore to Nathan";
     next;
     mes "[Nathan]";
@@ -60,8 +53,7 @@ L_Nathan_Waits_2:
     goto L_Close;
 
 L_Nathan_Help_3:
-    set @state, 16;
-    callsub S_Update_Var;
+    set QL_MINEALL, 16;
     mes "You hand the bag of ore to Nathan.";
     next;
     mes "[Nathan]";
@@ -77,8 +69,7 @@ L_Nathan_Help_Done:
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_Nathan_TooMany;
-    set @state, 18;
-    callsub S_Update_Var;
+    set QL_MINEALL, 18;
     getitem "MinersHat", 1;
     mes "[Nathan]";
     mes "You hand the bag of ore to Nathan.";
@@ -109,10 +100,5 @@ L_Nathan_Complete:
     goto L_Close;
 
 L_Close:
-    set @state, 0;
     close;
-
-S_Update_Var:
-    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
-    return;
 }