summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/048-2/helperAccused.txt2
-rw-r--r--world/map/npc/048-2/helperChief.txt1
-rw-r--r--world/map/npc/048-2/helperJanitor.txt27
3 files changed, 26 insertions, 4 deletions
diff --git a/world/map/npc/048-2/helperAccused.txt b/world/map/npc/048-2/helperAccused.txt
index 8b552914..96bc6827 100644
--- a/world/map/npc/048-2/helperAccused.txt
+++ b/world/map/npc/048-2/helperAccused.txt
@@ -12,7 +12,7 @@
if (QL_BSAGE_INVESTIGATE == 1) goto L_Help;
mes "You see a rather stressed helper, mumbling to himself.";
- if (BaseLevel < $@Q_BlueSageMinimumLevel)
+ if (BaseLevel < $@Q_BlueSageMinimumLevel || !QL_BSAGE_INVESTIGATE)
goto L_Close;
mes "[Peetu]";
mes "\"How could this have happened? I don't understand it... I'm sure I did the sealing correctly. Maybe the ingredients... but that doesn't make sense. They're checked regularly and...\"";
diff --git a/world/map/npc/048-2/helperChief.txt b/world/map/npc/048-2/helperChief.txt
index ed5b6f94..5f095aa5 100644
--- a/world/map/npc/048-2/helperChief.txt
+++ b/world/map/npc/048-2/helperChief.txt
@@ -36,6 +36,7 @@ L_Next:
next;
mes "\"You should find out if someone observed anything unusual during the time before the accident happened.\"";
set QL_BSAGE_INVESTIGATE, 2;
+ goto L_Close;
L_Investigate:
mes "[Oskari]";
diff --git a/world/map/npc/048-2/helperJanitor.txt b/world/map/npc/048-2/helperJanitor.txt
index babfa5e2..a2722e94 100644
--- a/world/map/npc/048-2/helperJanitor.txt
+++ b/world/map/npc/048-2/helperJanitor.txt
@@ -4,12 +4,27 @@
// Elias is the janitor of the mansion
// part of investigation subquest, gives initial hint on the visitor with the mask
-048-2,40,41,0|script|Elias|110
+048-2,36,44,0|script|Debug#BlueSage|110
+{
+ mes "QUEST_BlueSage: "+ QUEST_BlueSage;
+ mes "QL_BSAGE_INVESTIGATE: "+ QL_BSAGE_INVESTIGATE;
+ next;
+ menu
+ "set QL_BSAGE_INVESTIGATE", L_Investigate;
+
+L_Investigate:
+ input @state;
+ if(@state < 0 || @state > 14) set @state, 0;
+ set QL_BSAGE_INVESTIGATE, @state;
+ close;
+}
+
+048-2,40,41,0|script|Elias|110,7,6
{
if (QL_BSAGE_INVESTIGATE == 11) goto L_Thank;
if ((QL_BSAGE_INVESTIGATE == 4) || (QL_BSAGE_INVESTIGATE == 7) || (QL_BSAGE_INVESTIGATE == 10)) goto L_Confirmed;
if ((QL_BSAGE_INVESTIGATE == 3) || (QL_BSAGE_INVESTIGATE == 6) || (QL_BSAGE_INVESTIGATE == 9)) goto L_Worry;
- if (QUEST_BlueSage > 0) goto L_ShortHello;
+ if (QUEST_BlueSage > 0 && QL_BSAGE_INVESTIGATE < 13) goto L_ShortHello;
mes "[Elias]";
mes "\"Welcome to the residence of Nikolai, member of the Sages of Kaizei.\"";
@@ -23,10 +38,17 @@
mes "[Elias]";
mes "\"So, if you came because of the library, I'll have to disappoint you, because there isn't much left.";
mes "Though you look like a skilled adventurer. If you'd like to offer your help that'd be greatly appreciated.\"";
+ if(QL_BSAGE_INVESTIGATE == 13)
+ set QL_BSAGE_INVESTIGATE, 14;
next;
mes "\"The library is on the third floor.\"";
goto L_Close;
+OnTouch:
+ if (BaseLevel >= $@Q_BlueSageMinimumLevel && !QL_BSAGE_INVESTIGATE)
+ set QL_BSAGE_INVESTIGATE, 13;
+ end;
+
L_ShortHello:
mes "[Elias]";
mes "\"Welcome back. I heard you're helping with the cleanup efforts in the library.";
@@ -47,7 +69,6 @@ L_Next:
mes "\"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?\"";
set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1;
- callfunc "updateBlueSageInvestigate";
menu
"Sure, but it's interesting that he was here shortly before the accident.",L_Close,