Migrate OrumQuest to the QuestSystem, and inheir skills on ported chars.

3 files changed, 87 insertions, 84 deletions

diff --git a/npc/017-4/guardingspirit.txt b/npc/017-4/guardingspirit.txt
index 0e5cb6b9..8a6e6293 100644
--- a/npc/017-4/guardingspirit.txt
+++ b/npc/017-4/guardingspirit.txt
@@ -3,11 +3,11 @@
     goto L_Talk;
 
 L_Talk:
-    if (OrumQuest == 35)
+    if (getq(MagicQuest_DarkMage) == 35)
         goto L_Block;
-    if (OrumQuest < 14)
+    if (getq(MagicQuest_DarkMage) < 14)
         goto L_Block;
-    if (OrumQuest > 14)
+    if (getq(MagicQuest_DarkMage) > 14)
         goto L_Chat;
 
     mes "[Guarding Spirit]";
@@ -56,7 +56,7 @@ L_Pass:
     mes "\"Alright, I will let you pass.\"";
     next;
     mes "\"Remember that when you speak with him, do so with respect for someone befitting his status.\"";
-    OrumQuest = 15;
+    setq(MagicQuest_DarkMage, 15);
     warp "017-4", 201, 26;
     goto L_close;
 
@@ -86,9 +86,9 @@ L_close:
     close;
 
 OnTouch:
-    if (OrumQuest < 15)
+    if (getq(MagicQuest_DarkMage) < 15)
         goto L_Talk;
-    if (OrumQuest == 35)
+    if (getq(MagicQuest_DarkMage) == 35)
         goto L_Block;
     warp "017-4", 201, 26;
     end;
diff --git a/npc/017-4/orum.txt b/npc/017-4/orum.txt
index 771b3469..984076ca 100644
--- a/npc/017-4/orum.txt
+++ b/npc/017-4/orum.txt
@@ -25,30 +25,31 @@
     @REWARD_MONEY = 100000;
     @Reward_Exp = 100000;
 
-    if (OrumQuest > 31) goto L_Done;
+    .@q=getq(MagicQuest_DarkMage);
+    if (.@q > 31) goto L_Done;
 
-    if (OrumQuest == 31) goto L_PlacedFifthFlower;
-    if (OrumQuest == 30) goto L_PlaceFifthFlower;
-    if (OrumQuest == 29) goto L_FailedFifthFlower;
-    if (OrumQuest == 28) goto L_FifthFlower;
+    if (.@q == 31) goto L_PlacedFifthFlower;
+    if (.@q == 30) goto L_PlaceFifthFlower;
+    if (.@q == 29) goto L_FailedFifthFlower;
+    if (.@q == 28) goto L_FifthFlower;
 
-    if (OrumQuest == 27) goto L_PlacedFourthFlower;
-    if (OrumQuest == 26) goto L_PlaceFourthFlower;
-    if (OrumQuest == 25) goto L_FourthFlower;
+    if (.@q == 27) goto L_PlacedFourthFlower;
+    if (.@q == 26) goto L_PlaceFourthFlower;
+    if (.@q == 25) goto L_FourthFlower;
 
-    if (OrumQuest == 24) goto L_PlacedThirdFlower;
-    if (OrumQuest == 23) goto L_PlaceThirdFlower;
-    if (OrumQuest == 22) goto L_ThirdFlower;
+    if (.@q == 24) goto L_PlacedThirdFlower;
+    if (.@q == 23) goto L_PlaceThirdFlower;
+    if (.@q == 22) goto L_ThirdFlower;
 
-    if (OrumQuest == 21) goto L_PlacedSecondFlower;
-    if (OrumQuest == 20) goto L_PlaceSecondFlower;
-    if (OrumQuest == 19) goto L_SecondFlower;
+    if (.@q == 21) goto L_PlacedSecondFlower;
+    if (.@q == 20) goto L_PlaceSecondFlower;
+    if (.@q == 19) goto L_SecondFlower;
 
-    if (OrumQuest == 18) goto L_PlacedFirstFlower;
-    if (OrumQuest == 17) goto L_PlaceFirstFlower;
-    if (OrumQuest == 16) goto L_FirstFlower;
+    if (.@q == 18) goto L_PlacedFirstFlower;
+    if (.@q == 17) goto L_PlaceFirstFlower;
+    if (.@q == 16) goto L_FirstFlower;
 
-    if (OrumQuest == 15) goto L_InitialTalk;
+    if (.@q == 15) goto L_InitialTalk;
 
     goto L_Banish;
 
@@ -84,7 +85,7 @@ L_Next1:
     mes "\"Well, why not? Here is a simple enough task to prove you're serious.";
     mes "Bring me " + @AMOUNT_SMALLMUSHROOM + " Small Mushrooms, " + @AMOUNT_ASH + " Piles of Ash and one Orange Tulip.\"";
 
