summaryrefslogtreecommitdiff
path: root/src/emap/skill_ground.c
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-09 23:06:53 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-09 23:06:53 +0300
commit47aa7431432a2d9a41b949af5c2d4d7ab4db3461 (patch)
tree1e129f1c278413b495d94b811aafa22c61280222 /src/emap/skill_ground.c
parentcdab2778ae73dcad36fbeac8d827732440a321e3 (diff)
downloadevol-hercules-47aa7431432a2d9a41b949af5c2d4d7ab4db3461.tar.gz
evol-hercules-47aa7431432a2d9a41b949af5c2d4d7ab4db3461.tar.bz2
evol-hercules-47aa7431432a2d9a41b949af5c2d4d7ab4db3461.tar.xz
evol-hercules-47aa7431432a2d9a41b949af5c2d4d7ab4db3461.zip
Move misc effect id for mass provoke skill into skills configuration.
Diffstat (limited to 'src/emap/skill_ground.c')
-rw-r--r--src/emap/skill_ground.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/emap/skill_ground.c b/src/emap/skill_ground.c
index 4422a8d..344c551 100644
--- a/src/emap/skill_ground.c
+++ b/src/emap/skill_ground.c
@@ -12,8 +12,9 @@
#include "map/mob.h"
#include "map/skill.h"
-#include "emap/effects.h"
#include "emap/skill_ground.h"
+#include "emap/data/skilld.h"
+#include "emap/struct/skilldext.h"
static int eskill_massprovoke_sub(struct block_list *bl,
va_list ap)
@@ -26,6 +27,7 @@ static int eskill_massprovoke_sub(struct block_list *bl,
struct block_list* src = va_arg(ap, struct block_list*);
int dist = va_arg(ap, int);
int *cnt = va_arg(ap, int*);
+ int effect = va_arg(ap, int);
struct status_change *tsc = status->get_sc(bl);
struct mob_data *dstmd = BL_UCAST(BL_MOB, bl);
@@ -42,7 +44,8 @@ static int eskill_massprovoke_sub(struct block_list *bl,
{
dstmd->state.provoke_flag = src->id;
mob->target(dstmd, src, dist);
- clif->misceffect(bl, EFFECT_PROVOKE);
+ if (effect >= 0)
+ clif->misceffect(bl, effect);
(*cnt) ++;
}
@@ -61,8 +64,9 @@ bool eskill_massprovoke_castend(struct block_list* src,
const int r = skill->get_splash(*skill_id, *skill_lv);
const int dist = skill->get_range2(src, *skill_id, *skill_lv);
int cnt = 0;
+ int effect = skilld_get_misceffect(*skill_id, 0);
map->foreachinarea(eskill_massprovoke_sub, src->m, *x - r, *y - r, *x + r, *y + r, BL_MOB,
- src, dist, &cnt);
+ src, dist, &cnt, effect);
if (cnt == 0)
{
unit->skillcastcancel(src, 1);