More main, core logics, needed for Forgotten Arc

6 files changed, 62 insertions, 3 deletions

diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 871e8b228..95455f729 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -609,5 +609,9 @@ zones: (
 	
 	disabled_items: {
 	}
+
+	disabled_commands: {
+		pvpon: 100
+	}
 }
 )
diff --git a/npc/017-1/townhall.txt b/npc/017-1/townhall.txt
index f005c52b1..05e613eb8 100644
--- a/npc/017-1/townhall.txt
+++ b/npc/017-1/townhall.txt
@@ -86,7 +86,7 @@ function	script	BarbaraInstCheck	{
 	    instance_attachmap("018-6-0", .@inst, false, .@map0$);
 	    instance_attachmap("018-6-1", .@inst, false, .@map1$);
 	    instance_attachmap("018-6-2", .@inst, false, .@map2$);
-	    //instance_attachmap("018-6-3", .@inst, false, .@map3$);
+	    instance_attachmap("018-6-3", .@inst, false, .@map3$);
 	    // Instance lasts two hours
 		instance_set_timeout(7200, 7200, .@inst);
 		instance_init(.@inst);
diff --git a/npc/018-6-0/_import.txt b/npc/018-6-0/_import.txt
index 45be6bdab..0e2c16f0e 100644
--- a/npc/018-6-0/_import.txt
+++ b/npc/018-6-0/_import.txt
@@ -1,2 +1,3 @@
 // Map 018-6-0: Sanctuary - Forgotten Chamber
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-6-0/main.txt",
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt
new file mode 100644
index 000000000..2e12efceb
--- /dev/null
+++ b/npc/018-6-0/main.txt
@@ -0,0 +1,48 @@
+// TMW2 Scripts
+// Author:
+//    Jesusalva
+// Description:
+//    Controls Forgotten Chamber
+
+/////////////////////////////
+018-6-1,83,26,0	script	#ToForgottenShrine	NPC_SUMMONING_CIRC,0,0,{
+    dispbottom l("It looks dangerous.");
+    end;
+
+OnTouch:
+    .@q=getq(LoFQuest_Barbara);
+    if (.@q >= 2) {
+        warp BarbaraInstCheck(3), 31, 151;
+        //warp BarbaraInstCheck(0), 90+any(-1, 1), 90+any(-1,1);
+    } else {
+        Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-1.TFC");
+    }
+    end;
+
+OnInit:
+OnInstanceInit:
+    disablenpc .name$;
+    end;
+
+}
+
+/////////////////////////////
+018-6-1,83,26,0	script	#FromEleniumMines	NPC_SUMMONING_CIRC,0,0,{
+    dispbottom l("It should bring me back.");
+    end;
+
+OnTouch:
+    .@q=getq(LoFQuest_Barbara);
+    if (.@q < 10) {
+        warp BarbaraInstCheck(1), 83, 28;
+        //warp BarbaraInstCheck(0), 90+any(-1, 1), 90+any(-1,1);
+    } else {
+        warp "018-6-1", 83, 28;
+    }
+    end;
+}
+
+
+
+
+
diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt
index cbaed9897..a12bb8672 100644
--- a/npc/018-6-1/main.txt
+++ b/npc/018-6-1/main.txt
@@ -84,7 +84,13 @@ OnInstanceInit:
     end;
 
 OnTouch:
-    Exception("TODO");
+    .@q=getq(LoFQuest_Barbara);
+    if (.@q >= 1) {
+        warp BarbaraInstCheck(0), 90, 91;
+        //warp BarbaraInstCheck(0), 90+any(-1, 1), 90+any(-1,1);
+    } else {
+        Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-1.TFC");
+    }
     end;
 
 OnInit:
diff --git a/npc/items/teleporter.txt b/npc/items/teleporter.txt
index 01a1af586..592817a75 100644
--- a/npc/items/teleporter.txt
+++ b/npc/items/teleporter.txt
@@ -33,7 +33,7 @@ OnUse:
 
     // It have at least 20% chance to break
     // Chances begin at 100%, and lower in 0.01% each second
-    // It will never be below 20%, which happens after 7000 seconds
+    // It will never be below 20%, which happens after 8000 seconds
     .@adj_breakrate=max(2000, 10000-(gettimetick(2)-TELEPORTER_TIME) );
     //debugmes "Adjusted break ratio: %d", .@adj_breakrate;
     if (rand(0,10000) > .@adj_breakrate)