Core/Spells: Implemented target 116 TARGET_UNIT_AND_DEST_LAST_ENEMY
Port From (https://github.com/TrinityCore/TrinityCore/commit/115409f353141dc8cf49a91699e9593b1bf04385)
This commit is contained in:
@@ -2690,7 +2690,7 @@ namespace Framework.Constants
|
|||||||
Unk113 = 113,
|
Unk113 = 113,
|
||||||
Unk114 = 114,
|
Unk114 = 114,
|
||||||
Unk115 = 115,
|
Unk115 = 115,
|
||||||
Unk116 = 116,
|
UnitAndDestLastEnemy = 116,
|
||||||
Unk117 = 117,
|
Unk117 = 117,
|
||||||
UnitTargetAllyOrRaid = 118, // If target is in your party or raid, all party and raid members will be affected
|
UnitTargetAllyOrRaid = 118, // If target is in your party or raid, all party and raid members will be affected
|
||||||
CorpseSrcAreaRaid = 119,
|
CorpseSrcAreaRaid = 119,
|
||||||
|
|||||||
@@ -287,9 +287,12 @@ namespace Game.Scripting
|
|||||||
case SpellTargetSelectionCategories.Nearby: // BOTH
|
case SpellTargetSelectionCategories.Nearby: // BOTH
|
||||||
return true;
|
return true;
|
||||||
case SpellTargetSelectionCategories.Cone: // AREA
|
case SpellTargetSelectionCategories.Cone: // AREA
|
||||||
case SpellTargetSelectionCategories.Area: // AREA
|
|
||||||
case SpellTargetSelectionCategories.Line: // AREA
|
case SpellTargetSelectionCategories.Line: // AREA
|
||||||
return _area;
|
return _area;
|
||||||
|
case SpellTargetSelectionCategories.Area: // AREA
|
||||||
|
if (targetInfo.GetObjectType() == SpellTargetObjectTypes.UnitAndDest)
|
||||||
|
return _area || _dest;
|
||||||
|
return _area;
|
||||||
case SpellTargetSelectionCategories.Default:
|
case SpellTargetSelectionCategories.Default:
|
||||||
switch (targetInfo.GetObjectType())
|
switch (targetInfo.GetObjectType())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -720,6 +720,8 @@ namespace Game.Spells
|
|||||||
break;
|
break;
|
||||||
case SpellTargetReferenceTypes.Last:
|
case SpellTargetReferenceTypes.Last:
|
||||||
{
|
{
|
||||||
|
referer = m_caster;
|
||||||
|
|
||||||
// find last added target for this effect
|
// find last added target for this effect
|
||||||
foreach (var target in m_UniqueTargetInfo)
|
foreach (var target in m_UniqueTargetInfo)
|
||||||
{
|
{
|
||||||
@@ -795,6 +797,15 @@ namespace Game.Spells
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (targetType.GetObjectType() == SpellTargetObjectTypes.UnitAndDest)
|
||||||
|
{
|
||||||
|
SpellDestination dest = new(referer);
|
||||||
|
|
||||||
|
CallScriptDestinationTargetSelectHandlers(ref dest, spellEffectInfo.EffectIndex, targetType);
|
||||||
|
|
||||||
|
m_targets.ModDst(dest);
|
||||||
|
}
|
||||||
|
|
||||||
CallScriptObjectAreaTargetSelectHandlers(targets, spellEffectInfo.EffectIndex, targetType);
|
CallScriptObjectAreaTargetSelectHandlers(targets, spellEffectInfo.EffectIndex, targetType);
|
||||||
|
|
||||||
if (!targets.Empty())
|
if (!targets.Empty())
|
||||||
|
|||||||
@@ -5039,7 +5039,7 @@ namespace Game.Spells
|
|||||||
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 113
|
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 113
|
||||||
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 114
|
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 114
|
||||||
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 115
|
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 115
|
||||||
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 116
|
new StaticData(SpellTargetObjectTypes.UnitAndDest, SpellTargetReferenceTypes.Last, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Enemy, SpellTargetDirectionTypes.None), // 116 TARGET_UNIT_AND_DEST_LAST_ENEMY
|
||||||
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 117
|
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 117
|
||||||
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Raid, SpellTargetDirectionTypes.None), // 118 TARGET_UNIT_TARGET_ALLY_OR_RAID
|
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Raid, SpellTargetDirectionTypes.None), // 118 TARGET_UNIT_TARGET_ALLY_OR_RAID
|
||||||
new StaticData(SpellTargetObjectTypes.Corpse, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Raid, SpellTargetDirectionTypes.None), // 119 TARGET_CORPSE_SRC_AREA_RAID
|
new StaticData(SpellTargetObjectTypes.Corpse, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Raid, SpellTargetDirectionTypes.None), // 119 TARGET_CORPSE_SRC_AREA_RAID
|
||||||
|
|||||||
Reference in New Issue
Block a user