Disconnect "legacy magic exp" so it goes over 9000

3 files changed, 16 insertions, 34 deletions

diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt
index a4d7cff9..ee4c7f3b 100644
--- a/npc/commands/debug.txt
+++ b/npc/commands/debug.txt
@@ -175,7 +175,8 @@ L_MagicSkills:
         "Close.", L_close;
 
 L_MagicSkillsOverview:
-    mes "Your current magic experience skill is " + @mexp + ".";
+    mes "Your current legacy magic experience skill is " + @mexp + ".";
+    mes "Your current Evolved magic exp is "+MAGIC_EXP;
     mes "Your level in the general magic skill is " + @general + ".";
     mes "Your level in the life magic skill is " + @life + ".";
     mes "Your level in the war magic skill is " + @war + ".";
@@ -204,13 +205,13 @@ L_NoMagicSkills:
     goto L_MagicSkills;
 
 L_ChangeMagicExperience:
-    mes "Set the desired magic experience (min: 0 - max: 8000).";
+    mes "Set the desired legacy magic experience (min: 0 - max: 8000).";
     input @value;
     if (@value < 0 || @value > 8000)
         goto L_WrongMagicExperience;
     @mexp = @value;
     callsub S_Update_Mask;
-    mes "You now have " + @mexp + " magic experience points.";
+    mes "You now have " + @mexp + " legacy magic experience points.";
     goto L_MagicSkills;
 
 L_WrongMagicExperience:
@@ -490,7 +491,7 @@ L_AddAll:
     resetstatus;
     BaseLevel = 99;
     mes "All skills added to their maximum level.";
-    mes "Maximum number of Magic Experience points.";
+    mes "Maximum number of Legacy Magic Experience points.";
     mes "You are now level " + BaseLevel + ".";
     next;
     goto L_Begin;
@@ -519,7 +520,7 @@ L_ResetAll:
     resetstatus;
     BaseLevel = 1;
     mes "All skills removed.";
-    mes "Minimum number of Magic Experience points.";
+    mes "Minimum number of Legacy Magic Experience points.";
     mes "You are now level " + BaseLevel + ".";
     next;
     goto L_Begin;
diff --git a/npc/magic/config.txt b/npc/magic/config.txt
index c0f00cec..ddb56902 100644
--- a/npc/magic/config.txt
+++ b/npc/magic/config.txt
@@ -59,26 +59,18 @@ function	script	AdjustAttackpower	{
 
 // SkillID, EXP Points
 function	script	GetManaExp	{
-    // FIXME
     .@sk=getarg(0);
     .@pt=getarg(1);
-    .@bonus=rand2(0,getskilllv(TMW2_SAGE)*3/2);
-    if (LAST_SKILL == .@sk) {
-        .@pt=limit(0, (.@pt+.@bonus)/3, 1);
-        .@bonus=0;
-    } else {
+    if (LAST_SKILL != .@sk) {
         // Update skill memory
         LAST_SKILL[4]=LAST_SKILL[3];
         LAST_SKILL[3]=LAST_SKILL[2];
         LAST_SKILL[2]=LAST_SKILL[1];
         LAST_SKILL[1]=LAST_SKILL[0];
         LAST_SKILL[0]=.@sk;
-        MAGIC_RP+=1;
-        // Magic RP is gained by switching skills often
+        // Magic EXP is gained by switching skills often
+        MAGIC_EXP=MAGIC_EXP+.@pt;
     }
-
-    // Update Magic EXP
-    MAGIC_EXP=MAGIC_EXP+.@pt+.@bonus;
     return;
 }
 
diff --git a/npc/magic/final.txt b/npc/magic/final.txt
index 49faa4da..f98ab4a6 100644
--- a/npc/magic/final.txt
+++ b/npc/magic/final.txt
@@ -38,7 +38,6 @@ function	script	HUB_SkillInvoke	{
             else
                 massprovoke(1+@skillLv);
             // SC_PROVOKE ?
-            GetManaExp(@skillId, rand2(1,3));
             break;
         ////////////////////////////////
         /* / XXX: Healing Class
@@ -202,7 +201,7 @@ function	script	HUB_SkillInvoke	{
             .@TM=100+(90*@skillLv);
             harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
             sc_start SC_STUN, .@TM, 1, .@ST, SCFLAG_NONE, @skillTarget;
-            GetManaExp(@skillId, rand2(1,3));
+            GetManaExp(@skillId, 1);
             break;
         case TMW2_GROUNDSTRIKE:
             .@PW=50+(40*@skillLv);
@@ -213,26 +212,26 @@ function	script	HUB_SkillInvoke	{
             .@EF=any(SC_STUN, SC_BLIND, SC_BLOODING, SC_BLIND, SC_BLOODING);
             areaharm(@skillTarget, .@RG, .@dmg, HARM_PHYS, Ele_Neutral);
             areasc(.@RG, .@TM, .@EF, BL_MOB | BL_PC | BL_HOM | BL_MER, 1, "filter_hostile", @skillTarget, .@ST);
-            GetManaExp(@skillId, rand2(1,3));
+            GetManaExp(@skillId, 1);
             break;
         case TMW2_SUPREMEATTACK:
             .@PW=100+(50*@skillLv);
             harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
-            GetManaExp(@skillId, rand2(1,3));
+            GetManaExp(@skillId, 1);
             break;
         ////////////////////////////////
         // XXX: Physical Class (Archery)
         case TMW2_CHARGEDARROW:
             .@PW=100+(50*@skillLv);
             harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
-            GetManaExp(@skillId, rand2(1,3));
+            GetManaExp(@skillId, 1);
             break;
         case TMW2_ARROWSHOWER:
             .@PW=150+(10*@skillLv);
             .@dmg=AdjustAttackpower(.@PW);
             .@RG=1+(@skillLv/3);
             areaharm(@skillTarget, .@RG, .@dmg, HARM_PHYS, Ele_Neutral);
-            GetManaExp(@skillId, rand2(1,3));
+            GetManaExp(@skillId, 1);
             break;
         ////////////////////////////////
         // XXX: Brawling Class
@@ -392,18 +391,8 @@ function	script	HUB_SkillInvoke	{
         */
 
         // Experience only
-        case KN_AUTOCOUNTER:
-        case SN_SHARPSHOOTING:
-        case HW_MAGICPOWER:
-        case SM_PROVOKE:
-        case SN_WINDWALK:
-        case SO_FIREWALK:
-        case TF_BACKSLIDING:
-        case MG_FIREWALL:
-        case ALL_FULL_THROTTLE:
-        case GC_DARKILLUSION:
-        case NV_TRICKDEAD:
-            GetManaExp(@skillId, rand2(1,3));
+        default:
+            GetManaExp(@skillId, 1);
             break;
     }