Split files to be more ordely, add (or finish adding) the Abizit skill

3 files changed, 57 insertions, 53 deletions

diff --git a/npc/magic/config.txt b/npc/magic/config.txt
index 57d42189..29d7d0d3 100644
--- a/npc/magic/config.txt
+++ b/npc/magic/config.txt
@@ -319,59 +319,6 @@ function	script	massprovoke	{
 }
 
 
-// mescordialog(text, color, {dialog=1})
-function	script	mescordialog	{
-    if (getarg(2, true))
-        mesc getarg(0), getarg(1);
-    else
-        dispbottom col(getarg(0), getarg(1));
-    return;
-}
-
-// ShowAbizit({dialog=1})
-function	script	ShowAbizit	{
-    .@dial=getarg(0, true);
-    if (.@dial)
-        mesn l("Current Magic Control");
-
-    // FIXME
-    switch (abizit()) {
-    case 10:
-        mescordialog l("Magic flows naturally from you, readily and with ease. You feel in perfect control of your magic."), 3, .@dial;
-        break;
-    case 9:
-        mescordialog l("You feel in almost perfect control of your magic."), 2, .@dial;
-        break;
-    case 8:
-        mescordialog l("You feel that you have very good control of your magic."), 2, .@dial;
-        break;
-    case 7:
-        mescordialog l("You feel quite in control of your magic."), 4, .@dial;
-        break;
-    case 6:
-        mescordialog l("You feel mostly in control of your magic."), 4, .@dial;
-        break;
-    case 5:
-        mescordialog l("You feel somewhat in control of your magic."), 7, .@dial;
-        break;
-    case 4:
-        mescordialog l("You feel you still have a few difficulties in controlling your magic."), 7, .@dial;
-        break;
-    case 3:
-        mescordialog l("Trying to control your magic is still rather troublesome."), 6, .@dial;
-        break;
-    case 2:
-        mescordialog l("You feel that you have only the bare minimum of control over your magic."), 6, .@dial;
-        break;
-    case 1:
-        mescordialog l("You feel quite overwhelmed by your magic, but are beginning to see patterns."), 1, .@dial;
-        break;
-    case 0:
-        mescordialog l("You feel completely overwhelmed by your magic."), 1, .@dial;
-        break;
-    }
-    return;
-}
 
 // getactivatedpoolskilllist(?)
 function	script	getactivatedpoolskilllist	{
diff --git a/npc/magic/final.txt b/npc/magic/final.txt
index 96cc7440..ea67f85d 100644
--- a/npc/magic/final.txt
+++ b/npc/magic/final.txt
@@ -32,6 +32,8 @@ function	script	HUB_SkillInvoke	{
         case TMW2_FAKESKILL:
             charcommand("@refresh"); // Possibly broken on too up-to-date Herc
             break;
+        case SKILL_ABIZIT:
+             SK_Abizit(); break;
         case EVOL_AREA_PROVOKE:
             if (@skillTargetX && @skillTargetY)
                 massprovoke(1+@skillLv, getmap(), @skillTargetX, @skillTargetY);
diff --git a/npc/magic/level1-experience.txt b/npc/magic/level1-experience.txt
new file mode 100644
index 00000000..7435fb71
--- /dev/null
+++ b/npc/magic/level1-experience.txt
@@ -0,0 +1,55 @@
+// The Mana World script
+// Author: Jesusalva <jesusalva@themanaworld.org>
+//
+// Magic Script: SKILL_ABIZIT (Level 1)
+// School: General 1
+
+// ShowAbizit({dialog=true})
+function	script	ShowAbizit	{
+    .@dial=getarg(0, true);
+    if (.@dial)
+        mesn l("Current Magic Control");
+
+    switch (abizit()) {
+    case 10:
+        mescordialog l("Magic flows naturally from you, readily and with ease. You feel in perfect control of your magic."), 3, .@dial;
+        break;
+    case 9:
+        mescordialog l("You feel in almost perfect control of your magic."), 2, .@dial;
+        break;
+    case 8:
+        mescordialog l("You feel that you have very good control of your magic."), 2, .@dial;
+        break;
+    case 7:
+        mescordialog l("You feel quite in control of your magic."), 4, .@dial;
+        break;
+    case 6:
+        mescordialog l("You feel mostly in control of your magic."), 4, .@dial;
+        break;
+    case 5:
+        mescordialog l("You feel somewhat in control of your magic."), 7, .@dial;
+        break;
+    case 4:
+        mescordialog l("You feel you still have a few difficulties in controlling your magic."), 7, .@dial;
+        break;
+    case 3:
+        mescordialog l("Trying to control your magic is still rather troublesome."), 6, .@dial;
+        break;
+    case 2:
+        mescordialog l("You feel that you have only the bare minimum of control over your magic."), 6, .@dial;
+        break;
+    case 1:
+        mescordialog l("You feel quite overwhelmed by your magic, but are beginning to see patterns."), 1, .@dial;
+        break;
+    case 0:
+        mescordialog l("You feel completely overwhelmed by your magic."), 1, .@dial;
+        break;
+    }
+    return;
+}
+
+function	script	SK_Abizit	{
+    ShowAbizit(false);
+    return;
+}
+