-    OrumQuest = 16;
+    setq(MagicQuest_DarkMage, 16);
     menu
         "Sure!", L_close,
         "Why do you need that?", L_Next2;
@@ -113,16 +114,16 @@ L_FirstFlower: // 16: Got task to bring materials for first magical flower
         "I don't have it yet.", L_close;
 
 L_Next3:
-    if ((countitem("SmallMushroom") < @AMOUNT_SMALLMUSHROOM)
-        || (countitem("PileOfAsh") < @AMOUNT_ASH)
-        || (countitem("OrangeTulip") < 1))
+    if ((countitem(SmallMushroom) < @AMOUNT_SMALLMUSHROOM)
+        || (countitem(PileOfAsh) < @AMOUNT_ASH)
+        || (countitem(OrangeTulip) < 1))
         goto L_NoItem;
 
-    delitem "SmallMushroom", @AMOUNT_SMALLMUSHROOM;
-    delitem "PileOfAsh", @AMOUNT_SMALLMUSHROOM;
-    delitem "OrangeTulip", 1;
-    getitem "OrangeSummonFlower", 1;
-    OrumQuest = 17;
+    delitem SmallMushroom, @AMOUNT_SMALLMUSHROOM;
+    delitem PileOfAsh, @AMOUNT_SMALLMUSHROOM;
+    delitem OrangeTulip, 1;
+    getitem OrangeSummonFlower, 1;
+    setq(MagicQuest_DarkMage, 17);
 
     mes "Orum takes the items and starts crushing them, using a very old-looking mortar and pestle. As they turn into a fine powder, he mixes some of it together in the cauldron and finally dips the tulip into it, mumbling enchantements. The tulip changes its appearance. Then he hands it over to you.";
     mes "[Orum]";
@@ -155,7 +156,7 @@ L_Next5:
     if (Zeny < @RECOMPENSATION_1)
         goto L_NoMoney;
     Zeny = Zeny - @RECOMPENSATION_1;
-    OrumQuest = 16;
+    setq(MagicQuest_DarkMage, 16);
 
     mes "[Orum]";
     mes "\"Very well. Now bring me " + @AMOUNT_SMALLMUSHROOM + " Small Mushrooms, " + @AMOUNT_ASH + " Piles of Ash and one Orange Tulip again, so we can start over.\"";
@@ -169,14 +170,14 @@ L_PlacedFirstFlower: // 18: Placed first magical flower
         "Weird monsters appeared when I placed it!", L_AskMonsters;
 
 L_Next6:
-    OrumQuest = 19;
+    setq(MagicQuest_DarkMage, 19);
     goto L_SecondFlower;
 
 L_AskMonsters:
     mes "[Orum]";
     mes "\"Oh, right. Well, that was to be expected, some of the power seeped out when you placed it. I hope those monsters didn't harm you.";
     mes "However, we should continue.\"";
-    OrumQuest = 19;
+    setq(MagicQuest_DarkMage, 19);
     next;
     goto L_SecondFlower;
 
@@ -198,7 +199,7 @@ L_Next7:
     delitem "ScorpionStinger", @AMOUNT_STINGER;
     delitem "PinkTulip", 1;
     getitem "PurpleSummonFlower", 1;
-    OrumQuest = 20;
+    setq(MagicQuest_DarkMage, 20);
 
     mes "Orum starts to work on the materials you've gathered, in the same manner he did the first time. Suddenly something from the mortar gets on his hand and it makes a nasty sizzling noise. He yells in pain, clutching his hand to his chest. After cleaning his hand he continues. In the end he gives you another magical flower while rubbing his hand.";
     next;
@@ -239,7 +240,7 @@ L_Next9:
     if (Zeny < @RECOMPENSATION_2)
         goto L_NoMoney;
     Zeny = Zeny - @RECOMPENSATION_2;
-    OrumQuest = 19;
+    setq(MagicQuest_DarkMage, 19);
 
     mes "[Orum]";
     mes "\"Okay, now that this is settled, bring me " + @AMOUNT_PINKPETAL + " Pink Petals, " + @AMOUNT_STINGER + " Scorpion Stingers and one Pink Tulip again.\"";
@@ -255,13 +256,13 @@ L_PlacedSecondFlower: // 21: Placed second magical flower
         "How can we build a pentagram by randomly planting flowers?", L_AskPentagram;
 
 L_Next10:
-    OrumQuest = 22;
+    setq(MagicQuest_DarkMage, 22);
     goto L_ThirdFlower;
 
 L_AskPentagram:
     mes "[Orum]";
     mes "\"Randomly? The spots for the flowers have been very carefully chosen! You see, it's going to be a very LARGE pentagram.\"";
-    OrumQuest = 22;
+    setq(MagicQuest_DarkMage, 22);
     next;
     goto L_ThirdFlower;
 
