1 files changed, 33 insertions, 4 deletions
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt
index 2e12efceb..4020fe0c1 100644
--- a/npc/018-6-0/main.txt
+++ b/npc/018-6-0/main.txt
@@ -5,7 +5,7 @@
 //    Controls Forgotten Chamber
 
 /////////////////////////////
-018-6-1,83,26,0	script	#ToForgottenShrine	NPC_SUMMONING_CIRC,0,0,{
+018-6-0,90,67,0	script	#ToForgottenShrine	NPC_SUMMONING_CIRC,0,0,{
     dispbottom l("It looks dangerous.");
     end;
 
@@ -19,15 +19,17 @@ OnTouch:
     }
     end;
 
+
 OnInit:
-OnInstanceInit:
     disablenpc .name$;
     end;
-
+OnInstanceInit:
+    disablenpc instance_npcname(.name$);
+    end;
 }
 
 /////////////////////////////
-018-6-1,83,26,0	script	#FromEleniumMines	NPC_SUMMONING_CIRC,0,0,{
+018-6-0,90,90,0	script	#FromEleniumMines	NPC_SUMMONING_CIRC,0,0,{
     dispbottom l("It should bring me back.");
     end;
 
@@ -46,3 +48,30 @@ OnTouch:
 
 
 
+/////////////////////////////
+018-6-0,90,113,0	script	#ToSouthHall	NPC_SUMMONING_CIRC,0,0,{
+    dispbottom l("It looks dangerous.");
+    end;
+
+OnTouch:
+    .@q=getq(LoFQuest_Barbara);
+    .@q2=getq2(LoFQuest_Barbara);
+    .@q3=getq3(LoFQuest_Barbara);
+    if (.@q == 2 && .@q3 >= 3) {
+        warp BarbaraInstCheck(2), 90, 32;
+        //warp BarbaraInstCheck(0), 90+any(-1, 1), 90+any(-1,1);
+    } else {
+        dispbottom l("I already visited this warp.");
+    }
+    end;
+
+
+OnInit:
+    disablenpc .name$;
+    end;
+OnInstanceInit:
+    disablenpc instance_npcname(.name$);
+    end;
+}
+
+