Prepare the Bloodbath Room

5 files changed, 46 insertions, 4 deletions

diff --git a/npc/006-6/all.txt b/npc/006-6/all.txt
index 50a40781f..41ec7b611 100644
--- a/npc/006-6/all.txt
+++ b/npc/006-6/all.txt
@@ -3,7 +3,7 @@
 //    Jesusalva
 
 006-6,53,36,0	script	Sign#0066WR	NPC_SWORDS_SIGN,{
-    mesc l("West Room closed for repairs");
+    mesc l("In a blood bath, survival is the epitaph.");
     close;
 
 OnInit:
@@ -33,17 +33,28 @@ OnInit:
 }
 
 // Effective warps
-006-6,40,35,0	script	Magic Barrier#0067	NPC_HIDDEN,0,0,{
+006-6,40,35,0	script	Magic Barrier#0067E	NPC_HIDDEN,0,0,{
     end;
 
 OnTouch:
-    if (!$@ICICLE_CHALLENGE)
+    if (!$@ICICLE_CHALLENGE || is_admin())
         warp "006-7", 44, 49;
     else
         dispbottom l("Your strength is not enough to power on this portal.");
     end;
 }
 
+// Effective warps
+006-6,54,35,0	script	Magic Barrier#0067W	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    if (!$@SURVIVAL_CANDOR || is_admin())
+        warp "006-9", 37, 22;
+    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 7dc8dace0..87e959550 100644
--- a/npc/006-7/_import.txt
+++ b/npc/006-7/_import.txt
@@ -1,3 +1,3 @@
-// Map 006-7: Existential Frontier
+// Map 006-7: Aethyr Chamber
 // 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-9/_import.txt b/npc/006-9/_import.txt
new file mode 100644
index 000000000..d1042ca2a
--- /dev/null
+++ b/npc/006-9/_import.txt
@@ -0,0 +1,3 @@
+// Map 006-9: The Abyss
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-9/ctrl.txt",
diff --git a/npc/006-9/ctrl.txt b/npc/006-9/ctrl.txt
new file mode 100644
index 000000000..c9bdaba19
--- /dev/null
+++ b/npc/006-9/ctrl.txt
@@ -0,0 +1,27 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-9,37,21,0	script	#OutOf0069	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    if (!$@SURVIVAL_CANDOR)
+        warp "006-6", 40, 36;
+    end;
+}
+
+006-9,55,32,0	script	Bloodbath	NPC_NO_SPRITE,{
+    if ($@SURVIVAL_CANDOR) end;
+    // $@SURVIVAL_CANDOR = gettimetick(2);
+    mesn;
+    mes l("Goal: Survive the longest possible.");
+    mes l("Monsters will spawn in the south fountain continuously.");
+    mes l("After five minutes, they'll also start spawning on whole map.");
+    close;
+
+OnInit:
+    .distance=3;
+    end;
+}
+
diff --git a/npc/_import.txt b/npc/_import.txt
index ed32d2623..d5346f8f2 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -72,6 +72,7 @@
 @include "npc/006-5/_import.txt"
 @include "npc/006-6/_import.txt"
 @include "npc/006-7/_import.txt"
+@include "npc/006-9/_import.txt"
 @include "npc/007-1/_import.txt"
 @include "npc/007-2/_import.txt"
 @include "npc/008-0/_import.txt"