From 38d0d552f536322d12d800e66e21e50c7e73a925 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sun, 18 Mar 2012 17:35:29 +0000 Subject: 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 --- src/map/battle.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/map/battle.c') 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 -- cgit v1.2.3-70-g09d2