Track some states of Main Quest.

2 files changed, 16 insertions, 7 deletions

diff --git a/npc/020-7-1/sage.txt b/npc/020-7-1/sage.txt
index 99c4ea8af..e8c8de3dc 100644
--- a/npc/020-7-1/sage.txt
+++ b/npc/020-7-1/sage.txt
@@ -65,13 +65,6 @@
     mes "";
     switch (@menu) {
         case 1:
-            // Quest ends at stage 12 (and you're in Frostia arcs)
-            if (.@q == 12) {
-                mesc b(l(".:: Main Quest 4-1 ::.")), 3;
-                mesc l("* Get information about the World Edge"), 1;
-                mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:")));
-                close;
-            }
             // You must solve the issue here, first
             nStart();
             break;
@@ -262,6 +255,10 @@ function nStart {
     next;
     mesn l("Nikolai, the Blue Sage");
     mesq l("Once he resumes working confidently, we can go over this important subject.");
+    next;
+    mesc b(l(".:: Main Quest 3-2 ::.")), 3;
+    mesc l("* Meet the Blue Sage"), 2;
+    mesc l("* Aid the Blue Sage in getting Peetu back to action"), 9;
     return;
 }
 
diff --git a/npc/024-1/guard.txt b/npc/024-1/guard.txt
index c668d7ca6..71ac1dc92 100644
--- a/npc/024-1/guard.txt
+++ b/npc/024-1/guard.txt
@@ -5,6 +5,10 @@
 //  Controls access to Frostia.
 
 024-1,93,73,0	script	Frostia Guard	NPC_ELF,{
+    // Main Quest Have Precedence
+    if (getq(General_Narrator) == 11)
+        goto L_MainQuest;
+
     if (BaseLevel < 40)
         goto L_Unallowed;
     if (Class == Elven)
@@ -37,6 +41,14 @@ L_Unallowed:
     close;
 
 
+L_MainQuest:
+    mesc b(l(".:: Main Quest 4-1 ::.")), 3;
+    msObjective(BaseLevel >= 40, l("* @@/@@ Base Level", BaseLevel, 40));
+    mesc l("* Deliver Nikolai's Letter to Frostia Mayor"), 9;
+    mes "";
+    mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
+    close;
+
 OnInit:
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet);