This will be chaotic to implement >.<

3 files changed, 82 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;
+}
+
+
diff --git a/npc/018-6-2/_import.txt b/npc/018-6-2/_import.txt
index 9a8d640ce..2291a778c 100644
--- a/npc/018-6-2/_import.txt
+++ b/npc/018-6-2/_import.txt
@@ -1,2 +1,3 @@
 // Map 018-6-2: Forgotten Hall
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-6-2/main.txt",
diff --git a/npc/018-6-2/main.txt b/npc/018-6-2/main.txt
new file mode 100644
index 000000000..a1ffd51fa
--- /dev/null
+++ b/npc/018-6-2/main.txt
@@ -0,0 +1,48 @@
+// TMW2 Scripts
+// Author:
+//    Jesusalva
+// Description:
+//    Controls Forgotten Chamber
+
+/////////////////////////////
+018-6-2,90,31,0	script	#FromSouthHall	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) {
+        // 1 - West Puzzle
+        if (!(.@q3 & 1)) {
+            warp BarbaraInstCheck(0), 68, 90;
+            setq3 LoFQuest_Barbara, .@q3|1;
+        }
+        // 2 - East Puzzle
+        else if (!(.@q3 & 2)) {
+            warp BarbaraInstCheck(0), 112, 90;
+            setq3 LoFQuest_Barbara, .@q3|2;
+        }
+        // Wut
+        else {
+            Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-2.FSH", RB_DEFAULT|RB_ISFATAL);
+        }
+        // Active the quest
+        if (.@q3 == 3)
+            enablenpc instance_npcname("#ToSouthHall", .@q2);
+    } else {
+        Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-2.FSH.MQ");
+    }
+    end;
+
+OnInit:
+    disablenpc .name$;
+    end;
+OnInstanceInit:
+    disablenpc instance_npcname(.name$);
+    end;
+
+}
+
+