summaryrefslogtreecommitdiff
path: root/npc/magic
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-04-13 12:02:57 -0300
committerJesusaves <cpntb1@ymail.com>2021-04-13 12:02:57 -0300
commite9fac5b29405eaad267639167215b42cc50ae868 (patch)
treeb06ca6d5af25a275cd47e3f578b291b26c7e5e78 /npc/magic
parent9431abfcaa22101e740ed90186917bf17842fd79 (diff)
downloadserverdata-e9fac5b29405eaad267639167215b42cc50ae868.tar.gz
serverdata-e9fac5b29405eaad267639167215b42cc50ae868.tar.bz2
serverdata-e9fac5b29405eaad267639167215b42cc50ae868.tar.xz
serverdata-e9fac5b29405eaad267639167215b42cc50ae868.zip
Disconnect "legacy magic exp" so it goes over 9000
Diffstat (limited to 'npc/magic')
-rw-r--r--npc/magic/config.txt14
-rw-r--r--npc/magic/final.txt25
2 files changed, 10 insertions, 29 deletions
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;
}