*Update to Mangos 7190.
--HG-- branch : trunk
This commit is contained in:
1 parent
6349c86f52
commit
c5de7cccb8
11 files changed
+352
-341
No files matched your search
+29
-35
@@ -474,38 +474,6 @@ void Spell::SpellDamageSchoolDmg(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))
|
||||
@@ -1360,6 +1328,15 @@ void Spell::EffectDummy(uint32 i)
|
||||
m_caster->SetPower(POWER_RAGE,0);
|
||||
return;
|
||||
}
|
||||
// Slam
|
||||
if(m_spellInfo->SpellFamilyFlags & 0x0000000000200000LL)
|
||||
{
|
||||
if(!unitTarget)
|
||||
return;
|
||||
m_damage+=m_caster->CalculateDamage(m_attackType, false);
|
||||
m_damage+=damage;
|
||||
return;
|
||||
}
|
||||
switch(m_spellInfo->Id)
|
||||
{
|
||||
// Warrior's Wrath
|
||||
@@ -1792,12 +1769,29 @@ void Spell::EffectDummy(uint32 i)
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if(m_spellInfo->Id == 39610) // Mana-Tide Totem effect
|
||||
// Healing Stream Totem
|
||||
if(m_spellInfo->SpellFamilyFlags & 0x0000000000002000LL)
|
||||
{
|
||||
m_caster->CastCustomSpell(unitTarget, 52042, &damage, 0, 0, true, 0, 0, m_originalCasterGUID);
|
||||
return;
|
||||
}
|
||||
// Mana Spring Totem
|
||||
if(m_spellInfo->SpellFamilyFlags & 0x0000000000004000LL)
|
||||
{
|
||||
if(unitTarget->getPowerType()!=POWER_MANA)
|
||||
return;
|
||||
m_caster->CastCustomSpell(unitTarget, 52032, &damage, 0, 0, true, 0, 0, m_originalCasterGUID);
|
||||
return;
|
||||
}
|
||||
if(m_spellInfo->Id == 39610) // Mana Tide Totem effect
|
||||
{
|
||||
if(!unitTarget || unitTarget->getPowerType() != POWER_MANA)
|
||||
return;
|
||||
|
||||
// Glyph of Mana Tide
|
||||
Unit *owner = m_caster->GetOwner();
|
||||
if (owner)
|
||||
if (Aura *dummy = owner->GetDummyAura(55441))
|
||||
damage+=dummy->GetModifier()->m_amount;
|
||||
// Regenerate 6% of Total Mana Every 3 secs
|
||||
int32 EffectBasePoints0 = unitTarget->GetMaxPower(POWER_MANA) * damage / 100;
|
||||
m_caster->CastCustomSpell(unitTarget,39609,&EffectBasePoints0,NULL,NULL,true,NULL,NULL,m_originalCasterGUID);
|
||||
|
||||
Reference in new issue
Block a user