Testing - Blue Sage Investigation - OK!

1 files changed, 72 insertions, 24 deletions

diff --git a/npc/020-7-1/pagefinders.txt b/npc/020-7-1/pagefinders.txt
index 719b7da6b..3fa639c19 100644
--- a/npc/020-7-1/pagefinders.txt
+++ b/npc/020-7-1/pagefinders.txt
@@ -3,7 +3,7 @@
 //    Jesusalva
 //    TMW Org.
 // Description:
-//    Responsible for recovering the lost pages
+//    Responsible for recovering the lost pages (SpellBookPage)
 //    helperBookpages*
 //
 // NivalisQuest_BlueSagePagefinder STRUCTURE
@@ -13,9 +13,51 @@
 //      nº of pages found (0~31)
 
 020-7-1,36,39,4	script	Ensio	NPC_BLUESAGEWORKER_MB,{
-    npctalk3 l("Collects book pages");
-    goodbye;
-    end;
+    function askQuestion;
+    mesc l("ERROR TODO");
+    askQuestion();
+    close;
+
+function askQuestion {
+    do {
+        .@q=getq(NivalisQuest_BlueSage);
+        .@q2=getq2(NivalisQuest_BlueSage);
+        .@q3=getq3(NivalisQuest_BlueSage);
+        .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
+        .@qt=getq(NivalisQuest_BlueSagePagefinder);
+        next;
+        mes "";
+        select
+            rif(.@qt < 255, "What are you doing?"),
+            rif(.@qs & BS_QVISITOR, l("Do you know anything about the strange visitor?")),
+            rif(.@qs & BS_QHELPER, l("What's your opinion of Peetu and his work?")),
+            any(l("I need to leave."), l("See you."), l("Bye."));
+        mes "";
+        switch (@menu) {
+            case 1:
+                mesn;
+                mesq l("TODO!");
+                break;
+            case 2:
+                mesn;
+                mesq l("Visitor with a mask? Ah, I think I know who are you talking about. Black clothes and a golden mask. Rather strange guy.");
+                next;
+                mesn;
+                mesq l("He was looking around in the library a while, and then came to ask about our research. He seemed to be particularly interested in our experiments with the slimes.");
+                next;
+                mesn;
+                mesq l("Heh, I wonder what he would've said if he'd have visited us a little bit later. Mh, now that I think about it, the accident with the slimes happened just the night after he was here.");
+                if (!(.@q2 & .bsId))
+                    setq2 NivalisQuest_BlueSage, .@q2 | .bsId;
+                break;
+            case 3:
+                mesn;
+                mesq l("Oh, I can't really tell. I'm mostly working in the library, while he's very involved in the research.");
+                break;
+        }
+    } while (@menu != 4);
+    close;
+}
 
 OnInit:
     .bsId=BS_NPC07;
@@ -55,24 +97,27 @@ OnInit:
     close;
 
 function askQuestion {
+    next;
+    if (.@qt >= 255) {
+        mesn;
+        mesq l("I'm so glad we didn't have to go out to hunt the slimes! Thank you!");
+    } else if (.@qt) {
+        mesn;
+        mesq l("If you get any bookpages from the slimes, bring them to Ensio. Thanks for your help!");
+    } else {
+        mesn;
+        mesc l("*sighs*");
+        mesq l("Oh, hey. Welcome to the library, or what's left of it.");
+    }
+
+    // Mainframe Loop
     do {
         .@q=getq(NivalisQuest_BlueSage);
         .@q2=getq2(NivalisQuest_BlueSage);
         .@q3=getq3(NivalisQuest_BlueSage);
         .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
-        .@qt=getq3(NivalisQuest_BlueSage);
+        .@qt=getq(NivalisQuest_BlueSagePagefinder);
         next;
-        if (.@qt >= 255) {
-            mesn;
-            mesq l("I'm so glad we didn't have to go out to hunt the slimes! Thank you!");
-        } else if (.@qt) {
-            mesn;
-            mesq l("If you get any bookpages from the slimes, bring them to Ensio. Thanks for your help!");
-        } else {
-            mesn;
-            mesc l("*sighs*");
-            mesq l("Oh, hey. Welcome to the library, or what's left of it.");
-        }
         mes "";
         select
             rif(.@qt < 255, "What are you doing?"),
@@ -151,20 +196,23 @@ OnInit:
     close;
 
 function askQuestion {
+    next;
+    if (.@qt >= 255) {
+        mesn;
+        mesq l("Thanks for helping out here. Do you need anything else?");
+    } else if (.@qt) {
+        mesn;
+        mesq l("Did you find some bookpages? Ensio will take them.");
+    }
+
+    // Mainframe Loop
     do {
         .@q=getq(NivalisQuest_BlueSage);
         .@q2=getq2(NivalisQuest_BlueSage);
         .@q3=getq3(NivalisQuest_BlueSage);
         .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
-        .@qt=getq3(NivalisQuest_BlueSage);
+        .@qt=getq(NivalisQuest_BlueSagePagefinder);
         next;
-        if (.@qt >= 255) {
-            mesn;
-            mesq l("Thanks for helping out here. Do you need anything else?");
-        } else if (.@qt) {
-            mesn;
-            mesq l("Did you find some bookpages? Ensio will take them.");
-        }
         mes "";
         select
             rif(.@qt == 255, ""),