Core/Spells: implement TARGET_CORPSE_SRC_AREA_RAID and updated remaining resurrection effect handlers for updated corpse targeting
This commit is contained in:
1 parent
df193945d9
commit
98b075cb4b
4 files changed
+52
-35
No files matched your search
@@ -1872,6 +1872,12 @@ uint32 Spell::GetSearcherTypeMask(SpellTargetObjectTypes objType, ConditionConta
|
||||
{
|
||||
case TARGET_OBJECT_TYPE_UNIT:
|
||||
case TARGET_OBJECT_TYPE_UNIT_AND_DEST:
|
||||
if (!m_spellInfo->HasAttribute(SPELL_ATTR2_CAN_TARGET_DEAD))
|
||||
{
|
||||
retMask &= GRID_MAP_TYPE_MASK_PLAYER | GRID_MAP_TYPE_MASK_CREATURE;
|
||||
break;
|
||||
}
|
||||
// No break here
|
||||
case TARGET_OBJECT_TYPE_CORPSE:
|
||||
case TARGET_OBJECT_TYPE_CORPSE_ENEMY:
|
||||
case TARGET_OBJECT_TYPE_CORPSE_ALLY:
|
||||
@@ -1884,8 +1890,7 @@ uint32 Spell::GetSearcherTypeMask(SpellTargetObjectTypes objType, ConditionConta
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (!m_spellInfo->HasAttribute(SPELL_ATTR2_CAN_TARGET_DEAD))
|
||||
retMask &= ~GRID_MAP_TYPE_MASK_CORPSE;
|
||||
|
||||
if (m_spellInfo->HasAttribute(SPELL_ATTR3_ONLY_TARGET_PLAYERS))
|
||||
retMask &= GRID_MAP_TYPE_MASK_CORPSE | GRID_MAP_TYPE_MASK_PLAYER;
|
||||
if (m_spellInfo->HasAttribute(SPELL_ATTR3_ONLY_TARGET_GHOSTS))
|
||||
@@ -8213,19 +8218,19 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target)
|
||||
case TARGET_CHECK_ENEMY:
|
||||
if (unitTarget->IsTotem())
|
||||
return false;
|
||||
if (!_caster->_IsValidAttackTarget(unitTarget, _spellInfo))
|
||||
if (!target->IsCorpse() && !_caster->_IsValidAttackTarget(unitTarget, _spellInfo))
|
||||
return false;
|
||||
break;
|
||||
case TARGET_CHECK_ALLY:
|
||||
if (unitTarget->IsTotem())
|
||||
return false;
|
||||
if (!_caster->_IsValidAssistTarget(unitTarget, _spellInfo))
|
||||
if (!target->IsCorpse() && !_caster->_IsValidAssistTarget(unitTarget, _spellInfo))
|
||||
return false;
|
||||
break;
|
||||
case TARGET_CHECK_PARTY:
|
||||
if (unitTarget->IsTotem())
|
||||
return false;
|
||||
if (!_caster->_IsValidAssistTarget(unitTarget, _spellInfo))
|
||||
if (!target->IsCorpse() && !_caster->_IsValidAssistTarget(unitTarget, _spellInfo))
|
||||
return false;
|
||||
if (!_referer->IsInPartyWith(unitTarget))
|
||||
return false;
|
||||
@@ -8237,7 +8242,7 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target)
|
||||
case TARGET_CHECK_RAID:
|
||||
if (unitTarget->IsTotem())
|
||||
return false;
|
||||
if (!_caster->_IsValidAssistTarget(unitTarget, _spellInfo))
|
||||
if (!target->IsCorpse() && !_caster->_IsValidAssistTarget(unitTarget, _spellInfo))
|
||||
return false;
|
||||
if (!_referer->IsInRaidWith(unitTarget))
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user