diff options
| author | Haru <haru@dotalux.com> | 2015-12-17 06:19:27 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-17 06:19:27 +0100 |
| commit | 0743e53904411c632fb8bf4d92f34a60319355c2 (patch) | |
| tree | 28bfcb2bd00bdbda9376c72930be4299b8d25561 /src/map/battle.c | |
| parent | 928937106625058745ca78508df98696905d528a (diff) | |
| parent | 7e083f9ae7688b2ee1d98246af0ba60c914d0f88 (diff) | |
| download | hercules-0743e53904411c632fb8bf4d92f34a60319355c2.tar.gz hercules-0743e53904411c632fb8bf4d92f34a60319355c2.tar.bz2 hercules-0743e53904411c632fb8bf4d92f34a60319355c2.tar.xz hercules-0743e53904411c632fb8bf4d92f34a60319355c2.zip | |
Merge branch 'Jedzkie-Pull_12' into hercules
Closes #958
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c0c2e29cc..c28aef820 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -5833,6 +5833,17 @@ void battle_reflect_damage(struct block_list *target, struct block_list *src, st delay += 100;/* gradual increase so the numbers don't clip in the client */ } + if (sc->data[SC_MVPCARD_ORCLORD]) { + NORMALIZE_RDAMAGE(damage * sc->data[SC_MVPCARD_ORCLORD]->val1 / 100); + + rdelay = clif->delay_damage(tick + delay, src, src, status_get_amotion(src), status_get_dmotion(src), rdamage, 1, BDT_ENDURE); + + if (tsd) + battle->drain(tsd, src, rdamage, rdamage, status_get_race(src), 0); + battle->delay_damage(tick, wd->amotion, target, src, 0, CR_REFLECTSHIELD, 0, rdamage, ATK_DEF, rdelay, true); + + delay += 100; + } } if( ( ssc = status->get_sc(src) ) ) { if( ssc->data[SC_INSPIRATION] ) { |