summaryrefslogtreecommitdiff
path: root/npc/018-6-0/main.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/018-6-0/main.txt')
-rw-r--r--npc/018-6-0/main.txt29
1 files changed, 27 insertions, 2 deletions
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt
index 8282af87f..10e5a8b82 100644
--- a/npc/018-6-0/main.txt
+++ b/npc/018-6-0/main.txt
@@ -122,6 +122,7 @@ OnTouch:
.@q2=getq2(LoFQuest_Barbara);
.@q3=getq3(LoFQuest_Barbara);
if (.@q == 2 && .@q3 >= 3) {
+ addtimer("#01862_InstCtrl::OnLevel3", 100);
enablenpc instance_npcname("#FromWestHall", .@q2);
enablenpc instance_npcname("#FromEastHall", .@q2);
warp BarbaraInstCheck(2), 90, 32;
@@ -149,7 +150,19 @@ OnTouch:
.@q=getq(LoFQuest_Barbara);
.@q2=getq2(LoFQuest_Barbara);
.@q3=getq3(LoFQuest_Barbara);
- if (.@q == 2 && !(.@q3 & 1)) {
+ if (.@q != 2) {
+ dispbottom l("I already visited this warp.");
+ end;
+ }
+
+ // Monster control
+ if (.@q3 & 2)
+ addtimer("#01862_InstCtrl::OnLevel2", 100);
+ else
+ addtimer("#01862_InstCtrl::OnLevel1", 100);
+
+ // Check if quest must begin
+ if (!(.@q3 & 1)) {
// Mark the quest in progress as WEST HALL, and warp
setq3 LoFQuest_Barbara, .@q3|64;
enablenpc instance_npcname("#FromSouthHall", .@q2);
@@ -175,7 +188,19 @@ OnTouch:
.@q=getq(LoFQuest_Barbara);
.@q2=getq2(LoFQuest_Barbara);
.@q3=getq3(LoFQuest_Barbara);
- if (.@q == 2 && !(.@q3 & 2)) {
+ if (.@q != 2) {
+ dispbottom l("I already visited this warp.");
+ end;
+ }
+
+ // Monster control
+ if (.@q3 & 1)
+ addtimer("#01862_InstCtrl::OnLevel2", 100);
+ else
+ addtimer("#01862_InstCtrl::OnLevel1", 100);
+
+ // Check if quest must begin
+ if (!(.@q3 & 2)) {
// Mark the quest in progress as EAST HALL, and warp
setq3 LoFQuest_Barbara, .@q3|128;
enablenpc instance_npcname("#FromSouthHall", .@q2);