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

1 files changed, 25 insertions, 25 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;
 }