Fix bugs, move Colin and Luca to second building, change restrictions of second

building, add Professor and Researcher for new feature.

9 files changed, 52 insertions, 9 deletions

diff --git a/npc/003-0-1/_import.txt b/npc/003-0-1/_import.txt
index b84f500c4..5aa9264e7 100644
--- a/npc/003-0-1/_import.txt
+++ b/npc/003-0-1/_import.txt
@@ -2,8 +2,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-0-1/_warps.txt",
 "npc/003-0-1/audsbel.txt",
-"npc/003-0-1/colin.txt",
 "npc/003-0-1/guards.txt",
-"npc/003-0-1/luca.txt",
 "npc/003-0-1/maxime.txt",
+"npc/003-0-1/professor.txt",
+"npc/003-0-1/researcher.txt",
 "npc/003-0-1/statues.txt",
diff --git a/npc/003-0-1/professor.txt b/npc/003-0-1/professor.txt
new file mode 100644
index 000000000..d4c088d2f
--- /dev/null
+++ b/npc/003-0-1/professor.txt
@@ -0,0 +1,25 @@
+// TMW2 Script
+// Author:
+//  Jesusalva
+// Description:
+//  Professor - allows you to gain EXP for idling (Speech skill)
+
+003-0-1,35,29,0	script	Professor	NPC_PLAYER,{
+    mesn;
+    mesq l("I've mastered the art of speech and communication.");
+    close;
+
+OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, GraduationCap);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, GraduationRobe);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, DeepBlackBoots);
+    setunitdata(.@npcId, UDT_WEAPON, CottonGloves);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 2);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 4);
+
+    .sex=G_MALE;
+    .distance=5;
+    end;
+}
+
diff --git a/npc/003-0-1/researcher.txt b/npc/003-0-1/researcher.txt
new file mode 100644
index 000000000..dc6a4f978
--- /dev/null
+++ b/npc/003-0-1/researcher.txt
@@ -0,0 +1,17 @@
+// TMW2 Script
+// Author:
+//  Jesusalva
+// Description:
+//  Researcher - allows you to decrypt Ancient Blueprints (Ancient Lang. skill)
+
+003-0-1,58,29,0	script	Researcher	NPC_BLACKALCHEMIST,{
+    mesn;
+    mesq l("I've mastered the art of reading ancient languages.");
+    close;
+
+OnInit:
+    .sex=G_MALE;
+    .distance=5;
+    end;
+}
+
diff --git a/npc/003-0/_import.txt b/npc/003-0/_import.txt
index ea9a90d35..7f54a7b79 100644
--- a/npc/003-0/_import.txt
+++ b/npc/003-0/_import.txt
@@ -2,6 +2,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-0/_warps.txt",
 "npc/003-0/berserk.txt",
+"npc/003-0/colin.txt",
+"npc/003-0/luca.txt",
 "npc/003-0/mages.txt",
 "npc/003-0/paladin.txt",
 "npc/003-0/priest.txt",
diff --git a/npc/003-0-1/colin.txt b/npc/003-0/colin.txt
index ab484dbaf..526f0d2ef 100644
--- a/npc/003-0-1/colin.txt
+++ b/npc/003-0/colin.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Luca and Colin assigns player a class. Colin is the Wizard Master.
 
-003-0-1,58,29,0	script	Colin	NPC_PLAYER,{
+003-0,41,25,0	script	Colin	NPC_PLAYER,{
     mesn;
     mesq l("I am the @@ master.", l("Wizard Mages"));
     if (!MAGIC_LVL) goto L_NoMagic;
diff --git a/npc/003-0-1/luca.txt b/npc/003-0/luca.txt
index 77863c3ec..882ffeead 100644
--- a/npc/003-0-1/luca.txt
+++ b/npc/003-0/luca.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Luca and Colin assigns player a class. Luca is the Warrior Master.
 
-003-0-1,35,29,0	script	Luca	NPC_PLAYER,{
+003-0,31,26,0	script	Luca	NPC_PLAYER,{
     mesn;
     mesq l("I am the @@ master.", l("Magic Warriors"));
     if (!MAGIC_LVL) goto L_NoMagic;
diff --git a/npc/003-1/magic.txt b/npc/003-1/magic.txt
index 03a89de24..cd0366739 100644
--- a/npc/003-1/magic.txt
+++ b/npc/003-1/magic.txt
@@ -7,13 +7,14 @@
 003-1,34,33,0	script	#MagicSchoolGate1	NPC_HIDDEN,0,0,{
     end;
 OnTouch:
+    /*
     if (countitem(JesusalvaGrimorium) <= 0 || MAGIC_LVL < 2) {
         slide 36, 39;
         percentheal -5, -10;
         dispbottom l("Powerful magic repels you away from this magic place!");
-    } else {
-        warp "003-0", 48, 51;
-        dispbottom col(l("CONDEMNED: This building has been condemned. The roof may fall. Be careful!"), 1);
     }
+    */
+    warp "003-0", 48, 51;
+    dispbottom col(l("CONDEMNED: This building has been condemned. The roof may fall. Be careful!"), 1);
     end;
 }
diff --git a/npc/003-8/intensebeard.txt b/npc/003-8/intensebeard.txt
index 040ec9b1d..0ee951b68 100644
--- a/npc/003-8/intensebeard.txt
+++ b/npc/003-8/intensebeard.txt
@@ -262,7 +262,6 @@ OnInit:
     npcsit;
     end;
 
-
 }
 
 
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 21054c3fa..d79a58aaf 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -281,7 +281,6 @@ function	script	clientupdater	{
         }
         // Bounty Hunter Helmet
         if (MERCENARY_DAILYQUEST > 100) {
-            inventoryplace BountyHunterHelmet, 1;
             getitem BountyHunterHelmet, 1;
         }