diff options
Diffstat (limited to 'src/map/battle.c')
-rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 5addc4955..28c4f2816 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2546,6 +2546,14 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo wd.damage2 += battle_attr_fix(src, target, damage, sc->data[SC_WATK_ELEMENT]->val1, tstatus->def_ele, tstatus->ele_lv); } } + #if REMODE + /** + * In RE Shield Bommerang takes weapon element only for damage calculation, + * - resist calculation is always against neutral + **/ + if ( skill_num == CR_SHIELDBOOMERANG ) + s_ele = s_ele_ = ELE_NEUTRAL; + #endif } if(skill_num == CR_GRANDCROSS || skill_num == NPC_GRANDDARKNESS) |