diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-09-13 11:44:53 +0200 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-09-13 11:44:53 +0200 |
| commit | aba829d912c3392a0fdd5dff2a834559e88a5506 (patch) | |
| tree | 673750a46888032ca9d2b810aa9c74e53f122cbb /src | |
| parent | 45d77eed7a16245b38fe46eb9d71074d33106946 (diff) | |
| download | hercules-aba829d912c3392a0fdd5dff2a834559e88a5506.tar.gz hercules-aba829d912c3392a0fdd5dff2a834559e88a5506.tar.bz2 hercules-aba829d912c3392a0fdd5dff2a834559e88a5506.tar.xz hercules-aba829d912c3392a0fdd5dff2a834559e88a5506.zip | |
Fix Soul Breaker not affect by Lex Aeterna (bug:7712)
Fix Throwing Mysterious Powder with Sling Item. Thanks to Rikter (bug:8333)
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 6 | ||||
| -rw-r--r-- | src/map/status.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 6cbd6379f..0120d5e4b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2809,7 +2809,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam //Now damage increasing effects if( sc->data[SC_LEXAETERNA] && skill_id != PF_SOULBURN #ifdef RENEWAL - && skill_id != CR_ACIDDEMONSTRATION + && skill_id != CR_ACIDDEMONSTRATION && skill_id != ASC_BREAKER #endif ) { @@ -3834,6 +3834,10 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * ratio >>= 1; md.damage = (matk + atk) * ratio / 100; md.damage -= totaldef; + if( tsc && tsc->data[SC_LEXAETERNA] ) { + md.damage <<= 1; + status_change_end(target, SC_LEXAETERNA, INVALID_TIMER); + } #endif } break; diff --git a/src/map/status.c b/src/map/status.c index 23184f46e..bc817fbea 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1004,6 +1004,7 @@ void initChangeTables(void) { status->ChangeFlagTable[SC_REBOUND] |= SCB_SPEED|SCB_REGEN; status->ChangeFlagTable[SC_DEFSET] |= SCB_DEF|SCB_DEF2; status->ChangeFlagTable[SC_MDEFSET] |= SCB_MDEF|SCB_MDEF2; + status->ChangeFlagTable[SC_MYSTERIOUS_POWDER] |= SCB_MAXHP; status->ChangeFlagTable[SC_ALL_RIDING] = SCB_SPEED; status->ChangeFlagTable[SC_WEDDING] = SCB_SPEED; |