From d3adab9f6f417979f9f7a5915930604d0add5c64 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 1 Sep 2006 14:12:51 +0000 Subject: - Soul Breaker will now be affected by Lex Aeterna on both parts of the attack. - Some minor code cleanups - Cleaned Adaptation's code to not require to check the Skill Unit group structure to extract the skill lv info. - Status changes with no skill and no SCB* data will now go through if they have an SI* icon. This should fix SC_MIRACLE - Reverted switching a mob's adelay/amotion when the later is longer than the former, now both get updated to amotion. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8574 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index 7e724b0d0..5265dd270 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -330,7 +330,9 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i //Now damage increasing effects if(sc->data[SC_AETERNA].timer!=-1 && skill_num != PF_SOULBURN){ damage<<=1; - status_change_end( bl,SC_AETERNA,-1 ); + //Shouldn't end until Breaker's non-weapon part connects. + if (skill_num != ASC_BREAKER || flag&BF_WEAPON) + status_change_end( bl,SC_AETERNA,-1 ); } if(sc->data[SC_SPIDERWEB].timer!=-1) // [Celest] -- cgit v1.2.3-60-g2f50