diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-19 14:37:10 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-19 14:37:10 +0000 |
| commit | e4e7b556c5c5e423e22ad2121629f6e819af43cb (patch) | |
| tree | 9b99268a4bc195a1bff884b600382bff4a8591f5 /src/map/battle.c | |
| parent | 7e6ec6039ede7ccbe920cce0070df0d2dd05aef8 (diff) | |
| download | hercules-e4e7b556c5c5e423e22ad2121629f6e819af43cb.tar.gz hercules-e4e7b556c5c5e423e22ad2121629f6e819af43cb.tar.bz2 hercules-e4e7b556c5c5e423e22ad2121629f6e819af43cb.tar.xz hercules-e4e7b556c5c5e423e22ad2121629f6e819af43cb.zip | |
Rigged the r13676 modification of battle_calc_weapon_attack to make neutral element reductions work again (bugreport:3097).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13795 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index b36b22a45..224f01c62 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1034,8 +1034,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo s_ele_ = sstatus->lhw.ele; if (flag.arrow && sd && sd->arrow_ele) s_ele = sd->arrow_ele; - if (battle_config.attack_attr_none&src->type) - nk|=NK_NO_ELEFIX; //Weapon's element is "not elemental" } else if (s_ele == -2) { //Use enchantment's element s_ele = s_ele_ = status_get_attack_sc_element(src,sc); } @@ -1896,7 +1894,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo if(skill_num==TF_POISON) ATK_ADD(15*skill_lv); - if(!(nk&NK_NO_ELEFIX)) + if(!(nk&NK_NO_ELEFIX) && + !(battle_config.attack_attr_none&src->type && (skill_num == 0 || skill_get_ele(skill_num, skill_lv) == -1)) + ) { //Elemental attribute fix if( wd.damage > 0 ) { |