@@ -348,8 +349,8 @@ L_EasyTooEarly:
     goto L_close;
 
 L_EasySuccess:
-    getitem "WhiteSummonFlower", 1;
-    OrumQuest = 23;
+    getitem WhiteSummonFlower, 1;
+    setq(MagicQuest_DarkMage, 23);
 
     mes "As you pour the liquid into the bubbling mixture, it calms down and becomes viscous. Orum takes the tulip and dips it into the mixture.";
     mes "[Orum]";
@@ -389,7 +390,7 @@ L_Next15:
     if (Zeny < @RECOMPENSATION_3)
         goto L_NoMoney;
     Zeny = Zeny - @RECOMPENSATION_3;
-    OrumQuest = 22;
+    setq(MagicQuest_DarkMage, 22);
 
     mes "[Orum]";
     mes "\"Once again we need " + @AMOUNT_WHITEFUR + " White Furs, " + @AMOUNT_REDSTINGER + " Red Scorpion Stingers and one White Tulip.\"";
@@ -404,14 +405,14 @@ L_PlacedThirdFlower: // 24: Placed third magical flower
         "What are we going to summon with that pentagram?", L_AskSummon;
 
 L_Next16:
-    OrumQuest = 25;
+    setq(MagicQuest_DarkMage, 25);
     goto L_FourthFlower;
 
 L_AskSummon:
     mes "[Orum]";
     mes "\"Beings from the astral plane, of course. Some of them are already coming through the rift when you place the flowers.";
     mes "But that is NOTHING compared to what will happen when the pentagram is complete! Hahaha!\"";
-    OrumQuest = 25;
+    setq(MagicQuest_DarkMage, 25);
     next;
     goto L_FourthFlower;
 
@@ -525,8 +526,8 @@ L_HardTooExtreme:
     goto L_close;
 
 L_HardSuccess:
-    getitem "YellowSummonFlower", 1;
-    OrumQuest = 26;
+    getitem YellowSummonFlower, 1;
+    setq(MagicQuest_DarkMage, 26);
 
     mes "Orum pours the rheological additive on the mixture and then dips the flower into the cauldron.";
     mes "[Orum]";
@@ -575,7 +576,7 @@ L_Next21:
     if (Zeny < @RECOMPENSATION_4)
         goto L_NoMoney;
     Zeny = Zeny - @RECOMPENSATION_4;
-    OrumQuest = 25;
+    setq(MagicQuest_DarkMage, 25);
 
     mes "[Orum]";
     mes "\"Now bring " + @AMOUNT_HARDSPIKE + " Hard Spikes, " + @AMOUNT_ANGRYSTINGER + " Angry Scorpion Stingers and one Yellow Rose again.\"";
@@ -590,7 +591,7 @@ L_PlacedFourthFlower: // 27: Placed fourth magical flower
         "Why do you want to summon so many beings?", L_AskReason;
 
 L_Next22:
-    OrumQuest = 28;
+    setq(MagicQuest_DarkMage, 28);
     goto L_FifthFlower;
 
 L_AskReason:
@@ -599,7 +600,7 @@ L_AskReason:
     mes "I'll give you a hint: think about what's in the center of the pentagram. Or rather who is.\"";
     next;
     mes "\"Anyway, let's get back to business!\"";
-    OrumQuest = 28;
+    setq(MagicQuest_DarkMage, 28);
     next;
     goto L_FifthFlower;
 
@@ -659,8 +660,8 @@ L_FlowerHat:
     mes "\"Fool! See what you've done? It's ruined!\"";
     next;
     mes "\"Though, we still have enough of the materials left to start over. Here, take this garbage out and get a new Red Rose!\"";
-    getitem "RedRoseHat", 1;
-    OrumQuest = 29;
+    getitem RedRoseHat, 1;
+    setq(MagicQuest_DarkMage, 29);
     goto L_close;
 
 L_AskSagatha:
@@ -695,8 +696,8 @@ L_Next25:
     next;
     mes "You watch while Orum carefully prepares the last magic flower.";
     next;
-    getitem "RedSummonFlower", 1;
-    OrumQuest = 30;
+    getitem RedSummonFlower, 1;
+    setq(MagicQuest_DarkMage, 30);
     mes "[Orum]";
     mes "\"Here it is. We're almost done. Don't mess it up!\"";
     next;
@@ -770,7 +771,7 @@ L_PlacedFifthFlower: // 31: Placed fifth flower
     mes "\"Well done, really. I think you've earned yourself a small reward. Here, take this.\"";
     Zeny = Zeny + @REWARD_MONEY;
     getexp @Reward_Exp, 0;
-    OrumQuest = 32;
+    setq(MagicQuest_DarkMage, 32);
     goto L_close;
 
 L_Done:
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: