From fad04ba82736ea807a3b7d377846597694eb7fe8 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 1 Sep 2019 14:44:34 -0300
Subject: This should resolve south wing. That would allow you to go to shrine.
 Monsters still missing.

---
 npc/018-6-2/main.txt | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

(limited to 'npc/018-6-2')

diff --git a/npc/018-6-2/main.txt b/npc/018-6-2/main.txt
index a990e5781..dd92bd730 100644
--- a/npc/018-6-2/main.txt
+++ b/npc/018-6-2/main.txt
@@ -59,4 +59,75 @@ OnInstanceInit:
 
 }
 
+/////////////////////////////
+018-6-2,70,152,0	script	#FromWestHall	NPC_SUMMONING_CIRC,0,0,{
+    dispbottom l("Should I walk on it?");
+    end;
+
+OnTouch:
+    .@q=getq(LoFQuest_Barbara);
+    .@q2=getq2(LoFQuest_Barbara);
+    .@q3=getq3(LoFQuest_Barbara);
+    if (.@q != 2)
+        Exception("ERROR, INVALID WARP", RB_DEFAULT|RB_ISFATAL);
+
+    // East hall not yet enabled, we must repeat
+    if (!(.@q3 & 128)) {
+        // Mark the west hall as complete (again)
+        setq3 LoFQuest_Barbara, .@q3|64;
+        disablenpc instance_npcname(.name$, .@q2);
+        warp BarbaraInstCheck(2), 90, 32;
+    } else {
+        // Quest is over!
+        setq3 LoFQuest_Barbara, 5;
+        disablenpc instance_npcname(.name$, .@q2);
+        enablenpc instance_npcname("#ToForgottenShrine", .@q2);
+        warp BarbaraInstCheck(0), 90, 112;
+    }
+    end;
+
+
+OnInit:
+    disablenpc .name$;
+    end;
+OnInstanceInit:
+    disablenpc instance_npcname(.name$);
+    end;
+}
+
+/////////////////////////////
+018-6-2,103,156,0	script	#FromEastHall	NPC_SUMMONING_CIRC,0,0,{
+    dispbottom l("Should I walk on it?");
+    end;
+
+OnTouch:
+    .@q=getq(LoFQuest_Barbara);
+    .@q2=getq2(LoFQuest_Barbara);
+    .@q3=getq3(LoFQuest_Barbara);
+    if (.@q != 2)
+        Exception("ERROR, INVALID WARP", RB_DEFAULT|RB_ISFATAL);
+
+    // West hall not yet enabled, we must repeat
+    if (!(.@q3 & 64)) {
+        // Mark the east hall as complete (again)
+        setq3 LoFQuest_Barbara, .@q3|128;
+        disablenpc instance_npcname(.name$, .@q2);
+        warp BarbaraInstCheck(2), 90, 32;
+    } else {
+        // Quest is over!
+        setq3 LoFQuest_Barbara, 5;
+        disablenpc instance_npcname(.name$, .@q2);
+        enablenpc instance_npcname("#ToForgottenShrine", .@q2);
+        warp BarbaraInstCheck(0), 90, 112;
+    }
+    end;
+
+
+OnInit:
+    disablenpc .name$;
+    end;
+OnInstanceInit:
+    disablenpc instance_npcname(.name$);
+    end;
+}
 
-- 
cgit v1.2.3-60-g2f50