diff options
| author | megamage <none@none> | 2009-02-09 19:59:14 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-09 19:59:14 -0600 |
| commit | c5fba75cc08ad1e5aef95788253bbfc262071a1c (patch) | |
| tree | 6f1d886a3478a0135c894bfc34dde42a0dcd2ec4 | |
| parent | fd83d371bafc6e18b972e3c7bb192d7d6b29a217 (diff) | |
[7244] Fixed affecting of positive spells critical chances by scripted critical chances. Author: pasdVn
--HG--
branch : trunk
| -rw-r--r-- | src/game/Unit.cpp | 21 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index abdd8746679..1de7e266f2f 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -8280,15 +8280,18 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM crit_chance += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL, schoolMask); } // taken - if (pVictim && !IsPositiveSpell(spellProto->Id)) - { - // Modify critical chance by victim SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE - crit_chance += pVictim->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE, schoolMask); - // Modify critical chance by victim SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE - crit_chance += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE); - // Modify by player victim resilience - if (pVictim->GetTypeId() == TYPEID_PLAYER) - crit_chance -= ((Player*)pVictim)->GetRatingBonusValue(CR_CRIT_TAKEN_SPELL); + if (pVictim) + { + if (!IsPositiveSpell(spellProto->Id)) + { + // Modify critical chance by victim SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE + crit_chance += pVictim->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE, schoolMask); + // Modify critical chance by victim SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE + crit_chance += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE); + // Modify by player victim resilience + if (pVictim->GetTypeId() == TYPEID_PLAYER) + crit_chance -= ((Player*)pVictim)->GetRatingBonusValue(CR_CRIT_TAKEN_SPELL); + } // scripted (increase crit chance ... against ... target by x% AuraList const& mOverrideClassScript = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 20b1e7a10bb..d24f5ee135e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7243" + #define REVISION_NR "7245" #endif // __REVISION_NR_H__ |