Add 006-6 Candor B3F, and allow warp to it

7 files changed, 81 insertions, 2 deletions

diff --git a/npc/006-3/core.txt b/npc/006-3/core.txt
index 75a20334f..b7dfa8143 100644
--- a/npc/006-3/core.txt
+++ b/npc/006-3/core.txt
@@ -9,9 +9,15 @@ OnTouch:
     if (!getq(CandorQuest_Groata)) goto L_Reject;
     if (!getq(CandorQuest_Jak1)) goto L_Reject;
 
-    // FIXME: B3F is not ready, so fallthrough to L_Reject
+    specialeffect(5000, SELF, getcharid(3));
+    dispbottom l("The power which lies in Candor acknowledges your strength.");
+    sleep2(2500);
+    warp "006-6", 49, 52;
+    sleep2(500);
+    specialeffect(5001, SELF, getcharid(3));
+    end;
+
 L_Reject:
-    //warp "006-3", 49, 52;
     specialeffect(5000, SELF, getcharid(3));
     dispbottom l("The power which lies in Candor rejects your strength.");
     sleep2(3000);
diff --git a/npc/006-6/_import.txt b/npc/006-6/_import.txt
new file mode 100644
index 000000000..824eb53ae
--- /dev/null
+++ b/npc/006-6/_import.txt
@@ -0,0 +1,6 @@
+// Map 006-6: Candor's Underground, B3F
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-6/_mobs.txt",
+"npc/006-6/_warps.txt",
+"npc/006-6/all.txt",
+"npc/006-6/core.txt",
diff --git a/npc/006-6/_mobs.txt b/npc/006-6/_mobs.txt
new file mode 100644
index 000000000..161c5d165
--- /dev/null
+++ b/npc/006-6/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-6: Candor's Underground, B3F mobs
+006-6,46,38,16,14	monster	Yellow Skull Slime	1403,3,120000,30000
+006-6,44,36,15,14	monster	Red Skull Slime	1404,3,120000,30000
+006-6,45,33,18,14	monster	Mineral Bif	1058,4,300000,30000
+006-6,44,32,23,12	monster	Troll	1171,3,240000,30000
+006-6,43,37,18,14	monster	Vampire Bat	1063,12,300000,30000
+006-6,39,46,16,7	monster	Crafty	1018,1,300000,30000
diff --git a/npc/006-6/_warps.txt b/npc/006-6/_warps.txt
new file mode 100644
index 000000000..f9f897bf9
--- /dev/null
+++ b/npc/006-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-6: Candor's Underground, B3F warps
+006-6,49,49,0	warp	#006-6_49_49	0,0,006-3,46,27
diff --git a/npc/006-6/all.txt b/npc/006-6/all.txt
new file mode 100644
index 000000000..bd1f6de45
--- /dev/null
+++ b/npc/006-6/all.txt
@@ -0,0 +1,34 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-6,53,36,0	script	Sign#0066WR	NPC_SWORDS_SIGN,{
+    mesc l("West Room closed for repairs");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
+006-6,46,34,0	script	Sign#0066CR	NPC_SWORDS_SIGN,{
+    mesc l("Central Room closed for repairs");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
+006-6,39,36,0	script	Sign#0066ER	NPC_SWORDS_SIGN,{
+    mesc l("East Room closed for repairs");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
diff --git a/npc/006-6/core.txt b/npc/006-6/core.txt
new file mode 100644
index 000000000..b1dfffd8f
--- /dev/null
+++ b/npc/006-6/core.txt
@@ -0,0 +1,21 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-6,46,26,0	script	Magic Barrier#0066	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    //if (!getq(CandorQuest_Area1)) goto L_Reject;
+    //if (!getq(CandorQuest_Area2)) goto L_Reject;
+    //if (!getq(CandorQuest_Area3)) goto L_Reject;
+
+    // FIXME: B4F is not ready, so fallthrough to L_Reject
+L_Reject:
+    //warp "006-10", 49, 52;
+    specialeffect(5000, SELF, getcharid(3));
+    dispbottom l("The power which lies in Candor rejects your strength.");
+    sleep2(3000);
+    specialeffect(5002, SELF, getcharid(3));
+    end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 8ff0ac962..019bf9ed1 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -69,6 +69,7 @@
 @include "npc/006-4-1/_import.txt"
 @include "npc/006-4/_import.txt"
 @include "npc/006-5/_import.txt"
+@include "npc/006-6/_import.txt"
 @include "npc/006-7/_import.txt"
 @include "npc/007-1/_import.txt"
 @include "npc/007-2/_import.txt"