From 570852e70e29ca96b911c1775f2c27dc40e5d9e6 Mon Sep 17 00:00:00 2001 From: qsa Date: Tue, 6 Apr 2010 21:03:33 +0300 Subject: [PATCH] [9676] Implement AURA_252 Signed-off-by: Laise --- src/game/SpellAuraDefines.h | 4 ++-- src/game/SpellAuras.cpp | 4 ++-- src/game/Unit.cpp | 2 +- src/shared/revision_nr.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h index 1bce86b6d..8184db349 100644 --- a/src/game/SpellAuraDefines.h +++ b/src/game/SpellAuraDefines.h @@ -235,7 +235,7 @@ enum AuraType SPELL_AURA_MOD_FACTION_REPUTATION_GAIN = 190, SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED = 191, SPELL_AURA_HASTE_MELEE = 192, - SPELL_AURA_MELEE_SLOW = 193, + SPELL_AURA_HASTE_ALL = 193, SPELL_AURA_MOD_IGNORE_ABSORB_SCHOOL = 194, SPELL_AURA_MOD_IGNORE_ABSORB_FOR_SPELL = 195, SPELL_AURA_MOD_COOLDOWN = 196, // only 24818 Noxious Breath @@ -294,7 +294,7 @@ enum AuraType SPELL_AURA_CONVERT_RUNE = 249, SPELL_AURA_MOD_INCREASE_HEALTH_2 = 250, SPELL_AURA_MOD_ENEMY_DODGE = 251, - SPELL_AURA_252 = 252, + SPELL_AURA_SLOW_ALL = 252, SPELL_AURA_MOD_BLOCK_CRIT_CHANCE = 253, SPELL_AURA_MOD_DISARM_SHIELD = 254, SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT = 255, diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index ffa3d6263..c76652251 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -243,7 +243,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]= &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::HandleModCombatSpeedPct, //193 SPELL_AURA_MELEE_SLOW (in fact combat (any type attack) speed pct) + &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 &Aura::HandleNULL, //196 SPELL_AURA_MOD_COOLDOWN (single spell 24818 in 3.2.2a) @@ -302,7 +302,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]= &Aura::HandleAuraConvertRune, //249 SPELL_AURA_CONVERT_RUNE &Aura::HandleAuraModIncreaseHealth, //250 SPELL_AURA_MOD_INCREASE_HEALTH_2 &Aura::HandleNULL, //251 SPELL_AURA_MOD_ENEMY_DODGE - &Aura::HandleNULL, //252 haste all? + &Aura::HandleModCombatSpeedPct, //252 SPELL_AURA_SLOW_ALL &Aura::HandleNoImmediateEffect, //253 SPELL_AURA_MOD_BLOCK_CRIT_CHANCE implemented in Unit::CalculateMeleeDamage &Aura::HandleNULL, //254 SPELL_AURA_MOD_DISARM_SHIELD disarm Shield &Aura::HandleNoImmediateEffect, //255 SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT implemented in Unit::SpellDamageBonus diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 60dd84d37..d8b2ba034 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9037,7 +9037,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 } // Torment the weak affected (Arcane Barrage, Arcane Blast, Frostfire Bolt, Arcane Missiles, Fireball) if ((spellProto->SpellFamilyFlags & UI64LIT(0x0000900020200021)) && - (pVictim->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || pVictim->HasAuraType(SPELL_AURA_MELEE_SLOW))) + (pVictim->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || pVictim->HasAuraType(SPELL_AURA_HASTE_ALL))) { //Search for Torment the weak dummy aura Unit::AuraList const& ttw = GetAurasByType(SPELL_AURA_DUMMY); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 078fbce0f..ba1c62e08 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 "9682" + #define REVISION_NR "9676" #endif // __REVISION_NR_H__