1 files changed, 33 insertions, 32 deletions

diff --git a/npc/009-4/orum.txt b/npc/009-4/orum.txt
index 42ae60d9..e0ab8d68 100644
--- a/npc/009-4/orum.txt
+++ b/npc/009-4/orum.txt
@@ -7,22 +7,22 @@
         "Display Quest", L_Display;
 
 L_SetQuest:
-    input @quest_state;
-    OrumQuest = @quest_state;
-    goto L_close;
+    input .@quest_state;
+    setq(MagicQuest_DarkMage, .@quest_state);
+    closeclientdialog;
+    close;
 
 L_ResetQuest:
-    OrumQuest = 0;
+    setq(MagicQuest_DarkMage, 0);
     OrumQuestBarrier = 0;
     OrumQuestTorch = 0;
-    goto L_close;
+    closeclientdialog;
+    close;
 
 L_Display:
-    mes OrumQuest;
-    goto L_close;
-
-L_close:
-    end;
+    mes getq(MagicQuest_DarkMage);
+    closeclientdialog;
+    close;
 
 OnInit:
     if (!debug)
@@ -46,7 +46,7 @@ OnInit:
 
     @Exp_BREAK_BARRIERS = 5000;
 
-    if (OrumQuest > 0) goto L_Started;
+    if (getq(MagicQuest_DarkMage) > 0) goto L_Started;
 
     mes "[Orum]";
     mes "\"It's not wise to venture around this place! Well hmm... I guess since you're here, maybe you can lend a little help?\"";
@@ -149,19 +149,20 @@ L_Next4:
 L_Start_Gathering:
     mes "[Orum]";
     mes "\"That's the spirit! But try not to take too long.\"";
-    OrumQuest = 1;
+    setq(MagicQuest_DarkMage, 1);
     goto L_close;
 
 L_Started:
-    if (OrumQuest == 1) goto L_Gathering;
-    if (OrumQuest == 2) goto L_Use_First_Barrier;
-    if (OrumQuest == 3) goto L_Explore;
-    if (OrumQuest == 4) goto L_Found_Barriers;
-    if (OrumQuest == 5) goto L_Found_Barriers;
-    if (OrumQuest == 6) goto L_Found_Torches;
-    if (OrumQuest == 7) goto L_Still_Gathering;
-    if (OrumQuest == 8) goto L_Finish_Up;
-    if (OrumQuest >= 9) goto L_Finished_Up;
+    .@q=getq(MagicQuest_DarkMage);
+    if (.@q == 1) goto L_Gathering;
+    if (.@q == 2) goto L_Use_First_Barrier;
+    if (.@q == 3) goto L_Explore;
+    if (.@q == 4) goto L_Found_Barriers;
+    if (.@q == 5) goto L_Found_Barriers;
+    if (.@q == 6) goto L_Found_Torches;
+    if (.@q == 7) goto L_Still_Gathering;
+    if (.@q == 8) goto L_Finish_Up;
+    if (.@q >= 9) goto L_Finished_Up;
     goto L_close;
 
 L_Gathering:
@@ -230,7 +231,7 @@ L_Missing_Materials:
     goto L_close;
 
 L_Setup_Lair:
-    OrumQuest = 2;
+    setq(MagicQuest_DarkMage, 2);
     callfunc "SetUpOrumQuest";
     goto L_close;
 
@@ -354,7 +355,7 @@ L_Next7:
     goto L_close;
 
 L_Gathering_More:
-    OrumQuest = 7;
+    setq(MagicQuest_DarkMage, 7);
     mes "[Orum]";
     mes "\"Wonderful! Try to make it quick, we must save Waric!\"";
     goto L_close;
@@ -413,10 +414,10 @@ L_F_Gather_More:
     next;
     mes "\"I'm weary, I must take some time to rest. Why don't you go ahead and experiment with these powders on that torch and let me know if you figure what they have to do with it.\"";
 
-    getitem "RedPowder", @BT_REWARDCOUNT;
-    getitem "YellowPowder", @BT_REWARDCOUNT;
-    getitem "BluePowder", @BT_REWARDCOUNT;
-    OrumQuest = 8;
+    getitem RedPowder, @BT_REWARDCOUNT;
+    getitem YellowPowder, @BT_REWARDCOUNT;
+    getitem BluePowder, @BT_REWARDCOUNT;
+    setq(MagicQuest_DarkMage, 8);
     goto L_close;
 
 L_Missing_Mats_M:
@@ -507,7 +508,7 @@ L_Next11:
     goto L_close;
 
 L_Enter_Cavern:
-    if (OrumQuest >= 10) goto L_Ready_Cavern;
+    if (getq(MagicQuest_DarkMage) >= 10) goto L_Ready_Cavern;
 
     mes "Orum heads to the barrier then gives you a look as if he does not believe you before walking forward.";
     next;
@@ -516,7 +517,7 @@ L_Enter_Cavern:
 
 L_Ready_Cavern:
     // you should not get that twice ;)
-    if (OrumQuest == 12) goto L_Got_Reward;
+    if (getq(MagicQuest_DarkMage) == 12) goto L_Got_Reward;
 
     mes "Orum heads to the barrier then gives you a look as if he does not believe you before walking forward.";
     next;
@@ -526,11 +527,11 @@ L_Ready_Cavern:
     mes "\"Very good work you have done! Please take this for your efforts. It has helped me in a bind.\"";
     next;
     getinventorylist;
-    if ((checkweight("CandleHelmet", 1) == 0) || (@inventorylist_count == 100))
+    if ((checkweight(CandleHelmet, 1) == 0) || (@inventorylist_count == 100))
         goto L_Inventory;
     getexp @Exp_BREAK_BARRIERS, 0;
-    getitem "CandleHelmet", 1;
-    OrumQuest = 12;
+    getitem CandleHelmet, 1;
+    setq(MagicQuest_DarkMage, 12);
     mes "You receive the Candle Helmet.";
     next;
     mes "\"You've done enough here to help. I will go the rest of the way alone so that your life is not endangered. You must promise me not to go any further!\"";