summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-01 14:36:42 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-01 14:36:42 -0300
commite2b546eaf63a0d3812a19c65dd16e2aa524f376e (patch)
treee08ce5512c2ac0ab13e941356ad168265c27854a /npc
parentaca448ae2ad09914783fcba80505fc6f78d597a6 (diff)
downloadserverdata-e2b546eaf63a0d3812a19c65dd16e2aa524f376e.tar.gz
serverdata-e2b546eaf63a0d3812a19c65dd16e2aa524f376e.tar.bz2
serverdata-e2b546eaf63a0d3812a19c65dd16e2aa524f376e.tar.xz
serverdata-e2b546eaf63a0d3812a19c65dd16e2aa524f376e.zip
West and East Wings should now be working
Diffstat (limited to 'npc')
-rw-r--r--npc/018-6-0/main.txt6
-rw-r--r--npc/018-6-2/main.txt14
2 files changed, 16 insertions, 4 deletions
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt
index 40827f383..9789d82f7 100644
--- a/npc/018-6-0/main.txt
+++ b/npc/018-6-0/main.txt
@@ -84,6 +84,9 @@ OnTouch:
.@q2=getq2(LoFQuest_Barbara);
.@q3=getq3(LoFQuest_Barbara);
if (.@q == 2 && !(.@q3 & 1)) {
+ // Mark the quest in progress as WEST HALL, and warp
+ setq3 LoFQuest_Barbara, .@q3|64;
+ enablenpc instance_npcname("#FromSouthHall", .@q2);
warp BarbaraInstCheck(2), 70, 150;
} else {
dispbottom l("I already visited this warp.");
@@ -107,6 +110,9 @@ OnTouch:
.@q2=getq2(LoFQuest_Barbara);
.@q3=getq3(LoFQuest_Barbara);
if (.@q == 2 && !(.@q3 & 2)) {
+ // Mark the quest in progress as EAST HALL, and warp
+ setq3 LoFQuest_Barbara, .@q3|128;
+ enablenpc instance_npcname("#FromSouthHall", .@q2);
warp BarbaraInstCheck(2), 103, 156;
} else {
dispbottom l("I already visited this warp.");
diff --git a/npc/018-6-2/main.txt b/npc/018-6-2/main.txt
index a1ffd51fa..caaa32a65 100644
--- a/npc/018-6-2/main.txt
+++ b/npc/018-6-2/main.txt
@@ -14,15 +14,21 @@ OnTouch:
.@q2=getq2(LoFQuest_Barbara);
.@q3=getq3(LoFQuest_Barbara);
if (.@q == 2) {
- // 1 - West Puzzle
- if (!(.@q3 & 1)) {
+ // 1/64 - West Puzzle
+ if (!(.@q3 & 64)) {
warp BarbaraInstCheck(0), 68, 90;
setq3 LoFQuest_Barbara, .@q3|1;
+ .@q3=getq3(LoFQuest_Barbara);
+ setq3 LoFQuest_Barbara, .@q3^64;
+ disablenpc instance_npcname(.name$, .@q2);
}
- // 2 - East Puzzle
- else if (!(.@q3 & 2)) {
+ // 2/128 - East Puzzle
+ else if (!(.@q3 & 128)) {
warp BarbaraInstCheck(0), 112, 90;
setq3 LoFQuest_Barbara, .@q3|2;
+ .@q3=getq3(LoFQuest_Barbara);
+ setq3 LoFQuest_Barbara, .@q3^128;
+ disablenpc instance_npcname(.name$, .@q2);
}
// Wut
else {