Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up r15768 (bugreport:5411) - special thanks to Kenpachi!

Browse Source 
Shield Bommerang takes weapon element only until it calculates its damage against target, from there on (dmg reduction calculation) it uses neutral.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15778 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-03-23 08:06:02 +00:00
parent 754dfd12ed
commit 3a99470723
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/battle.c
View File

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