Magic Academy: Move Colin to Wizardry Institute.

3 files changed, 2 insertions, 118 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-1/colin.txt b/npc/027-1/colin.txt
deleted file mode 100644
index ace850ce8..000000000
--- a/npc/027-1/colin.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-// TMW2 script.
-// Author:
-//    Saulc
-//    Jesusalva
-// Description:
-//    Colin, of Destructive Magic Class.
-
-027-1,75,55,0	script	Colin	NPC_PLAYER,{
-    if (!MAGIC_LVL) goto L_NoMagic;
-    mes l(".:: Destructive Magic Class ::.");
-    mesc l("Specialized in destructive, magical skills.");
-    next;
-    mesn;
-    do {
-    mesc l("You have @@ magic skill points available.", sk_points());
-    next;
-    mesc l("Fireball - Basic AoE (Area Of Effect) Skill");
-    mesc l("Holy Light - Standard Holy Magical Attack");
-    mesc l("Magic Strike - Standard Magical Attack");
-
-    mesc l("Napalm Beat - Spammable AoE Skill");
-    mesc l("Frost Diver - Attempt to freeze an enemy, dealing damage");
-    mesc l("Fire Walk - Creates a trail of fire, harming any pursuer");
-
-    mesc l("Frost Nova - Freeze everything in a range");
-    mesc l("Note: You can exchange 1 @@ for 3 @@", getitemlink(GemPowder), getitemlink(Quill)), 1;
-    menuint
-        l("Fireball"), MG_FIREBALL,
-        l("Holy Light"), AL_HOLYLIGHT,
-        l("Magic Strike"), MG_SOULSTRIKE,
-        l("Napalm Beat"), MG_NAPALMBEAT,
-        l("Frost Diver"), MG_FROSTDIVER,
-        l("Fire Walk"), SO_FIREWALK,
-        l("Frost Nova"), WZ_FROSTNOVA,
-        rif(getskilllv(MG_SOULSTRIKE), l("Lightining Bolt")), MG_LIGHTNINGBOLT,
-        //l("Nilfheim"), TMW2_NILFHEIM,
-        rif(countitem(GemPowder), l("Exchange Gempowder for Quill")), -1,
-        l("Cancel"), 0;
-    mes "";
-
-    switch (@menuret) {
-        case -1:
-            inventoryplace Quill, 3;
-            delitem GemPowder, 1;
-            getitem Quill, 3;
-            break;
-        case MG_FIREBALL:
-            if (!mlearn(MG_FIREBALL, 5, 1, Quill, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        case AL_HOLYLIGHT:
-            if (!mlearn(AL_HOLYLIGHT, 1, 1, Quill, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        case MG_SOULSTRIKE:
-            if (!mlearn(MG_SOULSTRIKE, 10, 1, Quill, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        case MG_NAPALMBEAT:
-            if (!mlearn(MG_NAPALMBEAT, 5, 2, Quill, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        case MG_FROSTDIVER:
-            if (!mlearn(MG_FROSTDIVER, 7, 2, Quill, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        case SO_FIREWALK:
-            if (!mlearn(SO_FIREWALK, 2, 2, Lockpicks, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        case WZ_FROSTNOVA:
-            if (!mlearn(WZ_FROSTNOVA, 4, 3, Quill, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        case MG_LIGHTNINGBOLT:
-            if (!mlearn(MG_LIGHTNINGBOLT, 4, 1, Quill, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        case TMW2_NILFHEIM:
-            if (!mlearn(TMW2_NILFHEIM, 1, 5, Quill, 1))
-                mesc l("You do not meet all requisites for this skill."), 1;
-            break;
-        default:
-            if (@menuret)
-                Exception("ERROR skill not implemented", RB_DEFAULT|RB_SPEECH);
-            else
-                closeclientdialog;
-            break;
-    }
-    } while (@menuret);
-    close;
-
-L_NoMagic:
-    next;
-    mesn;
-    mesq l("Your lack of magical power is critical. I dare say, you might never in your life get access to a Mana Stone.");
-    next;
-    mesn;
-    mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone.");
-    next;
-    mesn;
-    mesq l("Perhaps, in the city, someone knows rumors about Mana Stones and can teach you. Other than that, you're on your own.");
-    close;
-
-OnInit:
-    .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, SorcererRobe);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
-    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 21);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 20);
-
-    .sex = G_MALE;
-    .distance = 5;
-    end;
-}