diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Unit.cpp | 42 | ||||
| -rw-r--r-- | src/game/Unit.h | 1 |
2 files changed, 30 insertions, 13 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 44e07887d93..9de45667a53 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -2804,6 +2804,27 @@ float Unit::MeleeSpellMissChance(const Unit *pVictim, WeaponAttackType attType, return miss_chance; } + +int32 Unit::GetMechanicResistChance(const SpellEntry *spell) +{ + if(!spell) + return 0; + int32 resist_mech = 0; + for(int eff = 0; eff < 3; ++eff) + { + if(spell->Effect[eff] == 0) + break; + int32 effect_mech = GetEffectMechanic(spell, eff); + if (effect_mech) + { + int32 temp = GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_MECHANIC_RESISTANCE, effect_mech); + if (resist_mech < temp) + resist_mech = temp; + } + } + return resist_mech; +} + // Melee based spells hit result calculations SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) { @@ -2829,6 +2850,12 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) if (spell->Attributes & SPELL_ATTR_IMPOSSIBLE_DODGE_PARRY_BLOCK) return SPELL_MISS_NONE; + // Chance resist mechanic + int32 resist_chance = pVictim->GetMechanicResistChance(spell)*100; + tmp += resist_chance; + if (roll < tmp) + return SPELL_MISS_RESIST; + // Ranged attack can`t miss too if (attType == RANGED_ATTACK) return SPELL_MISS_NONE; @@ -2917,20 +2944,9 @@ SpellMissInfo Unit::MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell) if (IsDispelSpell(spell)) modHitChance-=pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_DISPEL_RESIST); // Chance resist mechanic (select max value from every mechanic spell effect) - int32 resist_mech = 0; - // Get effects mechanic and chance - for(int eff = 0; eff < 3; ++eff) - { - int32 effect_mech = GetEffectMechanic(spell, eff); - if (effect_mech) - { - int32 temp = pVictim->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_MECHANIC_RESISTANCE, effect_mech); - if (resist_mech < temp) - resist_mech = temp; - } - } + int32 resist_chance = pVictim->GetMechanicResistChance(spell); // Apply mod - modHitChance-=resist_mech; + modHitChance-=resist_chance; // Chance resist debuff modHitChance-=pVictim->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DEBUFF_RESISTANCE, int32(spell->Dispel)); diff --git a/src/game/Unit.h b/src/game/Unit.h index 0a8cfc2c444..ef4b29fcc3a 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -969,6 +969,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject float GetUnitParryChance() const; float GetUnitBlockChance() const; float GetUnitCriticalChance(WeaponAttackType attackType, const Unit *pVictim) const; + int32 GetMechanicResistChance(const SpellEntry *spell); virtual uint32 GetShieldBlockValue() const =0; uint32 GetUnitMeleeSkill(Unit const* target = NULL) const { return (target ? getLevelForTarget(target) : getLevel()) * 5; } |