Scripts/Spells: fixed Beacon of Light
This commit is contained in:
1 parent
2e595543bb
commit
6b3468f48a
5 files changed
+122
-71
No files matched your search
@@ -157,6 +157,28 @@ ProcEventInfo::ProcEventInfo(Unit* actor, Unit* actionTarget, Unit* procTarget,
|
||||
_damageInfo(damageInfo), _healInfo(healInfo)
|
||||
{ }
|
||||
|
||||
SpellInfo const* ProcEventInfo::GetSpellInfo() const
|
||||
{
|
||||
if (_spell)
|
||||
return _spell->GetSpellInfo();
|
||||
if (_damageInfo)
|
||||
return _damageInfo->GetSpellInfo();
|
||||
if (_healInfo)
|
||||
return _healInfo->GetSpellInfo();
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
SpellSchoolMask ProcEventInfo::GetSchoolMask() const
|
||||
{
|
||||
if (_spell)
|
||||
return _spell->GetSpellInfo()->GetSchoolMask();
|
||||
if (_damageInfo)
|
||||
return _damageInfo->GetSchoolMask();
|
||||
if (_healInfo)
|
||||
return _healInfo->GetSchoolMask();
|
||||
return SPELL_SCHOOL_MASK_NONE;
|
||||
}
|
||||
|
||||
Unit::Unit(bool isWorldObject) :
|
||||
WorldObject(isWorldObject), m_movedPlayer(NULL), m_lastSanctuaryTime(0),
|
||||
IsAIEnabled(false), NeedChangeAI(false), LastCharmerGUID(),
|
||||
@@ -6365,54 +6387,6 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
}
|
||||
case SPELLFAMILY_PALADIN:
|
||||
{
|
||||
// Light's Beacon - Beacon of Light
|
||||
if (dummySpell->Id == 53651)
|
||||
{
|
||||
if (!victim || !procSpell)
|
||||
return false;
|
||||
triggered_spell_id = 0;
|
||||
Unit* beaconTarget = NULL;
|
||||
if (GetTypeId() != TYPEID_PLAYER)
|
||||
{
|
||||
beaconTarget = triggeredByAura->GetBase()->GetCaster();
|
||||
if (!beaconTarget || beaconTarget == this || !(beaconTarget->GetAura(53563, victim->GetGUID())))
|
||||
return false;
|
||||
basepoints0 = int32(damage);
|
||||
triggered_spell_id = procSpell->IsRankOf(sSpellMgr->GetSpellInfo(635)) ? 53652 : 53654;
|
||||
}
|
||||
else
|
||||
{ // Check Party/Raid Group
|
||||
if (Group* group = ToPlayer()->GetGroup())
|
||||
{
|
||||
for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
|
||||
{
|
||||
if (Player* member = itr->GetSource())
|
||||
{
|
||||
// check if it was heal by paladin which cast this beacon of light
|
||||
if (member->GetAura(53563, victim->GetGUID()))
|
||||
{
|
||||
// do not proc when target of beacon of light is healed
|
||||
if (member == this)
|
||||
return false;
|
||||
|
||||
beaconTarget = member;
|
||||
basepoints0 = int32(damage);
|
||||
triggered_spell_id = procSpell->IsRankOf(sSpellMgr->GetSpellInfo(635)) ? 53652 : 53654;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (triggered_spell_id && beaconTarget)
|
||||
{
|
||||
victim->CastCustomSpell(beaconTarget, triggered_spell_id, &basepoints0, NULL, NULL, true);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
// Judgements of the Wise
|
||||
if (dummySpell->SpellIconID == 3017)
|
||||
{
|
||||
@@ -14187,8 +14161,8 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
|
||||
Unit* actionTarget = !isVictim ? target : this;
|
||||
|
||||
DamageInfo damageInfo = DamageInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL, SPELL_DIRECT_DAMAGE);
|
||||
HealInfo healInfo = HealInfo(damage);
|
||||
ProcEventInfo eventInfo = ProcEventInfo(actor, actionTarget, target, procFlag, 0, 0, procExtra, NULL, &damageInfo, &healInfo);
|
||||
HealInfo healInfo = HealInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL);
|
||||
ProcEventInfo eventInfo = ProcEventInfo(actor, actionTarget, target, procFlag, 0, 0, procExtra, nullptr, &damageInfo, &healInfo);
|
||||
|
||||
ProcTriggeredList procTriggered;
|
||||
// Fill procTriggered list
|
||||
|
||||
Reference in new issue
Block a user