summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorprotimus <protimus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-08 02:46:19 +0000
committerprotimus <protimus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-08 02:46:19 +0000
commit6ba747880532b4278fed801896216146ac63a90d (patch)
tree94660136ac947cf5288cb5a0b4c39f9ef2de8fe5 /src/map/battle.c
parent7db42789c2baba7154d7df1388942752789a2f93 (diff)
downloadhercules-6ba747880532b4278fed801896216146ac63a90d.tar.gz
hercules-6ba747880532b4278fed801896216146ac63a90d.tar.bz2
hercules-6ba747880532b4278fed801896216146ac63a90d.tar.xz
hercules-6ba747880532b4278fed801896216146ac63a90d.zip
Fixed Exceed Break to work properly.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15407 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index bc42609ec..c3d22a489 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3850,6 +3850,12 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
tsc->data[SC_KAAHI]->val4 = add_timer(tick + skill_get_time2(SL_KAAHI,tsc->data[SC_KAAHI]->val1), kaahi_heal_timer, target->id, SC_KAAHI); //Activate heal.
wd = battle_calc_attack(BF_WEAPON, src, target, 0, 0, flag);
+
+ if(sc && sc->data[SC_EXEEDBREAK])
+ {
+ wd.damage = wd.damage * sc->data[SC_EXEEDBREAK]->val1 / 100;
+ status_change_end(src, SC_EXEEDBREAK, INVALID_TIMER);
+ }
if (sd && sd->state.arrow_atk) //Consume arrow.
battle_consume_ammo(sd, 0, 0);