Initial Magic System redesign (WIP)

7 files changed, 83 insertions, 46 deletions

diff --git a/maps/re/003-0-1.mcache b/maps/re/003-0-1.mcache
index 4cdee7d9a..57a732c1e 100644
--- a/maps/re/003-0-1.mcache
+++ b/maps/re/003-0-1.mcache
diff --git a/npc/003-0-1/_import.txt b/npc/003-0-1/_import.txt
index b62d85083..c877b8a28 100644
--- a/npc/003-0-1/_import.txt
+++ b/npc/003-0-1/_import.txt
@@ -1,4 +1,6 @@
 // Map 003-0-1: The Magic Guild
 // 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/colin.txt",
+"npc/003-0-1/luca.txt",
 "npc/003-0-1/statues.txt",
diff --git a/npc/003-0-1/colin.txt b/npc/003-0-1/colin.txt
new file mode 100644
index 000000000..f06fd07da
--- /dev/null
+++ b/npc/003-0-1/colin.txt
@@ -0,0 +1,27 @@
+// TMW2 script.
+// Author:
+//    Saulc
+//    Jesusalva
+// Description:
+//    Luca and Colin assigns player a class. This may end up contradicting races,
+//    so expect core changes!
+
+003-0-1,58,29,0	script	Colin	NPC_PLAYER,{
+
+    mesn;
+    mesq l("I am the Wizard Mages master.");
+    close;
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 13);
+
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
diff --git a/npc/003-0-1/luca.txt b/npc/003-0-1/luca.txt
new file mode 100644
index 000000000..bdf4cbb98
--- /dev/null
+++ b/npc/003-0-1/luca.txt
@@ -0,0 +1,27 @@
+// TMW2 script.
+// Author:
+//    Saulc
+//    Jesusalva
+// Description:
+//    Luca and Colin assigns player a class. This may end up contradicting races,
+//    so expect core changes!
+
+003-0-1,35,29,0	script	Luca	NPC_PLAYER,{
+
+    mesn;
+    mesq l("I am the Magic Warriors master.");
+    close;
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 13);
+
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index f1c18c0d4..ac8b4ee3e 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -16,7 +16,6 @@
 "npc/003-1/jakod.txt",
 "npc/003-1/jerican.txt",
 "npc/003-1/lieutenantdausen.txt",
-"npc/003-1/luca.txt",
 "npc/003-1/mahoud.txt",
 "npc/003-1/malivox.txt",
 "npc/003-1/mariusthebard.txt",
diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt
index 6d5a35b24..0c343a621 100644
--- a/npc/003-1/jakod.txt
+++ b/npc/003-1/jakod.txt
@@ -1,22 +1,40 @@
+// TMW2 script.
 // Author:
 //    Saulc
+//    Jesusalva
+// Description:
+//    Jakod replaces Luca. As there are no focus skills, Jakod teaches player about
+//    magic and is their tutor on the matters of the Mana Stone.
 
-003-1,62,76,0	script	Jakod	NPC_PLAYER,{
+003-1,109,129,0	script	Jakod	NPC_PLAYER,{
 
 
-hello;
+    mesn;
+    if (BaseLevel < 40) mesq l("Hello there. I am looking for strong people, but you are not strong enough.");
+    if (BaseLevel < 40) close;
+    if (getskilllv(SM_BASH) >= 1) mesq l("Are you using my skill?");
+    if (getskilllv(SM_BASH) >= 1) close;
+    if (!is_staff()) mesq l("Hey, you're strong! Congratulations!");
+    if (!is_staff()) close;
+    mesq l("Hey, you are strong! But still, so, so GREEN! You're PATHETIC! I mean, look your skill list! Empty!");
+    next;
+    // The last argument is duration: 0 - permanent 1- temporary. If omitted, defaults to 1.
+    skill(SM_BASH,1,0);
+    mesq l("Here, learn the ##BFalkon Punch##b. It is on Physical skills tab. You can drag it to the shortcut list. Thanks me later, man!");
+    close;
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
-    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 24);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 2);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 13);
+    //setunitdata(.@npcId, UDT_HAIRSTYLE, 24);
+    //setunitdata(.@npcId, UDT_HAIRCOLOR, 2);
 
     .sex = G_MALE;
-    .distance = 5;
+    .distance = 3;
     end;
 }
-
diff --git a/npc/003-1/luca.txt b/npc/003-1/luca.txt
deleted file mode 100644
index b51553bde..000000000
--- a/npc/003-1/luca.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-// TMW2 script.
-// Author:
-//    Saulc
-//    Jesusalva
-// Description:
-//    Luca assings player a class. This may end up contradicting races, so expect core changes!
-
-003-1,109,129,0	script	Luca	NPC_PLAYER,{
-
-    mesn;
-    if (BaseLevel < 40) mesq l("Hello there. I am looking for strong people, but you are not strong enough.");
-    if (BaseLevel < 40) close;
-    if (getskilllv(SM_BASH) >= 1) mesq l("Are you using my skill?");
-    if (getskilllv(SM_BASH) >= 1) close;
-    if (!is_staff()) mesq l("Hey, you're strong! Congratulations!");
-    if (!is_staff()) close;
-    mesq l("Hey, you are strong! But still, so, so GREEN! You're PATHETIC! I mean, look your skill list! Empty!");
-    next;
-    // The last argument is duration: 0 - permanent 1- temporary. If omitted, defaults to 1.
-    skill(SM_BASH,1,0);
-    mesq l("Here, learn the ##BFalkon Punch##b. It is on Physical skills tab. You can drag it to the shortcut list. Thanks me later, man!");
-    close;
-
-OnInit:
-    .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
-    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 13);
-
-    .sex = G_MALE;
-    .distance = 3;
-    end;
-}