1 files changed, 5 insertions, 28 deletions

diff --git a/npc/020-7/workers.txt b/npc/020-7/workers.txt
index 2e7388e8f..580cf78c8 100644
--- a/npc/020-7/workers.txt
+++ b/npc/020-7/workers.txt
@@ -13,31 +13,12 @@
     mesn;
     mesq l("After cleaning for twelve hours straight, they allowed me to rest a bit.");
     .@q=getq(NivalisQuest_BlueSage);
-    switch (.@q) {
-    case 1:
-    case 2:
-    case 13:
-    case 14:
-        break;
-    case 3:
-    case 4:
-        askQuestion(.Q_VISITOR);
-        break;
-    case 5:
-    case 8:
-        askQuestion(.Q_HELPER);
-        break;
-    case 6:
-    case 7:
-    case 9:
-    case 10:
-        askQuestion(.Q_VISITOR | .Q_HELPER);
-        break;
-    default:
+    if (BSQuestion(.@q))
+        askQuestion(BSQuestion(.@q));
+    if (.@q == 12) {
         next;
         mesn;
         mesq l("You did a good job too. Rest a bit, too. There's still one chair.");
-        close;
     }
     close;
 
@@ -47,8 +28,8 @@ function askQuestion {
         .@q=getq(NivalisQuest_BlueSage);
         next;
         select
-            rif(.@qs & .Q_VISITOR, l("Do you know anything about the strange visitor?")),
-            rif(.@qs & .Q_HELPER, l("What's your opinion of Peetu and his work?")),
+            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) {
@@ -71,10 +52,6 @@ function askQuestion {
 }
 
 OnInit:
-    // Bitwise questions
-    .Q_VISITOR=1;
-    .Q_HELPER=2;
-
     .sex=G_MALE;
     .distance=5;
     npcsit;