From d890751e6fad356e92c01839aa638378e0c48967 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 20 May 2019 15:17:33 -0300
Subject: Rework Blue Sage logic

---
 npc/020-7/workers.txt | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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

diff --git a/npc/020-7/workers.txt b/npc/020-7/workers.txt
index 5643c9389..b5d2f734e 100644
--- a/npc/020-7/workers.txt
+++ b/npc/020-7/workers.txt
@@ -26,6 +26,8 @@ function askQuestion {
     .@qs=getarg(0);
     do {
         .@q=getq(NivalisQuest_BlueSage);
+        .@q2=getq2(NivalisQuest_BlueSage);
+        .@q3=getq3(NivalisQuest_BlueSage);
         next;
         select
             rif(.@qs & BS_QVISITOR, l("Do you know anything about the strange visitor?")),
@@ -43,8 +45,8 @@ function askQuestion {
                 next;
                 mesn;
                 mesq l("If Nikolai's helpers weren't so carefully chosen, I'd think this was some kind of a bad joke from someone.");
-                if (is_between(4, 7, .@q))
-                    setq1 NivalisQuest_BlueSage, .@q + 3;
+                if (!(.@q3 & .bsId))
+                    setq3 NivalisQuest_BlueSage, .@q3 | .bsId;
                 break;
         }
     } while (@menu != 3);
@@ -52,6 +54,7 @@ function askQuestion {
 }
 
 OnInit:
+    .bsId=BS_NPC01;
     .sex=G_MALE;
     .distance=5;
     npcsit;
@@ -125,6 +128,8 @@ function askQuestion {
     .@qs=getarg(0);
     do {
         .@q=getq(NivalisQuest_BlueSage);
+        .@q2=getq2(NivalisQuest_BlueSage);
+        .@q3=getq3(NivalisQuest_BlueSage);
         next;
         select
             rif(.@qs & BS_QVISITOR, l("Do you know anything about the strange visitor?")),
@@ -135,9 +140,8 @@ function askQuestion {
             case 1:
                 mesn;
                 mesq l("With a mask? Yeah, I remember. That was a strange guy. He came to visit the library, but he lurked around at the workshop area and they had to send him back to the books.");
-                // It's safe in this context, don't worry
-                if (.@q % 3 == 0)
-                    setq1 NivalisQuest_BlueSage, .@q + 1;
+                if (!(.@q2 & .bsId))
+                    setq2 NivalisQuest_BlueSage, .@q2 | .bsId;
                 break;
             case 2:
                 mesn;
@@ -149,6 +153,7 @@ function askQuestion {
 }
 
 OnInit:
+    .bsId=BS_NPC01;
     .sex=G_FEMALE;
     .distance=5;
     npcsit;
-- 
cgit v1.2.3-60-g2f50