*Update to Mangos 7083.
--HG-- branch : trunk
This commit is contained in:
1 parent
78e92e9023
commit
83e7f653fe
16 files changed
+698
-147
No files matched your search
+79
-31
@@ -1285,17 +1285,6 @@ void Unit::DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss)
|
||||
return;
|
||||
}
|
||||
|
||||
// update at damage Judgement aura duration that applied by attacker at victim
|
||||
if(damageInfo->damage && spellProto->Id == 35395)
|
||||
{
|
||||
AuraMap& vAuras = pVictim->GetAuras();
|
||||
for(AuraMap::iterator itr = vAuras.begin(); itr != vAuras.end(); ++itr)
|
||||
{
|
||||
SpellEntry const *spellInfo = (*itr).second->GetSpellProto();
|
||||
if( spellInfo->AttributesEx3 & 0x40000 && spellInfo->SpellFamilyName == SPELLFAMILY_PALADIN && ((*itr).second->GetCasterGUID() == GetGUID()))
|
||||
(*itr).second->RefreshAura();
|
||||
}
|
||||
}
|
||||
// Call default DealDamage
|
||||
CleanDamage cleanDamage(damageInfo->cleanDamage, BASE_ATTACK, MELEE_HIT_NORMAL);
|
||||
DealDamage(pVictim, damageInfo->damage, &cleanDamage, SPELL_DIRECT_DAMAGE, SpellSchoolMask(damageInfo->schoolMask), spellProto, durabilityLoss);
|
||||
@@ -4882,6 +4871,30 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
||||
target = this;
|
||||
break;
|
||||
}
|
||||
// Divine purpose
|
||||
case 31871:
|
||||
case 31872:
|
||||
{
|
||||
// Roll chane
|
||||
if (!roll_chance_i(triggeredByAura->GetModifier()->m_amount))
|
||||
return false;
|
||||
|
||||
// Remove any stun effect on target
|
||||
AuraMap& Auras = pVictim->GetAuras();
|
||||
for(AuraMap::iterator iter = Auras.begin(); iter != Auras.end();)
|
||||
{
|
||||
SpellEntry const *spell = iter->second->GetSpellProto();
|
||||
if( spell->Mechanic == MECHANIC_STUN ||
|
||||
spell->EffectMechanic[iter->second->GetEffIndex()] == MECHANIC_STUN)
|
||||
{
|
||||
pVictim->RemoveAurasDueToSpell(spell->Id);
|
||||
iter = Auras.begin();
|
||||
}
|
||||
else
|
||||
++iter;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -5384,29 +5397,30 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
||||
basepoints0 = GetAttackTime(BASE_ATTACK) * int32(ap*0.022f + 0.044f * holy) / 1000;
|
||||
break;
|
||||
}
|
||||
// Seal of Blood do damage trigger
|
||||
if(dummySpell->SpellFamilyFlags & 0x0000040000000000LL)
|
||||
{
|
||||
switch(triggeredByAura->GetEffIndex())
|
||||
{
|
||||
case 0:
|
||||
triggered_spell_id = 31893;
|
||||
break;
|
||||
case 1:
|
||||
{
|
||||
// damage
|
||||
damage += CalculateDamage(BASE_ATTACK, false) * 35 / 100; // add spell damage from prev effect (35%)
|
||||
basepoints0 = triggeredByAura->GetModifier()->m_amount * damage / 100;
|
||||
|
||||
target = this;
|
||||
triggered_spell_id = 32221;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
switch(dummySpell->Id)
|
||||
{
|
||||
// Judgement of Light
|
||||
case 20185:
|
||||
{
|
||||
// Get judgement caster
|
||||
Unit *caster = triggeredByAura->GetCaster();
|
||||
if (!caster)
|
||||
return false;
|
||||
float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK);
|
||||
int32 holy = caster->SpellBaseDamageBonus(SPELL_SCHOOL_MASK_HOLY) +
|
||||
caster->SpellBaseDamageBonusForVictim(SPELL_SCHOOL_MASK_HOLY, this);
|
||||
basepoints0 = int32(ap*0.10f + 0.10f*holy);
|
||||
pVictim->CastCustomSpell(pVictim, 20267, &basepoints0, 0, 0, true, 0, triggeredByAura);
|
||||
return true;
|
||||
}
|
||||
// Judgement of Wisdom
|
||||
case 20186:
|
||||
{
|
||||
if (pVictim->getPowerType() == POWER_MANA)
|
||||
pVictim->CastSpell(pVictim, 20268, true, 0, triggeredByAura);
|
||||
return true;
|
||||
}
|
||||
// Holy Power (Redemption Armor set)
|
||||
case 28789:
|
||||
{
|
||||
@@ -5461,6 +5475,40 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
||||
triggered_spell_id = 31786;
|
||||
break;
|
||||
}
|
||||
// Seal of Blood do damage trigger
|
||||
case 31892:
|
||||
{
|
||||
if (triggeredByAura->GetEffIndex() == 0) // 0 effect - is proc on enemy
|
||||
triggered_spell_id = 31893;
|
||||
else if (triggeredByAura->GetEffIndex() == 1) // 1 effect - is proc on self
|
||||
{
|
||||
// add spell damage from prev effect (27%)
|
||||
damage += CalculateDamage(BASE_ATTACK, false) * 27 / 100;
|
||||
basepoints0 = triggeredByAura->GetModifier()->m_amount * damage / 100;
|
||||
target = this;
|
||||
triggered_spell_id = 32221;
|
||||
}
|
||||
else
|
||||
return true;
|
||||
break;
|
||||
}
|
||||
// Seal of the Martyr do damage trigger
|
||||
case 53720:
|
||||
{
|
||||
if (triggeredByAura->GetEffIndex() == 0) // 0 effect - is proc on enemy
|
||||
triggered_spell_id = 53719;
|
||||
else if (triggeredByAura->GetEffIndex() == 1) // 1 effect - is proc on self
|
||||
{
|
||||
// add spell damage from prev effect (27%)
|
||||
damage += CalculateDamage(BASE_ATTACK, false) * 27 / 100;
|
||||
basepoints0 = triggeredByAura->GetModifier()->m_amount * damage / 100;
|
||||
target = this;
|
||||
triggered_spell_id = 53718;
|
||||
}
|
||||
else
|
||||
return true;
|
||||
break;
|
||||
}
|
||||
// Paladin Tier 6 Trinket (Ashtongue Talisman of Zeal)
|
||||
case 40470:
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user