3 files changed, 72 insertions, 2 deletions
diff --git a/npc/026-6/_mobs.txt b/npc/026-6/_mobs.txt
index a7b32b253..0aab1e239 100644
--- a/npc/026-6/_mobs.txt
+++ b/npc/026-6/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 026-6: The Impregnable Fortress (B6F) mobs
-026-6,26,89,0,0	monster	Jack.O	1120,1,10000,10000,#026-6Gate::OnGoto
+026-6,26,89,0,0	monster	Jack.O	1430,1,10000,10000,#026-6Gate::OnGoto
diff --git a/npc/026-6/_warps.txt b/npc/026-6/_warps.txt
index cbfb4fac2..6c6dd547b 100644
--- a/npc/026-6/_warps.txt
+++ b/npc/026-6/_warps.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 026-6: The Impregnable Fortress (B6F) warps
-026-6,88,94,0	warp	#026-6_88_94	0,0,025-2,100,25
+026-6,91,78,0	warp	#026-6_91_78	0,0,025-2,100,25
 026-6,95,121,0	script	#026-6_95_121	NPC_HIDDEN,0,0,{
 	end;
 OnTouch:
@@ -41,3 +41,23 @@ OnTouch:
 OnTouch:
 	slide 99,64; end;
 }
+026-6,122,64,0	script	#026-6_122_64	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 133,54; end;
+}
+026-6,133,53,0	script	#026-6_133_53	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 122,65; end;
+}
+026-6,120,80,0	script	#026-6_120_80	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 125,80; end;
+}
+026-6,124,80,0	script	#026-6_124_80	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 119,80; end;
+}
diff --git a/npc/026-6/ctrl.c b/npc/026-6/ctrl.c
index 058b61aea..f45ab9e53 100644
--- a/npc/026-6/ctrl.c
+++ b/npc/026-6/ctrl.c
@@ -169,3 +169,53 @@ OnInit:
     end;
 }
 
+026-6,85,79,0	script	Expeditionary#A	NPC_CONSTR_WORKER,{
+    mesn;
+    mesq l("I'm from the Alliance Expeditionary Force. I'm here to protect these passages from the untrained.");
+    next;
+    mesn;
+    mesq l("This one brings you closer to the World's Heart.");
+    next;
+    mesn;
+    if (!MK_WINNER)
+        mesq l("Which is why I cannot allow you past this point.");
+    else
+        mesq l("You can go there, if you wish, but it is deadly.");
+    close;
+OnInit:
+    .distance=3;
+    end;
+}
+
+026-6,89,79,0	script	Expeditionary#B	NPC_MAINTENANCE_A,{
+    mesn;
+    mesq l("I'm from the Alliance Expeditionary Force. I'm here to protect these passages from the untrained.");
+    next;
+    mesn;
+    mesq l("One of them will bring you out of the Impregnable Fortress, the other brings you closer to the World's Heart.");
+    next;
+    mesn;
+    if (!MK_WINNER)
+        mesq l("Which is why I cannot allow you past this point.");
+    else
+        mesq l("You can go there, if you wish, but it is deadly.");
+    close;
+OnInit:
+    .distance=3;
+    end;
+}
+
+026-6,92,79,0	script	Expeditionary#C	NPC_CONSTR_WORKER,{
+    mesn;
+    mesq l("I'm from the Alliance Expeditionary Force. I'm here to protect these passages from the untrained.");
+    next;
+    mesn;
+    mesq l("This one leads you to outside the Impregnable Fortress.");
+    close;
+OnInit:
+    .distance=3;
+    end;
+}
+
+// Optional Dungeon
+// The warp is added by npc/026-8/ctrl.c