Polish up and finish Main Story 2.

Now we can move to Main Story 3, leading to Nivalis... But not for r8.

3 files changed, 16 insertions, 5 deletions

diff --git a/npc/009-2/librarian.txt b/npc/009-2/librarian.txt
index f743ee382..4f806c14c 100644
--- a/npc/009-2/librarian.txt
+++ b/npc/009-2/librarian.txt
@@ -82,7 +82,7 @@ L_Complete:
     mesc l("They promised to travel to the ##BWorld Edge##b to fetch a Mana Fragment. The wisest of them said it was the only chance.");
     mesc l("They were never again seen. None of them. We burnt all records about everyone here, and blamed the Monster King.");
     mesc l("They must never know we had it. Their sacrifices must be forgotten. For the sake of all.");
-    compareandsetq General_Narrator, 4, 5;
+    compareandsetq General_Narrator, 6, 7;
     close;
 
 L_Report:
@@ -116,8 +116,12 @@ L_Report:
     next;
     mesn;
     mesq l("Good luck, @@!", strcharinfo(0));
-    getexp 1500, 0; // TODO.
-    setq General_Narrator, 6;
+    next;
+    getexp BaseLevel*750, JobLevel*50;// Reference Levels: (40, 15)
+    mesc b(l(".:: Main Quest 2-3 ::.")), 3;
+    mesc l("* Talk to Librarian in Halinarzo"), 2;
+    mesc l("* Return to Hurnscald Townhall"), 9;
+    setq General_Narrator, 8;
     close;
 
 OnInit:
diff --git a/npc/012-2/rakinorf.txt b/npc/012-2/rakinorf.txt
index 570e10245..85d80c670 100644
--- a/npc/012-2/rakinorf.txt
+++ b/npc/012-2/rakinorf.txt
@@ -73,8 +73,6 @@ L_MainStory:
     // 6 - Must visit Halinarzo Library
     // Note: Expires on logout: @returnpotion_expiredate
 
-    // 8 - TODO
-
     .@n2=getq2(General_Narrator);
     if (.@n == 5) {
         mesn;
diff --git a/npc/012-7/airlia.txt b/npc/012-7/airlia.txt
index 424ba4e18..f642fd637 100644
--- a/npc/012-7/airlia.txt
+++ b/npc/012-7/airlia.txt
@@ -19,6 +19,7 @@
     if (strcharinfo(0) == $MOST_HEROIC$) npctalk3 l("Ah, if it isn't @@? You're the talk of the town!", $MOST_HEROIC$);
     if (.@q1 == 4) goto L_Letter;
     if (.@n >= 3 && .@n < 6) goto L_Mayor;
+    if (.@n == 8) goto L_Nivalis;
     mesn;
     mesq l("Oh, a visitor. Welcome to the city hall. Please, enjoy your stay.");
     close;
@@ -146,6 +147,14 @@ L_In5:
     setq2 General_Narrator, 6;
     close;
 
+L_Nivalis:
+    // Supposed to send player to talk with another NPC on Nivalis about World's Edge
+    mesc b(l(".:: Main Quest 2-3 ::.")), 3;
+    mesc l("* Talk to Librarian in Halinarzo"), 2;
+    mesc l("* Return to Hurnscald Townhall"), 2;
+    mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:")));
+    close;
+
 OnInit:
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, Earmuffs);