summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-09-24 09:25:11 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-09-24 09:25:11 +0200
commit733ea0cceeb07f5b748c502b0a12499cfc4d928c (patch)
tree0250bb81b5ba9c65a023a6ee050b7c896e85114b
parent2bc31ad003a8c3283043c62d012a57edde794fba (diff)
parent32ecd8c9dfa5dc63e9debcc12a504d73c78e7b48 (diff)
downloadhercules-733ea0cceeb07f5b748c502b0a12499cfc4d928c.tar.gz
hercules-733ea0cceeb07f5b748c502b0a12499cfc4d928c.tar.bz2
hercules-733ea0cceeb07f5b748c502b0a12499cfc4d928c.tar.xz
hercules-733ea0cceeb07f5b748c502b0a12499cfc4d928c.zip
Merge pull request #365 from csnv/somefixes
Fixes card increment damage on Renewal. Bug 8364
-rw-r--r--src/map/battle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index c511c5885..cbc9b2c78 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5105,6 +5105,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
}
#endif
+#ifndef RENEWAL // Offensive damage increment in renewal is done somewhere else
if (sd) {
if (skill_id != CR_SHIELDBOOMERANG) //Only Shield boomerang doesn't takes the Star Crumbs bonus.
ATK_ADD2(wd.div_*sd->right_weapon.star, wd.div_*sd->left_weapon.star);
@@ -5126,7 +5127,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
ATK_ADD(10*sd->status.inventory[index].refine);
}
}
-
+#endif
//Card Fix, tsd side
if(tsd){ //if player on player then it was already measured above
wd.damage = battle->calc_cardfix(BF_WEAPON, src, target, nk, s_ele, s_ele_, wd.damage, (flag.lh?1:0), wd.flag);