From 4686f905ac573a0f85df04710fa12478b73d08ec Mon Sep 17 00:00:00 2001 From: michalpolko Date: Thu, 9 Dec 2010 02:09:11 +0100 Subject: [PATCH] [10843] Fix AuraType 138 to not affect ranged haste, and rename to SPELL_AURA_MOD_MELEE_HASTE. Also type 192 had misleading name, rename to SPELL_AURA_MOD_MELEE_RANGED_HASTE. Signed-off-by: Lynx3d --- src/game/SpellAuraDefines.h | 4 ++-- src/game/SpellAuras.cpp | 7 +++---- src/game/SpellAuras.h | 2 +- src/game/Unit.cpp | 4 ++-- src/game/UnitAuraProcHandler.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h index 3d92ad751..fec32f3c0 100644 --- a/src/game/SpellAuraDefines.h +++ b/src/game/SpellAuraDefines.h @@ -173,7 +173,7 @@ enum AuraType SPELL_AURA_MOD_HEALING_DONE = 135, SPELL_AURA_MOD_HEALING_DONE_PERCENT = 136, SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE = 137, - SPELL_AURA_MOD_HASTE = 138, + SPELL_AURA_MOD_MELEE_HASTE = 138, SPELL_AURA_FORCE_REACTION = 139, SPELL_AURA_MOD_RANGED_HASTE = 140, SPELL_AURA_MOD_RANGED_AMMO_HASTE = 141, @@ -227,7 +227,7 @@ enum AuraType SPELL_AURA_MOD_RATING = 189, SPELL_AURA_MOD_FACTION_REPUTATION_GAIN = 190, SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED = 191, - SPELL_AURA_HASTE_MELEE = 192, + SPELL_AURA_MOD_MELEE_RANGED_HASTE = 192, SPELL_AURA_HASTE_ALL = 193, SPELL_AURA_MOD_IGNORE_ABSORB_SCHOOL = 194, SPELL_AURA_MOD_IGNORE_ABSORB_FOR_SPELL = 195, diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index bfcc06687..62e14f4fe 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -188,7 +188,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]= &Aura::HandleModHealingDone, //135 SPELL_AURA_MOD_HEALING_DONE &Aura::HandleNoImmediateEffect, //136 SPELL_AURA_MOD_HEALING_DONE_PERCENT implemented in Unit::SpellHealingBonusDone &Aura::HandleModTotalPercentStat, //137 SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE - &Aura::HandleHaste, //138 SPELL_AURA_MOD_HASTE + &Aura::HandleModMeleeSpeedPct, //138 SPELL_AURA_MOD_MELEE_HASTE &Aura::HandleForceReaction, //139 SPELL_AURA_FORCE_REACTION &Aura::HandleAuraModRangedHaste, //140 SPELL_AURA_MOD_RANGED_HASTE &Aura::HandleRangedAmmoHaste, //141 SPELL_AURA_MOD_RANGED_AMMO_HASTE @@ -242,7 +242,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]= &Aura::HandleModRating, //189 SPELL_AURA_MOD_RATING &Aura::HandleNoImmediateEffect, //190 SPELL_AURA_MOD_FACTION_REPUTATION_GAIN implemented in Player::CalculateReputationGain &Aura::HandleAuraModUseNormalSpeed, //191 SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED - &Aura::HandleModMeleeRangedSpeedPct, //192 SPELL_AURA_HASTE_MELEE + &Aura::HandleModMeleeRangedSpeedPct, //192 SPELL_AURA_MOD_MELEE_RANGED_HASTE &Aura::HandleModCombatSpeedPct, //193 SPELL_AURA_HASTE_ALL (in fact combat (any type attack) speed pct) &Aura::HandleNoImmediateEffect, //194 SPELL_AURA_MOD_IGNORE_ABSORB_SCHOOL implement in Unit::CalcNotIgnoreAbsorbDamage &Aura::HandleNoImmediateEffect, //195 SPELL_AURA_MOD_IGNORE_ABSORB_FOR_SPELL implement in Unit::CalcNotIgnoreAbsorbDamage @@ -5548,12 +5548,11 @@ void Aura::HandleModAttackSpeed(bool apply, bool /*Real*/) GetTarget()->ApplyAttackTimePercentMod(BASE_ATTACK,float(m_modifier.m_amount),apply); } -void Aura::HandleHaste(bool apply, bool /*Real*/) +void Aura::HandleModMeleeSpeedPct(bool apply, bool /*Real*/) { Unit *target = GetTarget(); target->ApplyAttackTimePercentMod(BASE_ATTACK, float(m_modifier.m_amount), apply); target->ApplyAttackTimePercentMod(OFF_ATTACK, float(m_modifier.m_amount), apply); - target->ApplyAttackTimePercentMod(RANGED_ATTACK, float(m_modifier.m_amount), apply); } void Aura::HandleAuraModRangedHaste(bool apply, bool /*Real*/) diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 57b89f8b3..e3b3db4e0 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -248,7 +248,7 @@ class MANGOS_DLL_SPEC Aura void HandleAuraModIncreaseEnergyPercent(bool Apply, bool Real); void HandleAuraModIncreaseHealthPercent(bool Apply, bool Real); void HandleAuraModRegenInterrupt(bool Apply, bool Real); - void HandleHaste(bool Apply, bool Real); + void HandleModMeleeSpeedPct(bool Apply, bool Real); void HandlePeriodicTriggerSpell(bool Apply, bool Real); void HandlePeriodicTriggerSpellWithValue(bool apply, bool Real); void HandlePeriodicEnergize(bool Apply, bool Real); diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 43eddd51b..a4548949f 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6330,7 +6330,7 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u else // Tundra Stalker { // Frost Fever (target debuff) - if (pVictim->GetAura(SPELL_AURA_MOD_HASTE, SPELLFAMILY_DEATHKNIGHT, UI64LIT(0x0000000000000000), 0x00000002)) + if (pVictim->GetAura(SPELL_AURA_MOD_MELEE_HASTE, SPELLFAMILY_DEATHKNIGHT, UI64LIT(0x0000000000000000), 0x00000002)) DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f; break; } @@ -7306,7 +7306,7 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType else // Tundra Stalker { // Frost Fever (target debuff) - if (pVictim->GetAura(SPELL_AURA_MOD_HASTE, SPELLFAMILY_DEATHKNIGHT, UI64LIT(0x0000000000000000), 0x00000002)) + if (pVictim->GetAura(SPELL_AURA_MOD_MELEE_HASTE, SPELLFAMILY_DEATHKNIGHT, UI64LIT(0x0000000000000000), 0x00000002)) DonePercent *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f; break; } diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index 280021e85..4fa478813 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -171,7 +171,7 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]= &Unit::HandleNULLProc, //135 SPELL_AURA_MOD_HEALING_DONE &Unit::HandleNULLProc, //136 SPELL_AURA_MOD_HEALING_DONE_PERCENT &Unit::HandleNULLProc, //137 SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE - &Unit::HandleHasteAuraProc, //138 SPELL_AURA_MOD_HASTE + &Unit::HandleHasteAuraProc, //138 SPELL_AURA_MOD_MELEE_HASTE &Unit::HandleNULLProc, //139 SPELL_AURA_FORCE_REACTION &Unit::HandleNULLProc, //140 SPELL_AURA_MOD_RANGED_HASTE &Unit::HandleNULLProc, //141 SPELL_AURA_MOD_RANGED_AMMO_HASTE @@ -1653,7 +1653,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura { // "refresh your Slice and Dice duration to its 5 combo point maximum" // lookup Slice and Dice - AuraList const& sd = GetAurasByType(SPELL_AURA_MOD_HASTE); + AuraList const& sd = GetAurasByType(SPELL_AURA_MOD_MELEE_HASTE); for(AuraList::const_iterator itr = sd.begin(); itr != sd.end(); ++itr) { SpellEntry const *spellProto = (*itr)->GetSpellProto(); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8448412b1..66c8c4611 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 "10842" + #define REVISION_NR "10843" #endif // __REVISION_NR_H__