diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-18 17:35:29 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-18 17:35:29 +0000 |
| commit | 38d0d552f536322d12d800e66e21e50c7e73a925 (patch) | |
| tree | ac9717221e26b136f21082f0196f71cc177d988d /src/map/battle.c | |
| parent | e97084001612262b011ec71c90f202160b9925c0 (diff) | |
| download | hercules-38d0d552f536322d12d800e66e21e50c7e73a925.tar.gz hercules-38d0d552f536322d12d800e66e21e50c7e73a925.tar.bz2 hercules-38d0d552f536322d12d800e66e21e50c7e73a925.tar.xz hercules-38d0d552f536322d12d800e66e21e50c7e73a925.zip | |
Fixed Deep Sleep status, when hit in this status the hit damage is increased by 50% and deep sleep goes off. bugreport:5464
Also: Fixed Voice of Siren not going off when hit
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15725 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index d9ef2b325..3b1aded89 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -517,9 +517,20 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag status_change_end(bl, SC_AETERNA, INVALID_TIMER); //Shouldn't end until Breaker's non-weapon part connects. } + if( damage ) { + + if( sc->data[SC_DEEPSLEEP] ) { + damage += damage / 2; // 1.5 times more damage while in Deep Sleep. + status_change_end(bl,SC_DEEPSLEEP,-1); + } + + if( sc->data[SC_VOICEOFSIREN] ) + status_change_end(bl,SC_VOICEOFSIREN,-1); + } + + //Finally damage reductions.... - if( sc->data[SC_ASSUMPTIO] ) - { + if( sc->data[SC_ASSUMPTIO] ) { if( map_flag_vs(bl->m) ) damage = damage*2/3; //Receive 66% damage else |