Prepare the next main storyline stage. Still incomplete.

5 files changed, 105 insertions, 3 deletions

diff --git a/npc/012-2/GonzoDark.txt b/npc/012-2/GonzoDark.txt
index 509ca5fcd..6cc84c872 100644
--- a/npc/012-2/GonzoDark.txt
+++ b/npc/012-2/GonzoDark.txt
@@ -15,6 +15,10 @@
     .@d=getq2(SQuest_Sponsor);
     if (.@d != gettime(GETTIME_MONTH)) resetSQS();
 
+    // Are you a sponsor or a guest?
+    if (!getgmlevel())
+        goto L_Guest;
+
     // Core
     .@q=getq(SQuest_Sponsor);
     mesn;
@@ -51,6 +55,17 @@ L_Close:
     goodbye;
     close;
 
+L_Guest:
+    mesn;
+    mesq lg("Yo, girl.", "Yo, man.");
+    next;
+    mesn;
+    mesq l("I sponsor the alliance and all I got was a NPC and access to this ugly room.");
+    next;
+    mesn;
+    mesq l("Well, I did got some other things more, but I don't want to be an snob.");
+    close;
+
 OnInit:
     .sex = G_MALE;
     .distance = 5;
diff --git a/npc/012-2/Saulc.txt b/npc/012-2/Saulc.txt
index 3163eba62..888d0fa4d 100644
--- a/npc/012-2/Saulc.txt
+++ b/npc/012-2/Saulc.txt
@@ -15,6 +15,10 @@
     .@d=getq2(SQuest_Sponsor);
     if (.@d != gettime(GETTIME_MONTH)) resetSQS();
 
+    // Are you a sponsor or a guest?
+    if (!getgmlevel())
+        goto L_Guest;
+
     // Core
     .@q=getq(SQuest_Sponsor);
     mesn;
@@ -51,6 +55,17 @@ L_Close:
     goodbye;
     close;
 
+L_Guest:
+    mesn;
+    mesq lg("Yo, girl.", "Yo, man.");
+    next;
+    mesn;
+    mesq l("I sponsor the alliance and all I got was a NPC and access to this ugly room.");
+    next;
+    mesn;
+    mesq l("Well, I did got some other things more, but I don't want to be an snob.");
+    close;
+
 OnInit:
     .sex = G_MALE;
     .distance = 5;
diff --git a/npc/012-2/door.txt b/npc/012-2/door.txt
index 67fb25599..9329367cc 100644
--- a/npc/012-2/door.txt
+++ b/npc/012-2/door.txt
@@ -16,6 +16,10 @@ OnTouch:
     end;
 
 L_Unauthorized:
+    // Per r8.0 Apane Invasion, there's a moment on main storyline you'll be allowed
+    if (getq(General_Narrator) == 3 && getq2(General_Narrator) == 3)
+        slide 59, 82;
+
     if (@sp_notrespass > 0)
         goto L_Warning;
     dispbottom col(l("Only Sponsors are allowed past this area."),1);
diff --git a/npc/012-7/airlia.txt b/npc/012-7/airlia.txt
index cb7219eac..719074770 100644
--- a/npc/012-7/airlia.txt
+++ b/npc/012-7/airlia.txt
@@ -2,7 +2,7 @@
 // Author:
 //    Jesusalva
 // Personality Traits:
-//    Bitter-sweet, resentful, lovely
+//    Bitter-sweet, resentful, lovely, cute
 // Description:
 //    Former Town's Mayor Daughter.
 //    Have a grudge against current mayor.
@@ -41,6 +41,15 @@ L_Letter:
 
 // Main Storyline & Airlia Quest
 L_Mayor:
+    .@q=getq2(General_Narrator);
+    if (.@q == 3) goto L_In4;
+    if (.@q == 2) goto L_In3;
+    if (.@q == 1) goto L_In2;
+    if (.@q == 0) goto L_In1;
+    mesc l("Script Error"), 1;
+    close;
+
+L_In1:
     mesn strcharinfo(0);
     mesq l("Hello! Could I see the Mayor?");
     next;
@@ -49,7 +58,46 @@ L_Mayor:
     next;
     mesn;
     mesq l("Anyway, he is not available at the moment. Try your luck again later.");
-    setq General_Narrator, 3, 1;
+    setq2 General_Narrator, 1;
+    close;
+
+L_In2:
+    mesn strcharinfo(0);
+    mesq l("Hello! Could I see the Mayor?");
+    next;
+    mesn;
+    mesq l("I already told you he is out! Why do you even want to talk to him?! Haven't I told you to... to... leave me alone!?");
+    setq2 General_Narrator, 2;
+    close;
+
+L_In3:
+    mesn strcharinfo(0);
+    mesq l("Hello! Could I see the Mayor?");
+    next;
+    mesn;
+    mes "...";
+    next;
+    mes "... ...";
+    next;
+    mes "... ... ...";
+    next;
+    mesn;
+    mesq l("Fine.");
+    next;
+    mesn;
+    mesq l("The mayor, Gumi, is probably on the Inn upstairs, drinking himself to death.");
+    next;
+    mesn;
+    mesq l("Usually only sponsors are allowed up there, but I'll make an exception today. Go meet the mayor.");
+    setq2 General_Narrator, 3;
+    close;
+
+L_In4:
+    mesn;
+    mesq l("The mayor, Gumi, is probably on the Inn upstairs, drinking himself to death.");
+    next;
+    mesn;
+    mesq l("Usually only sponsors are allowed up there, but I'll make an exception today. Go meet the mayor.");
     close;
 
 OnInit:
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 05482b2c6..72eb8b68c 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -297,7 +297,7 @@ function	script	reputation	{
         if (getq(NivalisQuest_Well) >= 2)
             .@nr=.@nr+1;
 
-        // Nivalis Well Quest (+1 rep)
+        // Nivalis Cindy Quest (+1 rep)
         if (getq(NivalisQuest_Cindy) >= 5)
             .@nr=.@nr+1;
 
@@ -337,6 +337,26 @@ function	script	reputation	{
         .@nr=.@nr*100/5;
 
 
+
+
+
+
+
+    // Frostia Quests (2 points)
+    } else if (getarg(0) == "Frostia") {
+
+        // Rescue Yeti Quest (+1 rep)
+        if (getq(NivalisQuest_Well) >= 2)
+            .@nr=.@nr+1;
+
+        // Rescue Cindy Quest (+1 rep)
+        if (getq(NivalisQuest_Cindy) >= 5)
+            .@nr=.@nr+1;
+
+        // FROSTIA Magical Forumula
+        .@nr=.@nr*100/2;
+
+
     // Final
     }