|
|
@@ -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)
|
shennetsind