From 8e2e752da8739b4c8bda1209365924183ac176cf Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 20 May 2019 14:55:04 -0300
Subject: Split Blue Sage Quests + fix errors

---
 npc/020-7-1/janitors.txt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'npc/020-7-1/janitors.txt')

diff --git a/npc/020-7-1/janitors.txt b/npc/020-7-1/janitors.txt
index 637cd0821..8ee068754 100644
--- a/npc/020-7-1/janitors.txt
+++ b/npc/020-7-1/janitors.txt
@@ -67,7 +67,8 @@ OnInit:
 
 function askQuestion {
     do {
-        .@qs=getq(NivalisQuest_BlueSage);
+        .@q=getq(NivalisQuest_BlueSage);
+        .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
         .@qt=getq2(NivalisQuest_BlueSageSlimes);
         next;
         if (.@qt >= 255) {
@@ -161,7 +162,8 @@ OnInit:
 
 function askQuestion {
     do {
-        .@qs=getq(NivalisQuest_BlueSage);
+        .@q=getq(NivalisQuest_BlueSage);
+        .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
         .@qt=getq2(NivalisQuest_BlueSageSlimes);
         next;
         if (.@qt >= 255) {
@@ -198,7 +200,7 @@ function askQuestion {
                 mesq l("I tried to keep an eye on him after that, but when I got distracted by some newly arriving visitor he went over to the workshop again! Usually I enjoy my job, because I like talking to people, but this guy... was a pain, really.");
                 // It's safe in this context, don't worry
                 if (.@qs % 3 == 0)
-                    setq1 NivalisQuest_BlueSage, .@qs + 1;
+                    setq1 NivalisQuest_BlueSage, .@q + 1;
                 break;
             case 3:
                 mesn;
@@ -263,7 +265,8 @@ OnInit:
 
 function askQuestion {
     do {
-        .@qs=getq(NivalisQuest_BlueSage);
+        .@q=getq(NivalisQuest_BlueSage);
+        .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
         .@qt=getq2(NivalisQuest_BlueSageSlimes);
         next;
         if (.@qt >= 255) {
@@ -292,7 +295,7 @@ function askQuestion {
                 mesq l("But still, he can't just walk in there, fiddle with the experiments and disturb the helpers doing their work.");
                 // It's safe in this context, don't worry
                 if (.@qs % 3 == 0)
-                    setq1 NivalisQuest_BlueSage, .@qs + 1;
+                    setq1 NivalisQuest_BlueSage, .@q + 1;
                 break;
             case 3:
                 mesn;
@@ -349,7 +352,8 @@ OnInit:
 
 function askQuestion {
     do {
-        .@qs=getq(NivalisQuest_BlueSage);
+        .@q=getq(NivalisQuest_BlueSage);
+        .@qs=BSQuestion(getq(NivalisQuest_BlueSage));
         .@qt=getq2(NivalisQuest_BlueSageSlimes);
         next;
         if (.@qt >= 255) {
@@ -383,7 +387,7 @@ function askQuestion {
                 mesq l("Visitors should keep away from those!");
                 // It's safe in this context, don't worry
                 if (.@qs % 3 == 0)
-                    setq1 NivalisQuest_BlueSage, .@qs + 1;
+                    setq1 NivalisQuest_BlueSage, .@q + 1;
                 break;
             case 3:
                 mesn;
-- 
cgit v1.2.3-70-g09d2