From bb0a08a67c73be469c130567ec9e6c5b8a4a2963 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 3 Jul 2006 19:59:48 +0000 Subject: - Char-server SQL won't perform the reconnect cleanup routines when kick_on_disconnect is disabled. - Renamed summons_inherit_effects to summons_trigger_autospells as the setting now only makes the attacks of the slaves trigger the autospells of the master (as it should be). - Corrected code capping no_spawn_on_player to 50 when the max should be 100. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7459 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index aee4fb99f..a5b270329 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1324,11 +1324,6 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int break; } - if (md && battle_config.summons_inherit_effects && md->master_id && md->special_state.ai) - { //Pass heritage to Master for status causing effects. [Skotlex] - sd = map_id2sd(md->master_id); - } - if(sd && skillid != MC_CARTREVOLUTION && skillid != AM_DEMONSTRATION && skillid != CR_REFLECTSHIELD && attack_type&BF_WEAPON){ /* カードによる追加効果 */ int i, type; for(i=SC_COMMON_MIN;i<=SC_COMMON_MAX;i++){ @@ -1340,6 +1335,12 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int } } + if (md && battle_config.summons_trigger_autospells && md->master_id && md->special_state.ai) + { //Pass heritage to Master for status causing effects. [Skotlex] + sd = map_id2sd(md->master_id); + src = sd?&sd->bl:src; + } + //Reports say that autospell effects get triggered on skills and pretty much everything including splash attacks. [Skotlex] if(sd && !status_isdead(bl) && src != bl && !(skillid && skill_get_nk(skillid)&NK_NO_DAMAGE)) { -- cgit v1.2.3-60-g2f50