diff options
| -rw-r--r-- | npc/018-6-0/main.txt | 29 | ||||
| -rw-r--r-- | npc/018-6-2/main.txt | 2 |
2 files changed, 29 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); diff --git a/npc/018-6-2/main.txt b/npc/018-6-2/main.txt index dd92bd730..779c7098f 100644 --- a/npc/018-6-2/main.txt +++ b/npc/018-6-2/main.txt @@ -74,6 +74,7 @@ OnTouch: // East hall not yet enabled, we must repeat if (!(.@q3 & 128)) { // Mark the west hall as complete (again) + addtimer("#01862_InstCtrl::OnLevel4", 100); setq3 LoFQuest_Barbara, .@q3|64; disablenpc instance_npcname(.name$, .@q2); warp BarbaraInstCheck(2), 90, 32; @@ -110,6 +111,7 @@ OnTouch: // West hall not yet enabled, we must repeat if (!(.@q3 & 64)) { // Mark the east hall as complete (again) + addtimer("#01862_InstCtrl::OnLevel4", 100); setq3 LoFQuest_Barbara, .@q3|128; disablenpc instance_npcname(.name$, .@q2); warp BarbaraInstCheck(2), 90, 32; |