summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-10-19 16:46:18 +0200
committerGitHub <noreply@github.com>2019-10-19 16:46:18 +0200
commit660830898b83342ab4eb822c7a61c604d37d645c (patch)
tree2d78d75c5b537d926f41d0e9ac9b5a10a6b7d2cc /src/map/battle.c
parent088547f831aa0cfe007b744c5b967d67e59e9858 (diff)
parentc0e255897c3d6b06ab28004b784a12a9027f82dd (diff)
downloadhercules-660830898b83342ab4eb822c7a61c604d37d645c.tar.gz
hercules-660830898b83342ab4eb822c7a61c604d37d645c.tar.bz2
hercules-660830898b83342ab4eb822c7a61c604d37d645c.tar.xz
hercules-660830898b83342ab4eb822c7a61c604d37d645c.zip
Merge pull request #2561 from skyleo/slave_anklesnare_fix
Make slave mobs react to master's chase target
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 726547c66..7fb5355e6 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4338,7 +4338,7 @@ static struct Damage battle_calc_misc_attack(struct block_list *src, struct bloc
}
break;
}
-
+
battle->reflect_trap(target, src, &md, skill_id);
return md;
@@ -7315,6 +7315,7 @@ static const struct battle_data {
{ "mob_remove_delay", &battle_config.mob_remove_delay, 60000, 1000, INT_MAX, },
{ "mob_active_time", &battle_config.mob_active_time, 0, 0, INT_MAX, },
{ "boss_active_time", &battle_config.boss_active_time, 0, 0, INT_MAX, },
+ { "slave_chase_masters_chasetarget", &battle_config.slave_chase_masters_chasetarget, 1, 0, 1, },
{ "sg_miracle_skill_duration", &battle_config.sg_miracle_skill_duration, 3600000, 0, INT_MAX, },
{ "hvan_explosion_intimate", &battle_config.hvan_explosion_intimate, 45000, 0, 100000, },
{ "quest_exp_rate", &battle_config.quest_exp_rate, 100, 0, INT_MAX, },