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

5 files changed, 70 insertions, 69 deletions

diff --git a/npc/009-4/barriers.txt b/npc/009-4/barriers.txt
index 08998e94..26687017 100644
--- a/npc/009-4/barriers.txt
+++ b/npc/009-4/barriers.txt
@@ -44,41 +44,41 @@ L_Error2:
 
 
 009-4,37,119,0	script	#OrumCaveStartMessage	NPC32767,0,0,{
-    if (OrumQuest >= 3) end;
-    if (OrumQuest == 2) goto L_Started;
+    if (getq(MagicQuest_DarkMage) >= 3) end;
+    if (getq(MagicQuest_DarkMage) == 2) goto L_Started;
 
     mes "As you try to pass, two torches begin to flare and push you back. They seem to form some kind of barrier.";
     close;
 
 L_Started:
     message strcharinfo(0), "The torches dim as you approach, granting you passage.";
-    OrumQuest = 3;
+    setq(MagicQuest_DarkMage, 3);
     end;
 }
 
 009-4,37,120,0	script	#OrumCaveStartBarrier	NPC32767,0,0,{
-    if (OrumQuest >= 3) end;
+    if (getq(MagicQuest_DarkMage) >= 3) end;
     warp "009-4", 37, 118;
     end;
 }
 
 009-4,57,29,0	script	#OrumCaveFirstBarrier	NPC32767,0,0,{
-    if (OrumQuest >= 5) end;
+    if (getq(MagicQuest_DarkMage) >= 5) end;
 
     message strcharinfo(0), "Nothing seems to happen as you enter this room. The barrier must need both of its torches to function properly.";
-    OrumQuest = 5;
+    setq(MagicQuest_DarkMage, 5);
     end;
 }
 
 009-4,61,55,0	script	#OrumCaveSecondMessage	NPC32767,0,0,{
-    if (OrumQuest >= 9) end;
-    if (OrumQuest == 3) set OrumQuest, 4;
+    if (getq(MagicQuest_DarkMage) >= 9) end;
+    if (getq(MagicQuest_DarkMage) == 3) setq(MagicQuest_DarkMage, 4);
 
     @Barrier = 0;
     callfunc("GetBarrierColor");
     @Torch = 0;
     callfunc("GetTorchColor");
-    if (OrumQuest > 7 && @TorchColor == @BarrierColor)
+    if (getq(MagicQuest_DarkMage) > 7 && @TorchColor == @BarrierColor)
         goto L_Allow_Second_Passage;
 
     mes "As you try to pass, the torches begin to flare and push you back. Perhaps there's a way to get past it.";
@@ -88,27 +88,27 @@ L_Started:
     close;
 
 L_Allow_Second_Passage:
-    if (OrumQuest < 9) goto L_Advance_Quest;
+    if (getq(MagicQuest_DarkMage) < 9) goto L_Advance_Quest;
     end;
 
 L_Advance_Quest:
     message strcharinfo(0), "The torches dim as you enter like the first. You must be on the right trail.";
-    OrumQuest = 9;
+    setq(MagicQuest_DarkMage, 9);
     end;
 }
 
 009-4,61,54,0	script	#OrumCaveSecondBarrier	NPC32767,0,0,{
-    if (OrumQuest >= 9) end;
+    if (getq(MagicQuest_DarkMage) >= 9) end;
     warp "009-4", 60, 56;
     end;
 }
 
 009-4,24,65,0	script	#OrumCaveThirdMessage	NPC32767,0,0,{
-    if (OrumQuest >= 10) end;
-    if (OrumQuest == 3) set OrumQuest, 4;
-    if (OrumQuest > 8 && @Torch1Color == @firstColor && @Torch2Color == @secondColor)
+    if (getq(MagicQuest_DarkMage) >= 10) end;
+    if (getq(MagicQuest_DarkMage) == 3) setq(MagicQuest_DarkMage, 4);
+    if (getq(MagicQuest_DarkMage) > 8 && @Torch1Color == @firstColor && @Torch2Color == @secondColor)
         goto L_Allow_Third_Passage;
-    if (OrumQuest > 8 && @Torch2Color == @firstColor && @Torch1Color == @secondColor)
+    if (getq(MagicQuest_DarkMage) > 8 && @Torch2Color == @firstColor && @Torch1Color == @secondColor)
         goto L_Allow_Third_Passage;
 
     @Barrier = 1;
@@ -136,28 +136,28 @@ L_Advance_Quest:
     close;
 
 L_Allow_Third_Passage:
-    if (OrumQuest < 10) goto L_Advance_Quest;
+    if (getq(MagicQuest_DarkMage) < 10) goto L_Advance_Quest;
     end;
 
 L_Advance_Quest:
-    OrumQuest = 10;
+    setq(MagicQuest_DarkMage, 10);
     end;
 }
 
 009-4,24,66,0	script	#OrumCaveThirdBarrier	NPC32767,0,0,{
-    if (OrumQuest >= 10) end;
+    if (getq(MagicQuest_DarkMage) >= 10) end;
     warp "009-4", 23, 64;
     end;
 }
 
 009-4,48,37,0	script	#OrumCaveEndMessage	NPC32767,0,0,{
