Refactor when the options will be shown

2 files changed, 17 insertions, 15 deletions

diff --git a/npc/020-7-1/core.txt b/npc/020-7-1/core.txt
index fd039c275..a247aee3d 100644
--- a/npc/020-7-1/core.txt
+++ b/npc/020-7-1/core.txt
@@ -7,21 +7,23 @@
 
 // Some setup is required
 
-// BSQuestion(quest state)
+// BSQuestion( )
 function	script	BSQuestion	{
-    switch (getarg(0)) {
-        case 3:
-        case 4:
-            return BS_QVISITOR;
-        case 5:
-        case 8:
-            return BS_QHELPER;
-        case 6:
-        case 7:
-        case 9:
-        case 10:
-            return BS_QVISITOR | BS_QHELPER;
+    .@b1=getq(NivalisQuest_BlueSage);
+    .@b2=getq2(NivalisQuest_BlueSage);
+    .@b3=getq3(NivalisQuest_BlueSage);
+    .@rt=0;
+
+    // After you collected everyone's feedback, hide the option
+    if (is_between(3,8,.@b1)) {
+        if (.@b2 < BS_NPCALL)
+            .@rt=.@rt | BS_QHELPER;
+    }
+
+    if (.@b1 == 7) {
+        if (.@b3 < BS_NPCALL)
+            .@rt=.@rt | BS_QVISITOR;
     }
-    return 0;
+    return .@rt;
 }
 
diff --git a/npc/020-7-1/sage.txt b/npc/020-7-1/sage.txt
index 0408c1502..c0c870ea5 100644
--- a/npc/020-7-1/sage.txt
+++ b/npc/020-7-1/sage.txt
@@ -20,7 +20,7 @@
 //      6 - Elias is now worried about a visitor. Ask people about and report.
 //      7 - If everyone found the visitor, confirm Elias the worries
 //      8 - Elias sent you to Oskari to inform the issue. Blue Sage probably knew all along.
-//      will not advance unless everyone thinks Peetu is good.
+//      8/9 WARNING: will not advance unless everyone thinks Peetu is good.
 //      9 - Oskari accepts the cause. Tells to report Peetu that it probably was
 //          a saboutage, to check if the Silk Cocoon really was there.
 //      10 - Peetu confirmed the saboutage. Report to Blue Sage.