Scholarship Class ready (amount of skills trimmed for release)

4 files changed, 52 insertions, 15 deletions

diff --git a/npc/003-0/colin.txt b/npc/003-0/colin.txt
index 888c73f4d..598f43c38 100644
--- a/npc/003-0/colin.txt
+++ b/npc/003-0/colin.txt
@@ -7,13 +7,12 @@
 
 003-0,58,29,0	script	Colin	NPC_PLAYER,{
     if (!MAGIC_LVL) goto L_NoMagic;
-    mes l(".:: Trickster Class ::.");
-    mesc l("Specialized in miscellaneous skills.");
+    mes l(".:: Scholarship Class ::.");
+    mesc l("Specialized in support, buff, debuff and strengthening skills.");
     next;
     mesn;
-    mesc l("You have @@/@@ magic skill points available.", sk_points(), sk_maxpoints());
-    mesc l("Trickster uses an experimental window, you might need to resize it to see all skills.");
     do {
+    mesc l("You have @@/@@ magic skill points available.", sk_points(), sk_maxpoints());
     next;
     mesc l("Healing - The most basic healing skill, requires no items to use.");
     mesc l("Mana Wisdom - Raise Mana EXP Gain rate");
diff --git a/npc/003-0/luca.txt b/npc/003-0/luca.txt
index c44614a77..c6ba03d60 100644
--- a/npc/003-0/luca.txt
+++ b/npc/003-0/luca.txt
@@ -7,13 +7,12 @@
 
 003-0,34,41,0	script	Luca	NPC_PLAYER,{
     if (!MAGIC_LVL) goto L_NoMagic;
-    mes l(".:: Trickster Class ::.");
-    mesc l("Specialized in miscellaneous skills.");
+    mes l(".:: Scholarship Class ::.");
+    mesc l("Specialized in support, buff, debuff and strengthening skills.");
     next;
     mesn;
-    mesc l("You have @@/@@ magic skill points available.", sk_points(), sk_maxpoints());
-    mesc l("Trickster uses an experimental window, you might need to resize it to see all skills.");
     do {
+    mesc l("You have @@/@@ magic skill points available.", sk_points(), sk_maxpoints());
     next;
     mesc l("Healing - The most basic healing skill, requires no items to use.");
     mesc l("Mana Wisdom - Raise Mana EXP Gain rate");
diff --git a/npc/003-0/saves.txt b/npc/003-0/saves.txt
index 84a7388ca..c63c51928 100644
--- a/npc/003-0/saves.txt
+++ b/npc/003-0/saves.txt
@@ -6,29 +6,66 @@
 
 003-0,34,25,0	script	Mr Saves	NPC_BLACKALCHEMIST,{
     if (!MAGIC_LVL) goto L_NoMagic;
-    mes l(".:: Trickster Class ::.");
-    mesc l("Specialized in miscellaneous skills.");
+    mes l(".:: Scholarship Class ::.");
+    mesc l("Specialized in support, buff, debuff and strengthening skills.");
     next;
     mesn;
-    mesc l("You have @@/@@ magic skill points available.", sk_points(), sk_maxpoints());
-    mesc l("Trickster uses an experimental window, you might need to resize it to see all skills.");
     do {
+    mesc l("You have @@/@@ magic skill points available.", sk_points(), sk_maxpoints());
     next;
     mesc l("Healing - The most basic healing skill, requires no items to use.");
-    mesc l("Mana Wisdom - Raise Mana EXP Gain rate");
+    mesc l("Mana Wisdom - Passive - Raise Mana EXP Gain rate");
+    mesc l("Accumulate Power - Raise damage of next skill.");
+    mesc l("Provoke - Provoke a single monster");
+
+    mesc l("Mass Provoke - Provoke all monsters under your cursor");
+    mesc l("High Healing - Use a Lifestone for supreme healing.");
+
+    mesc l("Windwalker - Increase walk speed and flee rate.");
+    mesc l("Last Standing Man - Passive - Raise Max HP and Holy Defense");
     menuint
         "Healing", AL_HEAL,
         "Mana Wisdom", TMW2_SAGE,
+        "Accumulate Power", HW_MAGICPOWER,
+        "Provoke", SM_PROVOKE,
+        "Mass Provoke", EVOL_MASS_PROVOKE,
+        "High Healing", AB_HIGHNESSHEAL,
+        "Windwalker", SN_WINDWALK,
+        "Last Standing Man", CR_TRUST,
         "Cancel", 0;
     mes "";
 
     switch (@menuret) {
         case AL_HEAL:
-            if (!mlearn(AL_HEAL, 1, 1, SpellBookPage, 1))
+            if (!mlearn(AL_HEAL, 4, 1, SpellBookPage, 1))
                 mesc l("You do not meet all requisites for this skill."), 1;
             break;
         case TMW2_SAGE:
-            if (!mlearn(TMW2_SAGE, 1, 1, SpellBookPage, 1))
+            if (!mlearn(TMW2_SAGE, 5, 1, SpellBookPage, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case HW_MAGICPOWER:
+            if (!mlearn(HW_MAGICPOWER, 5, 1, SpellBookPage, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case SM_PROVOKE:
+            if (!mlearn(SM_PROVOKE, 1, 1, SpellBookPage, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case EVOL_MASS_PROVOKE:
+            if (!mlearn(EVOL_MASS_PROVOKE, 10, 2, SpellBookPage, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case AB_HIGHNESSHEAL:
+            if (!mlearn(AB_HIGHNESSHEAL, 3, 2, SpellBookPage, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case SN_WINDWALK:
+            if (!mlearn(SN_WINDWALK, 3, 3, SpellBookPage, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
+        case CR_TRUST:
+            if (!mlearn(CR_TRUST, 2, 3, SpellBookPage, 1))
                 mesc l("You do not meet all requisites for this skill."), 1;
             break;
         default:
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 77d40e6d4..f41c343fc 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -590,6 +590,8 @@ function	script	sk_maxpoints	{
     .@val=(MAGIC_LVL)*2;
     // 1 point every twice magic level
     .@val+=(MAGIC_LVL/2);
+    // Excluding first 15, 1 point every 10 job levels
+    .@val+=((JobLevel-15)/10);
     // 1 point per skill permit level
     .@val+=getskilllv(TMW2_SKILLPERMIT);
     return .@val;