diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-01 14:12:51 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-01 14:12:51 +0000 |
| commit | d3adab9f6f417979f9f7a5915930604d0add5c64 (patch) | |
| tree | 2d9b1b661dd4a9323d8036bfbd379cb0b7cda32a /src/map/battle.c | |
| parent | 116eb2b7f492f871e0348c05fbe075191d14c4d6 (diff) | |
| download | hercules-d3adab9f6f417979f9f7a5915930604d0add5c64.tar.gz hercules-d3adab9f6f417979f9f7a5915930604d0add5c64.tar.bz2 hercules-d3adab9f6f417979f9f7a5915930604d0add5c64.tar.xz hercules-d3adab9f6f417979f9f7a5915930604d0add5c64.zip | |
- 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
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 3 insertions, 1 deletions
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] |