-    if (OrumQuest >= 11) end;
-    if (OrumQuest == 3) set OrumQuest, 4;
+    if (getq(MagicQuest_DarkMage) >= 11) end;
+    if (getq(MagicQuest_DarkMage) == 3) setq MagicQuest_DarkMage, 4;
 
     @Barrier = 2;
     callfunc("GetBarrierColor");
 
-    if (OrumQuest < 10)
+    if (getq(MagicQuest_DarkMage) < 10)
         goto L_Deny_Final_Passage;
 
     @Torch = 0;
@@ -252,17 +252,17 @@ L_Deny_Final_Passage:
     close;
 
 L_Allow_Final_Passage:
-    if (OrumQuest < 11) goto L_Advance_Quest;
+    if (getq(MagicQuest_DarkMage) < 11) goto L_Advance_Quest;
     end;
 
 L_Advance_Quest:
     message strcharinfo(0), "The torches dim as you enter. At last you finally have access!";
-    OrumQuest = 11;
+    setq(MagicQuest_DarkMage, 11);
     end;
 }
 
 009-4,48,38,0	script	#OrumCaveEndBarrier	NPC32767,0,0,{
-    if (OrumQuest >= 11) end;
+    if (getq(MagicQuest_DarkMage) >= 11) end;
     warp "009-4", 47, 36;
     end;
 }
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!\"";
diff --git a/npc/009-4/orum_warps.txt b/npc/009-4/orum_warps.txt
index 8cf74919..515ba0b7 100644
--- a/npc/009-4/orum_warps.txt
+++ b/npc/009-4/orum_warps.txt
@@ -1,5 +1,5 @@
 009-3,162,113,0	script	#OrumQuestEnter	NPC45,0,0,{
-    if (OrumQuest >= 12) goto L_Second_Entrance;
+    if (getq(MagicQuest_DarkMage) >= 12) goto L_Second_Entrance;
     warp "009-4", 37, 113;
     close;
 
@@ -8,7 +8,7 @@ L_Second_Entrance:
     close;
 }
 009-4,36,26,0	script	#LairExit	NPC45,0,0,{
-    if (OrumQuest >= 12) goto L_Second_Entrance;
+    if (getq(MagicQuest_DarkMage) >= 12) goto L_Second_Entrance;
     warp "009-4", 37, 122;
     close;
 
@@ -18,8 +18,8 @@ L_Second_Entrance:
 }
 
 009-4,51,47,0	script	#CavernEnter	NPC45,0,0,{
-    if (OrumQuest >= 14) goto L_Second_Cavern;
-    if (OrumQuest < 12) goto L_See_Orum;
+    if (getq(MagicQuest_DarkMage) >= 14) goto L_Second_Cavern;
+    if (getq(MagicQuest_DarkMage) < 12) goto L_See_Orum;
     warp "009-4", 103, 23;
     close;
 
diff --git a/npc/009-4/torches.txt b/npc/009-4/torches.txt
index 8cf053d0..5ff12563 100644
--- a/npc/009-4/torches.txt
+++ b/npc/009-4/torches.txt
@@ -65,22 +65,22 @@ L_Error2:
 }
 
 function	script	DoneWithTorches	{
-    if (OrumQuest < 11 && OrumQuest >= 8)
+    if (getq(MagicQuest_DarkMage) < 11 && getq(MagicQuest_DarkMage) >= 8)
         goto L_Return;
 
-    if (OrumQuest < 7) goto L_Different;
+    if (getq(MagicQuest_DarkMage) < 7) goto L_Different;
 
-    if (OrumQuest >= 11)
+    if (getq(MagicQuest_DarkMage) >= 11)
         mes "The flame on the torch looks ordinary. Lowering the final barrier seems to have drained them of their magic.";
 
-    if (OrumQuest < 8)
+    if (getq(MagicQuest_DarkMage) < 8)
         mes "Without that powder the note mentions there isn't much you can do with this torch.";
     close2;
     goto L_Return;
 
 L_Different:
     mes "The flame on this torch looks different than the rest. You better tell Orum about it before doing anything.";
-    OrumQuest = 6;
+    setq(MagicQuest_DarkMage, 6);
     close2;
     goto L_Return;
 
diff --git a/npc/009-4/waric.txt b/npc/009-4/waric.txt
index dee2787f..07dc1e66 100644
--- a/npc/009-4/waric.txt
+++ b/npc/009-4/waric.txt
@@ -20,7 +20,7 @@
 
 009-4,118,42,0	script	Waric#trap	NPC153,{
     @Exp_LEARNED_ALOT = 10000;
-    if (OrumQuest >= 13)
+    if (getq(MagicQuest_DarkMage) >= 13)
         goto L_Behave;
     mes "Waric looks toward you rubbing his chin...";
     next;
@@ -38,7 +38,7 @@ L_Next:
     mes "\"We've got a feisty one here, Orum!\"";
     next;
     mes "They begin discussing plans of some sort...";
-    OrumQuest = 13;
+    setq(MagicQuest_DarkMage, 13);
     goto L_close;
 
 L_Behave:
@@ -79,7 +79,7 @@ L_Explain:
     next;
     mes "Once more you start to lose conciousness as your surroundings begin to fade...";
     next;
-    OrumQuest = 14;
+    setq(MagicQuest_DarkMage, 14);
     misceffect 10;
     warp "008-1", 65, 90;
     getexp @Exp_LEARNED_ALOT, 0;