diff options
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraDefines.h | 18 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 18 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 5fe98b3f31b..cafa560ffb5 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8408,7 +8408,7 @@ uint32 Unit::SpellDamageBonusTaken(Unit* caster, SpellInfo const* spellProto, ui } // From caster spells - AuraEffectList const& mOwnerTaken = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_FROM_CASTER); + AuraEffectList const& mOwnerTaken = GetAuraEffectsByType(SPELL_AURA_MOD_SPELL_DAMAGE_FROM_CASTER); for (AuraEffectList::const_iterator i = mOwnerTaken.begin(); i != mOwnerTaken.end(); ++i) if ((*i)->GetCasterGUID() == caster->GetGUID() && (*i)->IsAffectingSpell(spellProto)) AddPct(TakenTotalMod, (*i)->GetAmount()); @@ -9366,7 +9366,7 @@ uint32 Unit::MeleeDamageBonusTaken(Unit* attacker, uint32 pdamage, WeaponAttackT if (spellProto) { // From caster spells - AuraEffectList const& mOwnerTaken = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_FROM_CASTER); + AuraEffectList const& mOwnerTaken = GetAuraEffectsByType(SPELL_AURA_MOD_SPELL_DAMAGE_FROM_CASTER); for (AuraEffectList::const_iterator i = mOwnerTaken.begin(); i != mOwnerTaken.end(); ++i) if ((*i)->GetCasterGUID() == attacker->GetGUID() && (*i)->IsAffectingSpell(spellProto)) AddPct(TakenTotalMod, (*i)->GetAmount()); @@ -11965,7 +11965,7 @@ bool InitTriggerAuraData() isTriggerAura[SPELL_AURA_RAID_PROC_FROM_CHARGE] = true; isTriggerAura[SPELL_AURA_RAID_PROC_FROM_CHARGE_WITH_VALUE] = true; isTriggerAura[SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE] = true; - isTriggerAura[SPELL_AURA_MOD_DAMAGE_FROM_CASTER] = true; + isTriggerAura[SPELL_AURA_MOD_SPELL_DAMAGE_FROM_CASTER] = true; isTriggerAura[SPELL_AURA_MOD_SPELL_CRIT_CHANCE] = true; isTriggerAura[SPELL_AURA_ABILITY_IGNORE_AURASTATE] = true; @@ -12323,7 +12323,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u if (procSpell && procSpell->Mechanic == uint32(triggeredByAura->GetMiscValue())) takeCharges = true; break; - case SPELL_AURA_MOD_DAMAGE_FROM_CASTER: + case SPELL_AURA_MOD_SPELL_DAMAGE_FROM_CASTER: // Compare casters if (triggeredByAura->GetCasterGUID() == target->GetGUID()) takeCharges = true; diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index a8370a4b40a..42d2ec72c8e 100644 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -328,7 +328,7 @@ enum AuraType SPELL_AURA_268 = 268, // old SPELL_AURA_MOD_ATTACK_POWER_OF_STAT_PERCENT. unused 4.3.4 SPELL_AURA_MOD_IGNORE_TARGET_RESIST = 269, SPELL_AURA_270 = 270, // old SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST, unused 4.3.4 - SPELL_AURA_MOD_DAMAGE_FROM_CASTER = 271, + SPELL_AURA_MOD_SPELL_DAMAGE_FROM_CASTER = 271, SPELL_AURA_IGNORE_MELEE_RESET = 272, SPELL_AURA_X_RAY = 273, SPELL_AURA_274 = 274, // old SPELL_AURA_ABILITY_CONSUME_NO_AMMO, unused 4.3.4 @@ -400,7 +400,7 @@ enum AuraType SPELL_AURA_MOD_RESURRECTED_HEALTH_BY_GUILD_MEMBER = 340, // Increases health gained when resurrected by a guild member by X SPELL_AURA_MOD_SPELL_CATEGORY_COOLDOWN = 341, // Modifies cooldown of all spells using affected category SPELL_AURA_MOD_MELEE_RANGED_HASTE_2 = 342, - SPELL_AURA_343 = 343, + SPELL_AURA_MOD_MELEE_DAMAGE_FROM_CASTER = 343, // NYI SPELL_AURA_MOD_AUTOATTACK_DAMAGE = 344, // NYI SPELL_AURA_BYPASS_ARMOR_FOR_CASTER = 345, SPELL_AURA_ENABLE_ALT_POWER = 346, // NYI @@ -431,7 +431,7 @@ enum AuraType SPELL_AURA_371 = 371, SPELL_AURA_372 = 372, SPELL_AURA_373 = 373, - SPELL_AURA_374 = 374, + SPELL_AURA_MODIFY_FALL_DAMAGE_PCT = 374, // NYI SPELL_AURA_375 = 375, SPELL_AURA_376 = 376, SPELL_AURA_377 = 377, @@ -440,12 +440,12 @@ enum AuraType SPELL_AURA_380 = 380, SPELL_AURA_381 = 381, SPELL_AURA_382 = 382, - SPELL_AURA_383 = 383, + SPELL_AURA_IGNORE_SPELL_COOLDOWN = 383, // NYI SPELL_AURA_384 = 384, - SPELL_AURA_385 = 385, + SPELL_AURA_CHANCE_OVERRIDE_AUTOATTACK_WITH_SPELL_ON_SELF= 385, // NYI (with triggered spell cast by the initial caster?) SPELL_AURA_386 = 386, SPELL_AURA_387 = 387, - SPELL_AURA_388 = 388, + SPELL_AURA_MOD_TAXI_FLIGHT_SPEED = 388, // NYI SPELL_AURA_389 = 389, SPELL_AURA_390 = 390, SPELL_AURA_391 = 391, @@ -464,11 +464,11 @@ enum AuraType SPELL_AURA_404 = 404, SPELL_AURA_405 = 405, SPELL_AURA_406 = 406, - SPELL_AURA_407 = 407, + SPELL_AURA_MOD_FEAR_2 = 407, // NYI SPELL_AURA_408 = 408, SPELL_AURA_409 = 409, SPELL_AURA_410 = 410, - SPELL_AURA_411 = 411, + SPELL_AURA_MOD_CHARGES = 411, // NYI SPELL_AURA_412 = 412, SPELL_AURA_413 = 413, SPELL_AURA_414 = 414, @@ -477,7 +477,7 @@ enum AuraType SPELL_AURA_417 = 417, SPELL_AURA_418 = 418, SPELL_AURA_419 = 419, - SPELL_AURA_420 = 420, + SPELL_AURA_MOD_BATTLE_PET_XP_PCT = 420, // NYI SPELL_AURA_421 = 421, SPELL_AURA_422 = 422, SPELL_AURA_423 = 423, diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index aa1c0744bea..fadc60b52e5 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -329,7 +329,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleUnused, //268 unused (4.3.4) old SPELL_AURA_MOD_ATTACK_POWER_OF_STAT_PERCENT. &AuraEffect::HandleNoImmediateEffect, //269 SPELL_AURA_MOD_IGNORE_TARGET_RESIST implemented in Unit::CalcAbsorbResist and CalcArmorReducedDamage &AuraEffect::HandleUnused, //270 unused (4.3.4) old SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST - &AuraEffect::HandleNoImmediateEffect, //271 SPELL_AURA_MOD_DAMAGE_FROM_CASTER implemented in Unit::SpellDamageBonus + &AuraEffect::HandleNoImmediateEffect, //271 SPELL_AURA_MOD_SPELL_DAMAGE_FROM_CASTER implemented in Unit::SpellDamageBonusTaken and Unit::MeleeDamageBonusTaken &AuraEffect::HandleNoImmediateEffect, //272 SPELL_AURA_IGNORE_MELEE_RESET &AuraEffect::HandleUnused, //273 clientside &AuraEffect::HandleUnused, //274 unused (4.3.4) @@ -401,7 +401,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //340 SPELL_AURA_MOD_RESURRECTED_HEALTH_BY_GUILD_MEMBER &AuraEffect::HandleNULL, //341 SPELL_AURA_MOD_SPELL_CATEGORY_COOLDOWN &AuraEffect::HandleModMeleeRangedSpeedPct, //342 SPELL_AURA_MOD_MELEE_RANGED_HASTE_2 - &AuraEffect::HandleNULL, //343 SPELL_AURA_343 + &AuraEffect::HandleNULL, //343 SPELL_AURA_MOD_MELEE_DAMAGE_FROM_CASTER &AuraEffect::HandleNULL, //344 SPELL_AURA_MOD_AUTOATTACK_DAMAGE &AuraEffect::HandleNoImmediateEffect, //345 SPELL_AURA_BYPASS_ARMOR_FOR_CASTER &AuraEffect::HandleEnableAltPower, //346 SPELL_AURA_ENABLE_ALT_POWER @@ -432,7 +432,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //371 &AuraEffect::HandleNULL, //372 &AuraEffect::HandleNULL, //373 - &AuraEffect::HandleNULL, //374 + &AuraEffect::HandleNULL, //374 SPELL_AURA_MODIFY_FALL_DAMAGE_PCT &AuraEffect::HandleNULL, //375 &AuraEffect::HandleNULL, //376 &AuraEffect::HandleNULL, //377 @@ -441,12 +441,12 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //380 &AuraEffect::HandleNULL, //381 &AuraEffect::HandleNULL, //382 - &AuraEffect::HandleNULL, //383 + &AuraEffect::HandleNULL, //383 SPELL_AURA_IGNORE_SPELL_COOLDOWN &AuraEffect::HandleNULL, //384 - &AuraEffect::HandleNULL, //385 + &AuraEffect::HandleNULL, //385 SPELL_AURA_CHANCE_OVERRIDE_AUTOATTACK_WITH_SPELL_ON_SELF &AuraEffect::HandleNULL, //386 &AuraEffect::HandleNULL, //387 - &AuraEffect::HandleNULL, //388 + &AuraEffect::HandleNULL, //388 SPELL_AURA_MOD_TAXI_FLIGHT_SPEED &AuraEffect::HandleNULL, //389 &AuraEffect::HandleNULL, //390 &AuraEffect::HandleNULL, //391 @@ -465,11 +465,11 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //404 &AuraEffect::HandleNULL, //405 &AuraEffect::HandleNULL, //406 - &AuraEffect::HandleNULL, //407 + &AuraEffect::HandleNULL, //407 SPELL_AURA_MOD_FEAR_2 &AuraEffect::HandleNULL, //408 &AuraEffect::HandleNULL, //409 &AuraEffect::HandleNULL, //410 - &AuraEffect::HandleNULL, //411 + &AuraEffect::HandleNULL, //411 SPELL_AURA_MOD_CHARGES &AuraEffect::HandleNULL, //412 &AuraEffect::HandleNULL, //413 &AuraEffect::HandleNULL, //414 @@ -478,7 +478,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //417 &AuraEffect::HandleNULL, //418 &AuraEffect::HandleNULL, //419 - &AuraEffect::HandleNULL, //420 + &AuraEffect::HandleNULL, //420 SPELL_AURA_MOD_BATTLE_PET_XP_PCT &AuraEffect::HandleNULL, //421 &AuraEffect::HandleNULL, //422 &AuraEffect::HandleNULL, //423 |