1 files changed, 29 insertions, 8 deletions

diff --git a/npc/020-7/elias.txt b/npc/020-7/elias.txt
index e29121e09..162cb7b89 100644
--- a/npc/020-7/elias.txt
+++ b/npc/020-7/elias.txt
@@ -101,19 +101,21 @@ L_Main:
     // .@q is preserved when you use goto
     switch (.@q) {
         case 1:
-        //case 12:
+        case 2:
+        case 3:
+        case 4:
+        case 5:
             eliasQuestion();
             break;
-        case 3:
         case 6:
-        case 9:
             eliasWorry();
             break;
-        case 4:
         case 7:
-        case 10:
+        case 8:
             eliasConfirmed();
             break;
+        case 9:
+        case 10:
         case 11:
             eliasThankyou();
             break;
@@ -124,7 +126,13 @@ L_Main:
     }
     close;
 
+// Elias is worried with visitor and asks for insights
 function eliasWorry {
+    .@q2=getq2(NivalisQuest_BlueSage);
+    if (.@q2 == BS_NPCALL) {
+        setq1 NivalisQuest_BlueSage, 7;
+        eliasConfirmed();
+    }
     mesn;
     mesq l("After your questions I'm really getting worried about this guy with the mask. In retrospect it really seems suspicous.");
     next;
@@ -133,15 +141,19 @@ function eliasWorry {
     return;
 }
 
+// Suspections Confirmed, report back
 function eliasConfirmed {
     mesn;
     mesq l("I heard your investigations reminded other people that they observed suspicious behaviour too.");
     next;
     mesn;
     mesq l("It's all my fault, I should've paid more attention! You should talk to Chief Oskari about this.");
+    if (getq(NivalisQuest_BlueSage) == 7)
+        setq1 NivalisQuest_BlueSage, 8;
     return;
 }
 
+// Waiting quest to end
 function eliasThankyou {
     mesn;
     mesq l("Now that Chief Oskari knows about the sequence of events, the Sage will take care of it. It's really a shame how malicious people can be.");
@@ -151,9 +163,10 @@ function eliasThankyou {
     return;
 }
 
+// Main question to Elias
 function eliasQuestion {
     select
-        l("Can you tell me if there were any unusual visitors before the accident?"),
+        l("Peetu thinks someone put Silk Cocoon along the ingredients."),
         l("Thanks, pal. I still got some matters to discuss with the Blue Sage if you excuse me.");
     mes "";
     if (@menu == 2) {
@@ -162,7 +175,13 @@ function eliasQuestion {
         close;
     }
     mesn;
-    mesq l("Now that Chief Oskari knows about the sequence of events, the Sage will take care of it. It's really a shame how malicious people can be.");
+    mesq l("So, Peetu didn't check the ingredients before casting? That's... Well, I don't know.");
+    next;
+    mesn;
+    mesq l("But that is unlikely, we have no reason to sabotage our own work! You saw the mess it caused. Everyone knew it was important.");
+    next;
+    mesn strcharinfo(0);
+    mesq l("Hmm, it might be a hunch but... Can you tell me if there were any unusual visitors before the accident?");
     next;
     mesn;
     mesq l("Mh, let me think. There were quite a few visitors with different concerns, but that's usual at this time of the year.");
@@ -176,7 +195,9 @@ function eliasQuestion {
     mesn;
     mesc l("Elias gets a bit excited.");
     mesq l("Do you think he may have had something to do with the accident? We're a very hospitable house, so I didn't see a reason to deny him the entrance. I mean, his mask might have been a bit unusual, but hey, there could've been many reasons why someone would wear a mask, don't you think?");
-    setq1 NivalisQuest_BlueSage, .@q + 1;
+    setq1 NivalisQuest_BlueSage, 6;
+    next;
+    eliasWorry();
     return;
 }