Browse Source

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://svn.code.sf.net/p/rathena/svn/trunk@15725 54d463be-8e91-2dee-dedb-b68131a5f0ec

shennetsind 13 years ago
parent
commit
acade23765
1 changed files with 13 additions and 2 deletions
  1. 13 2
      src/map/battle.c

+ 13 - 2
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