diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-08-21 06:21:44 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-08-21 06:21:44 +0000 |
| commit | ad8b21eed7219a457340278ed39642578d48b2eb (patch) | |
| tree | f6efe58eafbe1ecdb554f888feb8f40bdd6fc1b9 /src/map/skill.c | |
| parent | 8f8f101effc1c7e73af479a5474e59a6ebf3d0d3 (diff) | |
| download | hercules-ad8b21eed7219a457340278ed39642578d48b2eb.tar.gz hercules-ad8b21eed7219a457340278ed39642578d48b2eb.tar.bz2 hercules-ad8b21eed7219a457340278ed39642578d48b2eb.tar.xz hercules-ad8b21eed7219a457340278ed39642578d48b2eb.zip | |
Added bMagicHPGainValue and bMagicSPGainValue.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14018 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 9d8c3d6c2..1ed612dee 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1234,13 +1234,21 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list * status_heal(src, 0, status_get_lv(bl)*(95+15*rate)/100, 2); } - if( sd && status_isdead(bl) && attack_type&BF_WEAPON ) + if( sd && status_isdead(bl) ) { int sp = 0, hp = 0; - sp += sd->sp_gain_value; - sp += sd->sp_gain_race[status_get_race(bl)]; - sp += sd->sp_gain_race[is_boss(bl)?RC_BOSS:RC_NONBOSS]; - hp += sd->hp_gain_value; + if( attack_type&BF_WEAPON ) + { + sp += sd->sp_gain_value; + sp += sd->sp_gain_race[status_get_race(bl)]; + sp += sd->sp_gain_race[is_boss(bl)?RC_BOSS:RC_NONBOSS]; + hp += sd->hp_gain_value; + } + if( attack_type&BF_MAGIC ) + { + sp += sd->magic_sp_gain_value; + hp += sd->magic_hp_gain_value; + } if( hp || sp ) status_heal(src, hp, sp, battle_config.show_hp_sp_gain?2:0); } |