summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-24 00:28:51 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-24 00:28:51 -0300
commitb9d4993ba0c0226cff8fd95e683e039ca8e24fe7 (patch)
treecf35ea55d74276d3473a35a6bc7104d19464b107
parent961980110af7fb956b449b798244726ffb1cb242 (diff)
downloadserverdata-b9d4993ba0c0226cff8fd95e683e039ca8e24fe7.tar.gz
serverdata-b9d4993ba0c0226cff8fd95e683e039ca8e24fe7.tar.bz2
serverdata-b9d4993ba0c0226cff8fd95e683e039ca8e24fe7.tar.xz
serverdata-b9d4993ba0c0226cff8fd95e683e039ca8e24fe7.zip
Magic Academy: Move Colin to Wizardry Institute.
-rw-r--r--npc/027-1/_import.txt1
-rw-r--r--npc/027-1/_warps.txt2
-rw-r--r--npc/027-2/_import.txt2
-rw-r--r--npc/027-2/_warps.txt4
-rw-r--r--npc/027-2/colin.txt (renamed from npc/027-1/colin.txt)2
5 files changed, 9 insertions, 2 deletions
diff --git a/npc/027-1/_import.txt b/npc/027-1/_import.txt
index e225193bd..3b3760812 100644
--- a/npc/027-1/_import.txt
+++ b/npc/027-1/_import.txt
@@ -2,7 +2,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/027-1/_mobs.txt",
"npc/027-1/_warps.txt",
-"npc/027-1/colin.txt",
"npc/027-1/enzo.txt",
"npc/027-1/ezra.txt",
"npc/027-1/laura.txt",
diff --git a/npc/027-1/_warps.txt b/npc/027-1/_warps.txt
index 55b3f945f..32a27e54d 100644
--- a/npc/027-1/_warps.txt
+++ b/npc/027-1/_warps.txt
@@ -1,3 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 027-1: The Academy Island warps
027-1,90,156,0 warp #027-1_90_156 5,0,003-1,59,59
+027-1,73,53,0 warp #027-1_73_53 0,0,027-2,28,28
+027-1,77,65,0 warp #027-1_77_65 0,0,027-2,32,42
diff --git a/npc/027-2/_import.txt b/npc/027-2/_import.txt
index a37473076..c01f816dd 100644
--- a/npc/027-2/_import.txt
+++ b/npc/027-2/_import.txt
@@ -1,2 +1,4 @@
// Map 027-2: Wizardry Institute Indoors
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/027-2/_warps.txt",
+"npc/027-2/colin.txt",
diff --git a/npc/027-2/_warps.txt b/npc/027-2/_warps.txt
new file mode 100644
index 000000000..15b84fa92
--- /dev/null
+++ b/npc/027-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 027-2: Wizardry Institute Indoors warps
+027-2,28,29,0 warp #027-2_28_29 0,0,027-1,73,54
+027-2,32,43,0 warp #027-2_32_43 0,0,027-1,77,66
diff --git a/npc/027-1/colin.txt b/npc/027-2/colin.txt
index ace850ce8..62a59126a 100644
--- a/npc/027-1/colin.txt
+++ b/npc/027-2/colin.txt
@@ -5,7 +5,7 @@
// Description:
// Colin, of Destructive Magic Class.
-027-1,75,55,0 script Colin NPC_PLAYER,{
+027-2,28,23,0 script Colin NPC_PLAYER,{
if (!MAGIC_LVL) goto L_NoMagic;
mes l(".:: Destructive Magic Class ::.");
mesc l("Specialized in destructive, magical skills.");