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

1 files changed, 52 insertions, 44 deletions

diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index bb1887d2..e274bd91 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -468,7 +468,57 @@ function	script	Exception	{
     }
 
     return getarg(2, 0);
+}
+
+// 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;
+}
 
+// Delayed healing. Takes 3~5 seconds. Variates with Vit up to +100%.
+// The vit can have an additional 20% bonus as well.
+function	script	itheal	{
+    .@bas=getarg(0);
+    .@vit=readbattleparam(getcharid(3), UDT_VIT);
+    .@vit=cap_value(.@vit-1, 0, 100);
+    if (getargcount() > 2)
+        .@tim=getarg(3);
+    else
+        .@tim=rand2(3,5);
+    .@min=.@bas*(100+.@vit)/100;
+    .@max=.@bas*(100+.@vit*120/100)/100;
+    // Now divide the HP values by the time
+    .@min=max(1, .@min/.@tim);
+    .@max=max(1, .@max/.@tim);
+    callfunc("SC_Bonus", .@tim, SC_S_LIFEPOTION, .@min, .@max);
+    if (getarg(1,0) > 0)
+        heal 0, getarg(1, 0);
+    return;
+}
+
+// sqldate({day variation, month variation})
+function	script	sqldate	{
+    .@d=gettime(GETTIME_DAYOFMONTH)+getarg(0, 0);
+    .@m=gettime(GETTIME_MONTH)+getarg(1, 0);
+    .@y=gettime(GETTIME_YEAR);
+    // Overflow prevention
+    if (.@d <= 0) {
+        .@d=1;
+    }
+    while (.@m > 12) {
+        .@y+=1;
+        .@m-=12;
+    }
+    while (.@m < 1) {
+        .@y-=1;
+        .@m+=12;
+    }
+    .@strdate$=sprintf("%04d-%02d-%02d %02d:%02d:%02d", .@y, .@m, .@d, gettime(GETTIME_HOUR), gettime(GETTIME_MINUTE), gettime(GETTIME_SECOND));
+    return .@strdate$;
 }
 
 // Linking functions
@@ -628,50 +678,8 @@ function	script	updateskill	{
 }
 
 function	script	learnskill	{
-    if (getskilllv(getarg(0)) < getarg(1))
-        skill getarg(0), getarg(1), 0;
-    return;
-}
-
-// Delayed healing. Takes 3~5 seconds. Variates with Vit up to +100%.
-// The vit can have an additional 20% bonus as well.
-function	script	itheal	{
-    .@bas=getarg(0);
-    .@vit=readbattleparam(getcharid(3), UDT_VIT);
-    .@vit=cap_value(.@vit-1, 0, 100);
-    if (getargcount() > 2)
-        .@tim=getarg(3);
-    else
-        .@tim=rand2(3,5);
-    .@min=.@bas*(100+.@vit)/100;
-    .@max=.@bas*(100+.@vit*120/100)/100;
-    // Now divide the HP values by the time
-    .@min=max(1, .@min/.@tim);
-    .@max=max(1, .@max/.@tim);
-    callfunc("SC_Bonus", .@tim, SC_S_LIFEPOTION, .@min, .@max);
-    if (getarg(1,0) > 0)
-        heal 0, getarg(1, 0);
+    if (getskilllv(getarg(0)) < getarg(1, 1))
+        skill getarg(0), getarg(1, 1), 0;
     return;
 }
 
-// sqldate({day variation, month variation})
-function	script	sqldate	{
-    .@d=gettime(GETTIME_DAYOFMONTH)+getarg(0, 0);
-    .@m=gettime(GETTIME_MONTH)+getarg(1, 0);
-    .@y=gettime(GETTIME_YEAR);
-    // Overflow prevention
-    if (.@d <= 0) {
-        .@d=1;
-    }
-    while (.@m > 12) {
-        .@y+=1;
-        .@m-=12;
-    }
-    while (.@m < 1) {
-        .@y-=1;
-        .@m+=12;
-    }
-    .@strdate$=sprintf("%04d-%02d-%02d %02d:%02d:%02d", .@y, .@m, .@d, gettime(GETTIME_HOUR), gettime(GETTIME_MINUTE), gettime(GETTIME_SECOND));
-    return .@strdate$;
-}
-