From e2b546eaf63a0d3812a19c65dd16e2aa524f376e Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 1 Sep 2019 14:36:42 -0300
Subject: West and East Wings should now be working

---
 npc/018-6-0/main.txt |  6 ++++++
 npc/018-6-2/main.txt | 14 ++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'npc')

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 {
-- 
cgit v1.2.3-70-g09d2