diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-23 08:06:02 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-23 08:06:02 +0000 |
| commit | 1cea8ffc2a3d8f3d8eb8245df0042122436fff17 (patch) | |
| tree | cd0058db033e16ad4a8f01db047ada6045c49d3c /src | |
| parent | 6064cd97c66f5471cebe3ab7d41711233ee711e3 (diff) | |
| download | hercules-1cea8ffc2a3d8f3d8eb8245df0042122436fff17.tar.gz hercules-1cea8ffc2a3d8f3d8eb8245df0042122436fff17.tar.bz2 hercules-1cea8ffc2a3d8f3d8eb8245df0042122436fff17.tar.xz hercules-1cea8ffc2a3d8f3d8eb8245df0042122436fff17.zip | |
Follow up r15768 (bugreport:5411) - special thanks to Kenpachi!
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15778 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -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) |