1 files changed, 75 insertions, 27 deletions

diff --git a/npc/020-7-1/janitors.txt b/npc/020-7-1/janitors.txt
index b94147df9..617028cd0 100644
--- a/npc/020-7-1/janitors.txt
+++ b/npc/020-7-1/janitors.txt
@@ -13,8 +13,48 @@
 
 020-7-1,50,63,6	script	Pyry	NPC_BLUESAGEWORKER_MB,{
     npctalk3 l("I warn about dangers and controls the fights.");
-    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=getq3(NivalisQuest_BlueSage);
+        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("Mh, yes. I remember him. He was very interested in the library and the research we do here. He had an unusual behaviour and appearance. But, well, that isn't a reason to refuse someone, right?");
+                break;
+            case 3:
+                mesn;
+                mesq l("Peetu? I have always been glad to have him on the team. He's really brought forward our work here.");
+                next;
+                mesn;
+                mesq l("I was very surprised when I heard that he's responsible for the failed sealing. I'd never have expected that from him.");
+                if (!(.@q3 & .bsId))
+                    setq3 NivalisQuest_BlueSage, .@q3 | .bsId;
+                break;
+        }
+    } while (@menu != 4);
+    close;
+}
 
 OnInit:
     .bsId=BS_NPC06;
@@ -99,6 +139,7 @@ function askQuestion {
             case 2:
                 mesn;
                 mesq l("With a mask? Mh, I think I know who are you talking about. I vaguely remember that there was someone with a mask... but I can't recall any details, I wasn't really paying attention.");
+                close;
                 break;
             case 3:
                 mesn;
@@ -108,6 +149,7 @@ function askQuestion {
                 mesq l("I really wonder how that accident could've happened. I'd have never expected him to mess something up like that.");
                 if (!(.@q3 & .bsId))
                     setq3 NivalisQuest_BlueSage, .@q3 | .bsId;
+                close;
                 break;
         }
     } while (@menu != 4);
@@ -165,6 +207,24 @@ OnInit:
     close;
 
 function askQuestion {
+    next;
+    if (.@qt >= 255) {
+        mesn;
+        mesq l("Good work with the slimes. This will make our task much easier.");
+        next;
+        mesn;
+        mesc l("*sigh*");
+        mesq l("It appears we were focusing too much on research and this lead to neglect of other duties of a Sage's household. This is dangerous in times of changes. I'm worried about the future.");
+    } else if (.@qt) {
+        mesn;
+        mesc l("*sighs*");
+        mesq l("We really appreciate your help with the slimes.");
+    } else {
+        mesn;
+        mesq l("It's dangerous in the library right now, be careful. Do you need anything else?");
+    }
+
+    // Mainframe Loop
     do {
         .@q=getq(NivalisQuest_BlueSage);
         .@q2=getq2(NivalisQuest_BlueSage);
@@ -172,21 +232,6 @@ function askQuestion {
         .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
         .@qt=getq2(NivalisQuest_BlueSageSlimes);
         next;
-        if (.@qt >= 255) {
-            mesn;
-            mesq l("Good work with the slimes. This will make our task much easier.");
-            next;
-            mesn;
-            mesc l("*sigh*");
-            mesq l("It appears we were focusing too much on research and this lead to neglect of other duties of a Sage's household. This is dangerous in times of changes. I'm worried about the future.");
-        } else if (.@qt) {
-            mesn;
-            mesc l("*sighs*");
-            mesq l("We really appreciate your help with the slimes.");
-        } else {
-            mesn;
-            mesq l("It's dangerous in the library right now, be careful. Do you need anything else?");
-        }
         mes "";
         select
             rif(.@qt < 255, ""),
@@ -359,6 +404,19 @@ OnInit:
     close;
 
 function askQuestion {
+    next;
+    if (.@qt >= 255) {
+        mesn;
+        mesq l("I heard you fought the slimes that were still roaming between the bookshelves. Thank you!");
+        next;
+        mesn;
+        mesq l("I was a bit worried that they might ruin our efforts by messing everything up again after we just cleaned.");
+    } else {
+        mesn;
+        mesq l("I'm just searching for some cleaning supplies. They must be somewhere around here, but everything went upside down when the slimes escaped.");
+    }
+
+    // Mainframe Loop
     do {
         .@q=getq(NivalisQuest_BlueSage);
         .@q2=getq2(NivalisQuest_BlueSage);
@@ -366,16 +424,6 @@ function askQuestion {
         .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
         .@qt=getq2(NivalisQuest_BlueSageSlimes);
         next;
-        if (.@qt >= 255) {
-            mesn;
-            mesq l("I heard you fought the slimes that were still roaming between the bookshelves. Thank you!");
-            next;
-            mesn;
-            mesq l("I was a bit worried that they might ruin our efforts by messing everything up again after we just cleaned.");
-        } else {
-            mesn;
-            mesq l("I'm just searching for some cleaning supplies. They must be somewhere around here, but everything went upside down when the slimes escaped.");
-        }
         mes "";
         select
             rif(.@qt == 255, "Did you found the supplies yet?"),