4 files changed, 69 insertions, 2 deletions
diff --git a/npc/003-2/_warps.txt b/npc/003-2/_warps.txt
index 81dacb5e7..822f56e58 100644
--- a/npc/003-2/_warps.txt
+++ b/npc/003-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-2: Tulimshar Guild  warps
+// Map 003-2: Tulimshar Guild warps
 003-2,32,41,0	warp	#003-2_32_41	0,0,003-1,46,73
 003-2,35,41,0	warp	#003-2_35_41	0,0,003-1,49,73
 003-2,38,41,0	warp	#003-2_38_41	0,0,003-1,52,73
diff --git a/npc/006-6/all.txt b/npc/006-6/all.txt
index bd1f6de45..8b69bead8 100644
--- a/npc/006-6/all.txt
+++ b/npc/006-6/all.txt
@@ -23,7 +23,7 @@ OnInit:
 }
 
 006-6,39,36,0	script	Sign#0066ER	NPC_SWORDS_SIGN,{
-    mesc l("East Room closed for repairs");
+    mesc l("With Magic and Blades, The Icicle shall break.");
     close;
 
 OnInit:
@@ -32,3 +32,18 @@ OnInit:
     end;
 }
 
+// Effective warps
+006-6,40,35,0	script	Magic Barrier#0067	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    if (BaseLevel > 50)
+        warp "006-7", 44, 49;
+    else
+        dispbottom l("Your strength is not enough to power on this portal.");
+    end;
+}
+
+
+
+
diff --git a/npc/006-7/_import.txt b/npc/006-7/_import.txt
index 11f029671..7dc8dace0 100644
--- a/npc/006-7/_import.txt
+++ b/npc/006-7/_import.txt
@@ -1,2 +1,3 @@
 // Map 006-7: Existential Frontier
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-7/ctrl.txt",
diff --git a/npc/006-7/ctrl.txt b/npc/006-7/ctrl.txt
new file mode 100644
index 000000000..da46197aa
--- /dev/null
+++ b/npc/006-7/ctrl.txt
@@ -0,0 +1,51 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-7,44,50,0	script	#OutOf0067	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    if (!$@ICICLE_CHALLENGE)
+        warp "006-6", 40, 36;
+    end;
+}
+
+006-7,44,50,0	script	Ice Lord	NPC_YETIFLY,{
+    if (.ticks > gettimetick(2)) end;
+    mesn;
+    mesq l("With Magic and Blades, The Icicle shall break. Do you undertake the challenge?");
+    mesc l("Advised: 6+ players"), 1;
+    mesc l("Advised: 1+ mage, 1+ tanker"), 1;
+    mesc l("Time Limit: 90 minutes"), 1;
+    next;
+    if (askyesno() == ASK_NO) { closeclientdialog; close; }
+
+    .ticks = gettimetick(2) + 5400; // 90 minutes
+
+    disablenpc .name$;
+    initnpctimer;
+    closeclientdialog;
+    close;
+
+// Heart
+OnTimer5000:
+    if (.ticks < gettimetick(2) || !mobcount("006-7", "all")) {
+        killmonsterall("006-7");
+        enablenpc .name$;
+        .ticks = gettimetick(2);
+        .beats = 0;
+        stopnpctimer;
+        end;
+    }
+    .beats += 1;
+    initnpctimer;
+    end;
+
+OnInit:
+    .distance = 4;
+    .ticks = gettimetick(2);
+    .beats = 0;
+    end;
+}
+