summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/skill_db.conf4
-rw-r--r--db/re/skill_tree.conf4
-rw-r--r--npc/functions/clientversion.txt12
-rw-r--r--npc/functions/hub.txt6
4 files changed, 21 insertions, 5 deletions
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index fda92c1d2..a16f0c99a 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38574,8 +38574,8 @@ skill_db: (
Description: "Area Provoke"
MaxLevel: 9
SkillType: {
- Self: true
- //Friend: true // <- Can it aim an enemy??
+ //Self: true
+ Friend: true // <- Can it aim an enemy??
}
CoolDown: 1000
Requirements: {
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 173b6e961..acab262be 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -121,7 +121,6 @@ Human: {
AC_CONCENTRATION: 0
AB_HIGHNESSHEAL: 0
ALL_RESURRECTION: 0
- EVOL_MASS_PROVOKE: 0
EVOL_AREA_PROVOKE: 0
GC_DARKCROW: 0
@@ -179,6 +178,9 @@ Human: {
ALL_BUYING_STORE: 0
KN_RIDING: 0
+ // Deprecated
+ EVOL_MASS_PROVOKE: 0
+
/*
WZ_STORMGUST: 3
WE_BABY: 0
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index f7926953e..36d4792b0 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -825,6 +825,18 @@ function script clientupdater {
dispbottom l("Crafting rules changed! Your crafting skill was lowered to Level 5, talk to Craftmaster to recover it!");
}
+ // Mass Provoke replacement
+ if (getskilllv(EVOL_AREA_PROVOKE)) {
+ getitembound ScholarshipBadge, getskilllv(EVOL_AREA_PROVOKE), 4;
+ MAGIC_PTS-=getskilllv(EVOL_AREA_PROVOKE)+1;
+ skill EVOL_AREA_PROVOKE, 0, 0;
+ dispbottom col(l("MSP for Area Provoke was refunded."), 1);
+ }
+ if (getskilllv(EVOL_MASS_PROVOKE)) {
+ skill EVOL_AREA_PROVOKE, getskilllv(EVOL_MASS_PROVOKE), 0;
+ skill EVOL_MASS_PROVOKE, 0, 0;
+ dispbottom col(l("Mass Provoke replaced with Area Provoke."), 1);
+ }
}
// :// End of Regular Update System
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 1e2711622..ba89f483d 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -254,7 +254,10 @@ function script HUB_SkillInvoke {
SK_mpregen();
break;
case EVOL_AREA_PROVOKE:
- massprovoke(1+@skillLv);
+ if (@skillTargetX && @skillTargetY)
+ massprovoke(1+@skillLv, getmap(), @skillTargetX, @skillTargetY);
+ else
+ massprovoke(1+@skillLv);
GetManaExp(@skillId, rand2(1,3));
break;
case TMW2_GD_INCALL:
@@ -500,7 +503,6 @@ function script HUB_SkillInvoke {
case AL_HEAL:
case HW_MAGICPOWER:
case SM_PROVOKE:
- case EVOL_MASS_PROVOKE:
case AB_HIGHNESSHEAL:
case SN_WINDWALK:
case MG_FIREBALL: