From 994793dd85c57b8f9e474b2bb27536a004aa8eee Mon Sep 17 00:00:00 2001 From: DiSlord Date: Mon, 26 Jan 2009 22:01:15 +0300 Subject: [PATCH] Remove not need code (implemented by another way) Signed-off-by: DiSlord --- src/game/SpellAuras.cpp | 49 ----------------------------------------------- src/game/SpellEffects.cpp | 32 ------------------------------- 2 files changed, 81 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index ab20fc96b..a9eb157e8 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -4092,40 +4092,6 @@ void Aura::HandleAuraPeriodicDummy(bool apply, bool Real) void Aura::HandlePeriodicHeal(bool apply, bool Real) { m_isPeriodic = apply; - - // For prevent double apply bonuses - bool loading = (m_target->GetTypeId() == TYPEID_PLAYER && ((Player*)m_target)->GetSession()->PlayerLoading()); - - if(!loading && apply) - { - switch (m_spellProto->SpellFamilyName) - { - case SPELLFAMILY_DRUID: - { - // Rejuvenation - if(m_spellProto->SpellFamilyFlags & 0x0000000000000010LL) - { - if(Unit* caster = GetCaster()) - { - Unit::AuraList const& classScripts = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(Unit::AuraList::const_iterator k = classScripts.begin(); k != classScripts.end(); ++k) - { - int32 tickcount = GetSpellDuration(m_spellProto) / m_spellProto->EffectAmplitude[m_effIndex]; - switch((*k)->GetModifier()->m_miscvalue) - { - case 4953: // Increased Rejuvenation Healing - Harold's Rejuvenating Broach Aura - case 4415: // Increased Rejuvenation Healing - Idol of Rejuvenation Aura - { - m_modifier.m_amount += (*k)->GetModifier()->m_amount / tickcount; - break; - } - } - } - } - } - } - } - } } void Aura::HandlePeriodicDamage(bool apply, bool Real) @@ -4284,21 +4250,6 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real) int32 holy = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) + caster->SpellBaseDamageBonusForVictim(GetSpellSchoolMask(m_spellProto), m_target); m_modifier.m_amount += int32(0.04f*holy + 0.04f*ap); - - // Improved Consecration - Libram of the Eternal Rest - Unit::AuraList const& classScripts = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(Unit::AuraList::const_iterator k = classScripts.begin(); k != classScripts.end(); ++k) - { - switch((*k)->GetModifier()->m_miscvalue) - { - case 5147: - { - int32 tickcount = GetSpellDuration(m_spellProto) / m_spellProto->EffectAmplitude[m_effIndex]; - m_modifier.m_amount += (*k)->GetModifier()->m_amount / tickcount; - break; - } - } - } return; } // Seal of Vengeance 0.013*$SPH+0.025*$AP per tick (also can stack) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 31578207d..e40373033 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -435,38 +435,6 @@ void Spell::EffectSchoolDMG(uint32 effect_idx) { damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.08f); } - // Starfire - else if ( m_spellInfo->SpellFamilyFlags & 0x0004LL ) - { - Unit::AuraList const& m_OverrideClassScript = m_caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(Unit::AuraList::const_iterator i = m_OverrideClassScript.begin(); i != m_OverrideClassScript.end(); ++i) - { - // Starfire Bonus (caster) - switch((*i)->GetModifier()->m_miscvalue) - { - case 5481: // Nordrassil Regalia - bonus - { - Unit::AuraList const& m_periodicDamageAuras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); - for(Unit::AuraList::const_iterator itr = m_periodicDamageAuras.begin(); itr != m_periodicDamageAuras.end(); ++itr) - { - // Moonfire or Insect Swarm (target debuff from any casters) - if ( (*itr)->GetSpellProto()->SpellFamilyFlags & 0x00200002LL ) - { - int32 mod = (*i)->GetModifier()->m_amount; - damage += damage*mod/100; - break; - } - } - break; - } - case 5148: //Improved Starfire - Ivory Idol of the Moongoddes Aura - { - damage += (*i)->GetModifier()->m_amount; - break; - } - } - } - } //Mangle Bonus for the initial damage of Lacerate and Rake if((m_spellInfo->SpellFamilyFlags==0x0000000000001000LL && m_spellInfo->SpellIconID==494) || (m_spellInfo->SpellFamilyFlags==0x0000010000000000LL && m_spellInfo->SpellIconID==2246)) -- 2.11.4.GIT