summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorAnnieRuru <jeankof@ymail.com>2014-09-26 00:34:34 +0800
committerAnnieRuru <jeankof@ymail.com>2014-09-26 00:34:34 +0800
commitd248e30f13ebfa13b2686fe739b8d225e2d137e5 (patch)
treed707d258c644ea1e4edce356061585d83989738f /src/map
parent30d748f4ab332b501b6db5ce59421ea42387a8b8 (diff)
parent733ea0cceeb07f5b748c502b0a12499cfc4d928c (diff)
downloadhercules-d248e30f13ebfa13b2686fe739b8d225e2d137e5.tar.gz
hercules-d248e30f13ebfa13b2686fe739b8d225e2d137e5.tar.bz2
hercules-d248e30f13ebfa13b2686fe739b8d225e2d137e5.tar.xz
hercules-d248e30f13ebfa13b2686fe739b8d225e2d137e5.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map')
-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);