Bluesage Workflow. Make Tipiu a bit slower. (12 commits)

6 files changed, 135 insertions, 6 deletions

diff --git a/db/constants.conf b/db/constants.conf
index da8890a41..4a86b5d64 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4319,6 +4319,7 @@ constants_db: {
     BS_NPC05:           16
     BS_NPC06:           32
     BS_NPC07:           64
+    BS_NPCALL:          127
     // S - Slime Nest
     BS_SNEST1:          1
     BS_SNEST2:          2
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 595340931..7893c4abf 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -565,7 +565,7 @@ mob_db: (
 		ChangeTargetMelee: true
 		ChangeChase: true
 	}
-	MoveSpeed: 200
+	MoveSpeed: 210
 	AttackDelay: 1120
 	AttackMotion: 1672
 	DamageMotion: 100
diff --git a/npc/020-7-1/oskari.txt b/npc/020-7-1/oskari.txt
index ba35c5388..43b213be4 100644
--- a/npc/020-7-1/oskari.txt
+++ b/npc/020-7-1/oskari.txt
@@ -4,6 +4,32 @@
 //    TMW Org.
 // Description:
 //    Helper boss
+//
+// NivalisQuest_BlueSage STRUCTURE
+//  FIELD 1:
+//      INVESTIGATION
+//      1 - STBY OUTSIDE
+//      2 - ACCESS GRANTED
+//      3 - QUEST ASSIGNED BY PEETU - talk to Oskari (and others)
+//      4 - Oskari is OK with peetu, but wanna hear from others. He also sends you
+//          to ask what Peetu happened
+//      5 - Adultered ingredients seems the cause, report to Elias
+//      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.
+//      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.
+//      11 - Blue Sage accepted the evidence, and explains about other sages issues.
+//          It's not known who or what is behind this. He excuses for making you waste
+//          your time. He asks you to return to him later, as he needs to write letters.
+//      12 - QUEST COMPLETE - You collected your reward
+//          Also picked up a letter for Frostia Mayor, about the incident (Main Story).
+//  FIELD 2:
+//      Bitwise (BS_QVISITOR)
+//  FIELD 3:
+//      Bitwise (BS_QHELPER)
 
 020-7-1,122,29,0	script	Oskari	NPC_BLUESAGEWORKER_FB,{
     .@q=getq(NivalisQuest_BlueSage);
@@ -12,6 +38,40 @@
     end;
 
 OnInit:
+    initpath "move", 122, 29,
+             "dir", UP, 0,
+             "wait", 15, 0,
+             "dir", LEFT, 0,
+             "move", 56, 29,
+             "wait", 3, 0,
+             "dir", RIGHT, 0,
+             "wait", 7, 0,
+             "dir", LEFT, 0,
+             "wait", 7, 0,
+             "dir", DOWN, 0,
+             "move", 55, 48,
+             "wait", 3, 0,
+             "dir", RIGHT, 0,
+             "wait", 10, 0,
+             "dir", DOWN, 0,
+             "wait", 10, 0,
+             "dir", LEFT, 0,
+             "wait", 3, 0,
+             "move", 26, 46,
+             "dir", UP, 0,
+             "wait", 4, 0,
+             "dir", RIGHT, 0,
+             "wait", 4, 0,
+             "dir", DOWN, 0,
+             "wait", 2, 0,
+             "move", 25, 77,
+             "wait", 3, 0,
+             "dir", RIGHT, 0,
+             "wait", 10, 0;
+            // And go back to Peetu, which is very far away, 'cause I'm lazy
+    initialmove;
+    initnpctimer;
+
     .sex=G_FEMALE;
     .distance=5;
     end;
diff --git a/npc/020-7-1/peetu.txt b/npc/020-7-1/peetu.txt
index 2de327fae..dee7aca40 100644
--- a/npc/020-7-1/peetu.txt
+++ b/npc/020-7-1/peetu.txt
@@ -4,10 +4,37 @@
 //    TMW Org.
 // Description:
 //    Peetu
+//
+// NivalisQuest_BlueSage STRUCTURE
+//  FIELD 1:
+//      INVESTIGATION
+//      1 - STBY OUTSIDE
+//      2 - ACCESS GRANTED
+//      3 - QUEST ASSIGNED BY PEETU - talk to Oskari (and others)
+//      4 - Oskari is OK with peetu, but wanna hear from others. He also sends you
+//          to ask what Peetu happened
+//      5 - Adultered ingredients seems the cause, report to Elias
+//      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.
+//      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.
+//      11 - Blue Sage accepted the evidence, and explains about other sages issues.
+//          It's not known who or what is behind this. He excuses for making you waste
+//          your time. He asks you to return to him later, as he needs to write letters.
+//      12 - QUEST COMPLETE - You collected your reward
+//          Also picked up a letter for Frostia Mayor, about the incident (Main Story).
+//  FIELD 2:
+//      Bitwise (BS_QVISITOR)
+//  FIELD 3:
+//      Bitwise (BS_QHELPER)
 
 020-7-1,122,27,2	script	Peetu	NPC_BLUESAGEWORKER_MA,{
     .@q=getq(NivalisQuest_BlueSage);
-    npctalk3 any(l("*sob sob*"), l("*crying*"));
+    if (.@q < 12)
+        npctalk3 any(l("*sob sob*"), l("*crying*"));
     end;
 
 OnInit:
diff --git a/npc/020-7-1/sage.txt b/npc/020-7-1/sage.txt
index 96340d02b..0408c1502 100644
--- a/npc/020-7-1/sage.txt
+++ b/npc/020-7-1/sage.txt
@@ -4,8 +4,35 @@
 //    TMW Org.
 // Description:
 //    Blue Sage
-
-// Oskari: Need to be placed somewhere here (on this file, variant B)
+//
+//    Minimum level: 36 (implicit)
+//    Minimum jblvl: 16 (implicit)
+//
+// NivalisQuest_BlueSage STRUCTURE
+//  FIELD 1:
+//      INVESTIGATION
+//      1 - STBY OUTSIDE
+//      2 - ACCESS GRANTED
+//      3 - QUEST ASSIGNED BY PEETU - talk to Oskari (and others)
+//      4 - Oskari is OK with peetu, but wanna hear from others. He also sends you
+//          to ask what Peetu happened
+//      5 - Adultered ingredients seems the cause, report to Elias
+//      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.
+//      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.
+//      11 - Blue Sage accepted the evidence, and explains about other sages issues.
+//          It's not known who or what is behind this. He excuses for making you waste
+//          your time. He asks you to return to him later, as he needs to write letters.
+//      12 - QUEST COMPLETE - You collected your reward
+//          Also picked up a letter for Frostia Mayor, about the incident (Main Story).
+//  FIELD 2:
+//      Bitwise (BS_QVISITOR)
+//  FIELD 3:
+//      Bitwise (BS_QHELPER)
 
 020-7-1,35,59,0	script	The Blue Sage	NPC_BLUESAGE,{
     .@cindy=($@CINDY_STATE < gettimetick(2));
diff --git a/npc/020-7/elias.txt b/npc/020-7/elias.txt
index 14f171ef9..e29121e09 100644
--- a/npc/020-7/elias.txt
+++ b/npc/020-7/elias.txt
@@ -12,8 +12,22 @@
 //      INVESTIGATION
 //      1 - STBY OUTSIDE
 //      2 - ACCESS GRANTED
-//      3 - QUEST ASSIGNED BY PEETU
-//      12 - COMPLETE
+//      3 - QUEST ASSIGNED BY PEETU - talk to Oskari (and others)
+//      4 - Oskari is OK with peetu, but wanna hear from others. He also sends you
+//          to ask what Peetu happened
+//      5 - Adultered ingredients seems the cause, report to Elias
+//      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.
+//      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.
+//      11 - Blue Sage accepted the evidence, and explains about other sages issues.
+//          It's not known who or what is behind this. He excuses for making you waste
+//          your time. He asks you to return to him later, as he needs to write letters.
+//      12 - QUEST COMPLETE - You collected your reward
+//          Also picked up a letter for Frostia Mayor, about the incident (Main Story).
 //  FIELD 2:
 //      Bitwise (BS_QVISITOR)
 //  FIELD 3: