Add 001-14 Porthos

4 files changed, 128 insertions, 1 deletions

diff --git a/npc/001-14/_import.txt b/npc/001-14/_import.txt
new file mode 100644
index 000000000..d304c1aa5
--- /dev/null
+++ b/npc/001-14/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-14: Porthos - The Town Of Portals
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-14/_warps.txt",
diff --git a/npc/001-14/_warps.txt b/npc/001-14/_warps.txt
new file mode 100644
index 000000000..e614565e2
--- /dev/null
+++ b/npc/001-14/_warps.txt
@@ -0,0 +1,123 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-14: Porthos - The Town Of Portals warps
+001-14,90,27,0	script	#001-14_90_27	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 90,65; end;
+}
+001-14,62,33,0	script	#001-14_62_33	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 79,70; end;
+}
+001-14,113,42,0	script	#001-14_113_42	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 101,70; end;
+}
+001-14,135,57,0	script	#001-14_135_57	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 110,78; end;
+}
+001-14,137,85,0	script	#001-14_137_85	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 111,91; end;
+}
+001-14,135,113,0	script	#001-14_135_113	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 109,102; end;
+}
+001-14,119,131,0	script	#001-14_119_131	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 101,110; end;
+}
+001-14,90,139,0	script	#001-14_90_139	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 90,114; end;
+}
+001-14,54,129,0	script	#001-14_54_129	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 79,109; end;
+}
+001-14,39,110,0	script	#001-14_39_110	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 71,101; end;
+}
+001-14,35,84,0	script	#001-14_35_84	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 69,89; end;
+}
+001-14,43,46,0	script	#001-14_43_46	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 71,78; end;
+}
+001-14,90,64,0	script	#001-14_90_64	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 90,34; end;
+}
+001-14,101,69,0	script	#001-14_101_69	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 113,49; end;
+}
+001-14,110,77,0	script	#001-14_110_77	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 135,64; end;
+}
+001-14,111,90,0	script	#001-14_111_90	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 137,92; end;
+}
+001-14,109,103,0	script	#001-14_109_103	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 135,120; end;
+}
+001-14,101,111,0	script	#001-14_101_111	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 119,138; end;
+}
+001-14,90,115,0	script	#001-14_90_115	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 90,146; end;
+}
+001-14,79,110,0	script	#001-14_79_110	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 54,136; end;
+}
+001-14,71,102,0	script	#001-14_71_102	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 39,117; end;
+}
+001-14,69,90,0	script	#001-14_69_90	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 35,91; end;
+}
+001-14,71,77,0	script	#001-14_71_77	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 43,53; end;
+}
+001-14,79,69,0	script	#001-14_79_69	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 62,40; end;
+}
+001-14,92,89,0	warp	#001-14_92_89	0,0,000-1,22,22
diff --git a/npc/_import.txt b/npc/_import.txt
index db651f62e..45971c295 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -10,6 +10,7 @@
 @include "npc/001-11/_import.txt"
 @include "npc/001-12/_import.txt"
 @include "npc/001-13/_import.txt"
+@include "npc/001-14/_import.txt"
 @include "npc/001-2/_import.txt"
 @include "npc/001-3-1/_import.txt"
 @include "npc/001-3/_import.txt"
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index fed63e8f8..0e11c47fe 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -356,7 +356,7 @@ function	script	FYEConf_Regnum	{
 
 // Configure World Expo
 function	script	FYEConf_Expo	{
-    $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN", "Terogan");
+    $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN", "Terogan", ($GAME_STORYLINE >= 5 ? "Moubootaur" : "Monster King"));
     setarray $FYREWARD_PT, 100, 220, 440, 880, 1320,
                            1760, 2640, 3520, 5280, 7040,
                            10560, 14080, 21120, 28160, 32000,