Peetu NPC, continue storyline dialog writing, give more mana exp at #mkpot

4 files changed, 122 insertions, 8 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 4a86b5d64..b6fb7a00a 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4037,6 +4037,7 @@ constants_db: {
 	NPC_BLUESAGEWORKER_MB:  196
 	NPC_BLUESAGEWORKER_FB:  197
 	NPC_BLUESAGE:           198
+	NPC_BLUESAGEWORKER_MC:  199
 
 	// LoF Non Animated NPCs
 	NPC_FORTIUN:            200
diff --git a/npc/020-7-1/oskari.txt b/npc/020-7-1/oskari.txt
index 43b213be4..e9d900052 100644
--- a/npc/020-7-1/oskari.txt
+++ b/npc/020-7-1/oskari.txt
@@ -32,10 +32,74 @@
 //      Bitwise (BS_QHELPER)
 
 020-7-1,122,29,0	script	Oskari	NPC_BLUESAGEWORKER_FB,{
+    function pIdle;
+
+    function pPeetu; // Peetu sent you to them
+    function pElias; // Elias sent you to them
+    function pComplete;
+
     .@q=getq(NivalisQuest_BlueSage);
-    npctalk3 "Me boss";
-    goodbye;
-    end;
+    switch (.@q) {
+        case 2:
+            pIdle();
+            break;
+        case 3:
+            pPeetu();
+            break;
+        case 4:
+        case 5:
+        case 6:
+        case 7:
+            pIdle();
+            break;
+        case 8:
+            pElias();
+            break;
+        case 9:
+        case 10:
+        case 11:
+            pIdle();
+            break;
+        case 12:
+            pComplete();
+            break;
+        default:
+            warp "Save", 0, 0;
+            percentheal -100, -100;
+            end;
+            break;
+    }
+    close;
+
+
+// Here we begin
+function pIdle {
+    mesn;
+    mesq l("You have to excuse me, as you might have heard we're having some trouble at the moment and I, as Chief of Nikolai's household staff, have a lot to do.");
+    close;
+}
+
+// Here we begin
+function pPeetu {
+    mesn;
+    mesq l("ERROR PEETU");
+    close;
+}
+
+// Here we begin
+function pElias {
+    mesn;
+    mesq l("ERROR ELIAS");
+    close;
+}
+
+// Here we begin
+function pComplete {
+    mesn;
+    mesq l("Thanks again for your investigations. It was a great help.");
+    close;
+}
+
 
 OnInit:
     initpath "move", 122, 29,
diff --git a/npc/020-7-1/peetu.txt b/npc/020-7-1/peetu.txt
index 35f207b7c..246a6b9dc 100644
--- a/npc/020-7-1/peetu.txt
+++ b/npc/020-7-1/peetu.txt
@@ -31,13 +31,13 @@
 //  FIELD 3:
 //      Bitwise (BS_QHELPER)
 
-020-7-1,122,27,2	script	Peetu	NPC_BLUESAGEWORKER_MA,{
+020-7-1,122,27,2	script	Peetu	NPC_BLUESAGEWORKER_MC,{
     function pWaiting;
 
     function pIntro;
     function pContinue;
     function pReflection;
-    function pInvestigation;
+    function pInvestigation; // TODO
     function pComplete;
 
     .@q=getq(NivalisQuest_BlueSage);
@@ -58,6 +58,8 @@
             pReflection();
             break;
         case 5:
+            pWaiting("Elias"); // In case they skipped all dialogs and are now lost.
+            break;
         case 6:
         case 7:
         case 8:
@@ -218,9 +220,56 @@ function pReflection {
     .@q=getq(NivalisQuest_BlueSage);
     .@q2=getq2(NivalisQuest_BlueSage);
     .@q3=getq3(NivalisQuest_BlueSage);
+    select
+        l("Good news: Oskari doesn't plans in firing you (yet)!"),
+        l("I'm here to investigate what exactly happened so this doesn't happens again."),
+        l("Everyone commit mistakes and Oskari was very understanding. I need to do some questions about the incident though."),
+        l("Oskari have a good opinion of you. Can you tell what exactly happened?");
+    mes "";
     mesn;
     mesc l("*sniff sniff*");
-    mesq l("I'm waiting for ##1##BBUG, REPORT ME: PEETU IS WAITING THE FLYING COW##0##b feedback... Please go talk to them! %%S", .@name$);
+    mesq l("So... You see... I usually pay a lot of attention to my work. Especially when doing something as delicate as sealing away the slimes for the night.");
+    next;
+    mesn;
+    mesq l("We're doing researches on slimes, the explosive ones. You probably saw when they explode, they damage anything close to them, friendly or not, right?");
+    next;
+    mesn;
+    mesq l("Nikolai said it was important, so we keep a few of them locked in the basement. I apply a spell to seal them so they don't wander around, explode around, or... *sniff*...");
+    next;
+    mesn;
+    mesq l("It's a very delicate spell. I usually start to prepare it while the helpers are still working on their research and experiments. That way, when they're done, they can just come and place the slimes under the seal.");
+    next;
+    mesn;
+    mesq l("So... @@ That night, I cast it as usual. Everything seemed alright so I went to bed.", "##9*sniff*##0");
+    next;
+    mesn;
+    mesc l("Eyes grows!");
+    mesq l("I woke up in a shake! I felt... Oh, it's hard to describe... As if the spell suddenly started inflating, getting bigger... bigger... weaker... weaker...");
+    next;
+    mesn;
+    mesc l("*snap fingers*");
+    mesq l("And then, it was no more! It vanished! In a matter of minutes the slimes were all over the library. A good thing they are slow, none escaped to the town.");
+    next;
+    mesn;
+    mesq l("Of course I hurried there as fast as I could, yelling to wake up everyone, but that caused so much confusion that we fell over each other in the corridor and when we finally reached the library, the slimes were already spread all over the room, eating or exploding the books.");
+    next;
+    select
+        l("*snooze*"),
+        l("And have you thought in the cause?");
+    mes "";
+    if (@menu == 1)
+        clear;
+    mesn;
+    mesq l("Now that I've described the spells to you, I'm sure I cast them correctly. But... I think there is a way to have these effects. It's silly though.");
+    next;
+    mesn;
+    mesq l("I never tried it, because it makes no sense to do that, but theoretically adding some Silk Cocoons could have such an effect. Uh... but that should not happen.");
+    next;
+    mesn;
+    mesq l("Could you please ask @@ about it? The ingredients... It would still be my fault..."), b(l("Elias"));
+    next;
+    mesc l("@@ is on the verge of crying again. Better leave out and look for Elias.", .name$);
+    setq1 NivalisQuest_BlueSage, 4;
     close;
 }
 
@@ -239,7 +288,7 @@ function pInvestigation {
 // The crime was "solved"
 function pComplete {
     mesn;
-    mesq l("Oh, hey, welcome back, @@! Many thanks for helping me!", strcharinfo(0));
+    mesq l("Oh, hey, welcome back, @@! THanks for all your help!", strcharinfo(0));
     next;
     mesn;
     .@subject$=any(l("town finances"), l("house finances"), l("town damage by monsters"), l("library damage"), l("supply report"), l("magic book"), l("town overview"));
diff --git a/npc/magic/mkpot.txt b/npc/magic/mkpot.txt
index b0ad75f77..576de7ebc 100644
--- a/npc/magic/mkpot.txt
+++ b/npc/magic/mkpot.txt
@@ -61,7 +61,7 @@ OnCall:
     @mkpot_at=@mkpot_at+6;
 
     // Get a few mana experience points (this is NOT used by Mana Stone)
-    GetManaExp(TMW2_MKPOT, rand(4,6));
+    GetManaExp(TMW2_MKPOT, rand(4,11));
     end;
 
 OnInit: