diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-21 17:05:05 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-21 17:05:05 +0000 |
| commit | 5d379983519317865fcc650a254fd314e0a32b38 (patch) | |
| tree | 9050ae24361e6f616a2a84491a68940c6b474b9a /src/map/battle.c | |
| parent | 52ae0384d046cc52800ba70b36e10b154c5b8e87 (diff) | |
| download | hercules-5d379983519317865fcc650a254fd314e0a32b38.tar.gz hercules-5d379983519317865fcc650a254fd314e0a32b38.tar.bz2 hercules-5d379983519317865fcc650a254fd314e0a32b38.tar.xz hercules-5d379983519317865fcc650a254fd314e0a32b38.zip | |
Fixed bugreport:5777 WL_DRAINLIFE HP absorption based on damage is now working properly. Thanks to Rytech
Fixed WL_SOULEXPANSION now it should do double damage on White Imprisoned targets and WL_WHITEIMPRISON should not work with bosses.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16137 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 36f158ff8..565f6e312 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -403,10 +403,11 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag skill_num == WL_SOULEXPANSION || (skill_num && skill_get_ele(skill_num, skill_lv) == ELE_GHOST) || (!skill_num && (status_get_status_data(src))->rhw.ele == ELE_GHOST) - ) + ){ + if( skill_num == WL_SOULEXPANSION ) + damage <<= 1; // If used against a player in White Imprison, the skill deals double damage. status_change_end(bl,SC_WHITEIMPRISON,INVALID_TIMER); // Those skills do damage and removes effect - else - { + }else{ d->dmg_lv = ATK_BLOCK; return 0; } |