1 files changed, 11 insertions, 1 deletions
diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt
index 89658dee9..5a1331aaf 100644
--- a/npc/018-6-1/main.txt
+++ b/npc/018-6-1/main.txt
@@ -85,9 +85,19 @@ OnInstanceInit:
 
 OnTouch:
     .@q=getq(LoFQuest_Barbara);
+    .@q2=getq2(LoFQuest_Barbara);
+    .@q3=getq3(LoFQuest_Barbara);
     if (.@q >= 1) {
         warp BarbaraInstCheck(0), 90, 91;
-        //warp BarbaraInstCheck(0), 90+any(-1, 1), 90+any(-1,1);
+        // Complete the first arc if possible
+        if (.@q == 1) {
+            setq1 LoFQuest_Barbara, 2;
+            setq3 LoFQuest_Barbara, 0;
+        }
+        // Update M0 NPCs based on quest state
+        if (.@q3 == 5)
+            enablenpc instance_npcname("#ToForgottenShrine", .@q2);
+
     } else {
         Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-1.TFC");
     }