1 files changed, 31 insertions, 29 deletions

diff --git a/npc/017-4/waric.txt b/npc/017-4/waric.txt
index eead477f..d1529aee 100644
--- a/npc/017-4/waric.txt
+++ b/npc/017-4/waric.txt
@@ -10,22 +10,23 @@
         @cut_tree = 1;
 
     @sagatha_follower = (QUEST_MAGIC & (NIBBLE_4_MASK | NIBBLE_5_MASK)) >> NIBBLE_4_SHIFT;
-    if (OrumQuest > 40) goto L_MoreMagic;
-    if (OrumQuest > 39) goto L_SnakesSpell;
-    if (OrumQuest > 38) goto L_SnakesIngredients;
-    if (OrumQuest > 37) goto L_Snakes;
-    if (OrumQuest > 36) goto L_ToxicDart;
-    if (OrumQuest > 35) goto L_Mushroom;
-    if (OrumQuest > 34) goto L_Banished;
-    if (OrumQuest > 33) goto L_LastChance;
-    if (OrumQuest > 32) goto L_BackforOath;
-    if (OrumQuest > 31) goto L_DarkMagic;
-    if (OrumQuest > 30) goto L_Flower5;
-    if (OrumQuest > 26) goto L_Flower4;
-    if (OrumQuest > 23) goto L_Flower3;
-    if (OrumQuest > 20) goto L_Flower2;
-    if (OrumQuest > 17) goto L_Flower1;
-    if (OrumQuest > 15) goto L_Mistrust;
+    .@q=getq(MagicQuest_DarkMage);
+    if (.@q > 40) goto L_MoreMagic;
+    if (.@q > 39) goto L_SnakesSpell;
+    if (.@q > 38) goto L_SnakesIngredients;
+    if (.@q > 37) goto L_Snakes;
+    if (.@q > 36) goto L_ToxicDart;
+    if (.@q > 35) goto L_Mushroom;
+    if (.@q > 34) goto L_Banished;
+    if (.@q > 33) goto L_LastChance;
+    if (.@q > 32) goto L_BackforOath;
+    if (.@q > 31) goto L_DarkMagic;
+    if (.@q > 30) goto L_Flower5;
+    if (.@q > 26) goto L_Flower4;
+    if (.@q > 23) goto L_Flower3;
+    if (.@q > 20) goto L_Flower2;
+    if (.@q > 17) goto L_Flower1;
+    if (.@q > 15) goto L_Mistrust;
 
     mesn;
     mes "\"You! You really are far too persistent to know what is good for you!\"";
@@ -110,7 +111,7 @@ L_Next1:
     mesn;
     mes "\"So, now that you know more about Dark Magic, are you still willing to become my apprentice?\"";
     mes "\"Once you cross this line, there is no going back. Keep this in mind!\"";
-    OrumQuest = 33;
+    setq(MagicQuest_DarkMage, 33);
     menu
         "I'll have to think about it.", L_ComeBackLater,
         "Yes.", L_Oath;
@@ -197,7 +198,7 @@ L_Next3:
     heal MaxHp, 0;
     heal ((MaxHp/100) * -99), 0;
     mes "You feel completely exhausted.";
-    OrumQuest = 36;
+    setq(MagicQuest_DarkMage, 36);
     goto L_close;
 
 L_NoOath:
@@ -205,7 +206,7 @@ L_NoOath:
     warp "005-3", 86 , 33;
     heal MaxHp, 0;
     heal ((MaxHp/100) * -50), 0;
-    OrumQuest = OrumQuest + 1;
+    setq(MagicQuest_DarkMage, getq(MagicQuest_DarkMage) + 1);
     goto L_close;
 
 L_Mushroom:
@@ -216,7 +217,7 @@ L_Mushroom:
     mesq l("The spell consumes a Small Mushroom and a Dark Crystal. Shove the Dark Crystal into the Small Mushroom and yell %s.");
     next;
     mesq l("A wicked mushroom will appear to fight for you. Usually.");
-    OrumQuest = 37;
+    setq(MagicQuest_DarkMage, 37);
     learnskill SKILL_HELORP;
     goto L_close;
 
@@ -238,7 +239,7 @@ L_Next4:
     learnskill SKILL_PHLEX;
     next;
     mes "\"If you want to learn more, come back later.\"";
-    OrumQuest = 38;
+    setq(MagicQuest_DarkMage, 38);
     goto L_close;
 
 L_Snakes:
@@ -255,11 +256,11 @@ L_Next5:
     mes "\"This one is so complex that I have to show it to you before explaining it further. Bring me a snake egg and a root.\"";
     next;
     mes "\"Off you go now. Bring me the ingredients.\"";
-    OrumQuest = 39;
+    setq(MagicQuest_DarkMage, 39);
     goto L_close;
 
 L_SnakesIngredients:
-    OrumQuest = 39;
+    setq(MagicQuest_DarkMage, 39);
     mesn;
     mes "\"Did you bring one Dark Crystal and a Snake Egg?\"";
     menu
@@ -279,7 +280,7 @@ L_Next6:
     next;
     delitem DarkCrystal, 1;
     delitem SnakeEgg, 1;
-    OrumQuest = 40;
+    setq(MagicQuest_DarkMage, 40);
     monster "017-4", 217,36, "Evil", Snake, 1;
     mesc l("The wizard looks at you, his eyes flashing, and laughs diabolically.");
     goto L_close;
@@ -295,7 +296,7 @@ L_Next7:
     mesn;
     mesq l("I said %s.", b("Halhiss"));
     mesq l("Have fun with those spells and use them to cause hate, anger and death.");
-    OrumQuest = 41;
+    setq(MagicQuest_DarkMage, 41);
     learnskill SKILL_HALHISS;
     goto L_close;
 
@@ -382,19 +383,20 @@ L_close:
         "Nevermind.", L_close;
 
 L_CandleHelmet:
-    OrumQuest = 14;
+    setq(MagicQuest_DarkMage, 14);
     goto L_close;
 
 L_Var:
-    input OrumQuest;
+    input .@i;
+    setq(MagicQuest_DarkMage, .@i);
     goto L_close;
 
 L_CurrentState:
-    mes "The value of the quest variable OrumQuest is currently " + OrumQuest + ".";
+    mes "The value of the quest variable OrumQuest is currently " + getq(MagicQuest_DarkMage) + ".";
     goto L_close;
 
 L_Reset:
-    OrumQuest = 0;
+    setq(MagicQuest_DarkMage, 0);
     goto L_close;
 
 L_close: