diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-03 19:59:48 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-03 19:59:48 +0000 |
| commit | bb0a08a67c73be469c130567ec9e6c5b8a4a2963 (patch) | |
| tree | dce696635219fd87cdc01fe6a04718a55b217f0f /src/map/skill.c | |
| parent | 695aa3dbc9810b7ad25f2eb4e1c3eb92ba6926f3 (diff) | |
| download | hercules-bb0a08a67c73be469c130567ec9e6c5b8a4a2963.tar.gz hercules-bb0a08a67c73be469c130567ec9e6c5b8a4a2963.tar.bz2 hercules-bb0a08a67c73be469c130567ec9e6c5b8a4a2963.tar.xz hercules-bb0a08a67c73be469c130567ec9e6c5b8a4a2963.zip | |
- 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
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 11 |
1 files changed, 6 insertions, 5 deletions
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)) { |