mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-21 01:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 320

Browse source 
Conflicts:
	src/game/SpellAuras.cpp
This commit is contained in:
tomrus88 2009-09-26 19:51:04 +04:00
commit f06741d7c4
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/SpellAuraDefines.h
View file

@ -332,7 +332,7 @@ enum AuraType
SPELL_AURA_DEFLECT_SPELLS,
SPELL_AURA_288,
SPELL_AURA_289,
SPELL_AURA_290,
SPELL_AURA_MOD_ALL_CRIT_CHANCE,
SPELL_AURA_291,
SPELL_AURA_292,
SPELL_AURA_293,

8
src/game/SpellAuras.cpp
View file

@ -340,7 +340,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&Aura::HandleNoImmediateEffect, //287 SPELL_AURA_DEFLECT_SPELLS implemented in Unit::MagicSpellHitResult and Unit::MeleeSpellHitResult
&Aura::HandleUnused, //288 increase parry/deflect, prevent attack
&Aura::HandleUnused, //289 unused
&Aura::HandleUnused, //290 3 spells
&Aura::HandleAuraModAllCritChance, //290 SPELL_AURA_MOD_ALL_CRIT_CHANCE
&Aura::HandleUnused, //291 1 spell (+pct experience bonus)
&Aura::HandleNULL, //292 call stabled pet
&Aura::HandleNULL, //293 3 spells
@ -7417,3 +7417,9 @@ void Aura::HandleModTargetArmorPct(bool apply, bool Real)
((Player*)m_target)->UpdateArmorPenetration();
}
void Aura::HandleAuraModAllCritChance(bool apply, bool Real)
{
this->HandleAuraModCritPercent(apply, Real);
this->HandleModSpellCritChance(apply, Real);
}

2
src/game/StatSystem.cpp
View file

@ -586,6 +586,8 @@ void Player::UpdateSpellCritChance(uint32 school)
crit += GetSpellCritFromIntellect();
// Increase crit from SPELL_AURA_MOD_SPELL_CRIT_CHANCE
crit += GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
// Increase crit from SPELL_AURA_MOD_ALL_CRIT_CHANCE
crit += GetTotalAuraModifier(SPELL_AURA_MOD_ALL_CRIT_CHANCE);
// Increase crit by school from SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL
crit += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL, 1<<school);
// Increase crit from spell crit ratings