Reintroduce mlearn(), and optimize the code.

2 files changed, 36 insertions, 20 deletions

diff --git a/npc/003-0/trickmaster.txt b/npc/003-0/trickmaster.txt
index 538fbce0e..b9f61ae60 100644
--- a/npc/003-0/trickmaster.txt
+++ b/npc/003-0/trickmaster.txt
@@ -21,23 +21,13 @@
     setskin "";
 
     switch (@menuret) {
+        case SA_FREECAST:
+            if (!mlearn(SA_FREECAST, 1, 1, Lockpicks, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
         case TF_BACKSLIDING:
-            if (getskilllv(TF_BACKSLIDING) >= 1) {
-                mesc l("You've reached the maximum level for this skill."), 1;
-                break;
-            }
-            mesc l("To learn backsliding you'll need @@/@@ point(s).", 1, sk_points());
-            mesc l("You'll also need the Trickmaster fee, 1x @@", getitemlink(Lockpicks));
-            next;
-            if (askyesno() == ASK_YES) {
-                if (!sk_canlvup(Lockpicks, 1)) {
-                    mesc l("Requisites not met");
-                    break;
-                }
-                delitem Lockpicks, 1;
-                sk_lvup(TF_BACKSLIDING, 1);
-                mesc l("Success!");
-            }
+            if (!mlearn(TF_BACKSLIDING, 1, 1, Lockpicks, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
             break;
         default:
             if (@menuret)
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 426219bb5..51f366b4b 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -599,11 +599,9 @@ function	script	sk_points	{
 }
 
 // Returns true if a skill can be leveled up.
-// sk_canlvup( item{, cost=1} )
+// sk_canlvup( {cost=1} )
 function	script	sk_canlvup	{
-    return (
-            countitem(getarg(0)) &&
-            (MAGIC_PTS+getarg(1,1)) <= sk_maxpoints());
+    return ((MAGIC_PTS+getarg(0,1)) <= sk_maxpoints());
 }
 
 // Level up a skill in 1 level
@@ -619,6 +617,34 @@ function	script	sk_lvup	{
     return;
 }
 
+// NEW Magic School Learning Interface
+// mlearn( skill, MAX_LV, AP cost, item, amount )
+// returns false if cheater
+function	script	mlearn	{
+    .@sk=getarg(0);
+    .@ff=getarg(1);
+    .@ap=getarg(2);
+    .@it=getarg(3);
+    .@am=getarg(4);
+    if (getskilllv(.@sk) >= .@ff) {
+        mesc l("You've reached the maximum level for this skill."), 1;
+        return true;
+    }
+    mesc l("To learn @@ you'll need @@/@@ point(s).", .@sk, .@ap, sk_points());
+    mesc l("You'll also need to pay a fee of @@x @@", .@am, getitemlink(.@it));
+    next;
+    if (askyesno() == ASK_NO)
+        return true;
+    if (countitem(.@it) < .@am)
+        return false;
+    if (!sk_canlvup(.@ap))
+        return false;
+
+    delitem .@it, .@am;
+    sk_lvup(.@sk, .@ap);
+    return true;
+}
+
 /*
 // Magic School Learning Interface
 // mlearn( skill, {item 1, amount 1}, {item 2, amount 2}... )