josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Move Glyph of Smite code to a better location.

Browse Source 
Signed-off-by: Shauren <[email protected]>
This commit is contained in:
johnholiver
2011-01-28 11:22:52 +01:00
committed by Shauren
parent 2df58e5d8f
commit ce4aca9011
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+9
View File
@@ -10159,6 +10159,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
} }
break; break;
case SPELLFAMILY_PRIEST: case SPELLFAMILY_PRIEST:
// Mind Flay
if (spellProto->SpellFamilyFlags[0] & 0x800000) if (spellProto->SpellFamilyFlags[0] & 0x800000)
{ {
// Glyph of Shadow Word: Pain // Glyph of Shadow Word: Pain
@@ -10173,6 +10174,14 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID())) if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID()))
AddPctN(DoneTotalMod, aurEff->GetAmount()); AddPctN(DoneTotalMod, aurEff->GetAmount());
} }
// Smite
else if (spellProto->SpellFamilyFlags[0] & 0x80)
{
// Glyph of Smite
if (AuraEffect * aurEff = GetAuraEffect(55692, 0))
if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x100000, 0, 0, GetGUID()))
AddPctN(DoneTotalMod, aurEff->GetAmount());
}
break; break;
case SPELLFAMILY_PALADIN: case SPELLFAMILY_PALADIN:
// Judgement of Vengeance/Judgement of Corruption // Judgement of Vengeance/Judgement of Corruption
src/server/game/Spells/SpellEffects.cpp
-8
View File
@@ -582,14 +582,6 @@ void Spell::SpellDamageSchoolDmg(SpellEffIndex effIndex)
if (roll_chance_i(aurEff->GetAmount())) if (roll_chance_i(aurEff->GetAmount()))
m_caster->CastSpell(unitTarget, 48301, true); m_caster->CastSpell(unitTarget, 48301, true);
} }
// Smite
else if (m_spellInfo->SpellFamilyFlags[0] & 0x80)
{
// Glyph of Smite
if (AuraEffect * aurEff = m_caster->GetAuraEffect(55692, 0))
if (unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x100000, 0, 0, m_caster->GetGUID()))
AddPctN(damage, aurEff->GetAmount());
}
// Improved Mind Blast (Mind Blast in shadow form bonus) // Improved Mind Blast (Mind Blast in shadow form bonus)
else if (m_caster->GetShapeshiftForm() == FORM_SHADOW && (m_spellInfo->SpellFamilyFlags[0] & 0x00002000)) else if (m_caster->GetShapeshiftForm() == FORM_SHADOW && (m_spellInfo->SpellFamilyFlags[0] & 0x00002000))
{ {