Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Fixed TARGET_UNIT_AREA_THREAT_LIST and TARGET_UNIT_AREA_TAP_LIST

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/66abcaff14a6d55380b612d1c1b9c2cee3c004ae)
This commit is contained in:
Hondacrx
2024-08-05 17:29:40 -04:00
parent 5a9714a375
commit 8c392b77dd
3 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Spells/SpellConst.cs
+1 -3
View File
@@ -2903,9 +2903,7 @@ namespace Framework.Constants
Raid,
RaidClass,
Passenger,
Summoned,
Threat,
Tap
Summoned
}
public enum SpellTargetDirectionTypes
Source/Game/Spells/Spell.cs
+35 -10
View File
@@ -6,6 +6,7 @@ using Framework.Dynamic;
using Game.AI;
using Game.BattleFields;
using Game.BattleGrounds;
using Game.Combat;
using Game.Conditions;
using Game.DataStorage;
using Game.Entities;
@@ -889,6 +890,7 @@ namespace Game.Spells
switch (targetType.GetTarget())
{
case Targets.UnitCasterAndPassengers:
{
targets.Add(m_caster);
Unit unit = m_caster.ToUnit();
if (unit != null)
@@ -903,7 +905,9 @@ namespace Game.Spells
}
}
break;
}
case Targets.UnitTargetAllyOrRaid:
{
Unit targetedUnit = m_targets.GetUnitTarget();
if (targetedUnit != null)
{
@@ -913,10 +917,41 @@ namespace Game.Spells
SearchAreaTargets(targets, spellEffectInfo, radius, targetedUnit, referer, targetType.GetObjectType(), targetType.GetCheckType(), spellEffectInfo.ImplicitTargetConditions, WorldObjectSpellAreaTargetSearchReason.Area);
}
break;
}
case Targets.UnitCasterAndSummons:
{
targets.Add(m_caster);
SearchAreaTargets(targets, spellEffectInfo, radius, center, referer, targetType.GetObjectType(), targetType.GetCheckType(), spellEffectInfo.ImplicitTargetConditions, WorldObjectSpellAreaTargetSearchReason.Area);
break;
}
case Targets.UnitAreaThreatList:
{
Unit unit = m_caster.ToUnit();
if (unit != null)
{
foreach (ThreatReference threatRef in unit.GetThreatManager().GetSortedThreatList())
{
Unit threateningUnit = threatRef.GetVictim();
if (threateningUnit != null)
targets.Add(threateningUnit);
}
}
break;
}
case Targets.UnitAreaTapList:
{
Creature creature = m_caster.ToCreature();
if (creature != null)
{
foreach (ObjectGuid tapperGuid in creature.GetTapList())
{
Player tapper = Global.ObjAccessor.GetPlayer(m_caster, tapperGuid);
if (tapper != null)
targets.Add(tapper);
}
}
break;
}
default:
SearchAreaTargets(targets, spellEffectInfo, radius, center, referer, targetType.GetObjectType(), targetType.GetCheckType(), spellEffectInfo.ImplicitTargetConditions, WorldObjectSpellAreaTargetSearchReason.Area);
break;
@@ -9112,16 +9147,6 @@ namespace Game.Spells
if (unitTarget.ToTempSummon().GetSummonerGUID() != _caster.GetGUID())
return false;
break;
case SpellTargetCheckTypes.Threat:
if (!_referer.IsUnit() || _referer.ToUnit().GetThreatManager().GetThreat(unitTarget, true) <= 0.0f)
return false;
break;
case SpellTargetCheckTypes.Tap:
if (_referer.GetTypeId() != TypeId.Unit || unitTarget.GetTypeId() != TypeId.Player)
return false;
if (!_referer.ToCreature().IsTappedBy(unitTarget.ToPlayer()))
return false;
break;
default:
break;
}
Source/Game/Spells/SpellInfo.cs
+2 -2
View File
@@ -5099,8 +5099,8 @@ namespace Game.Spells
new StaticData(SpellTargetObjectTypes.Corpse, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Raid, SpellTargetDirectionTypes.None), // 119 TARGET_CORPSE_SRC_AREA_RAID
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Summoned, SpellTargetDirectionTypes.None), // 120 TARGET_UNIT_SELF_AND_SUMMONS
new StaticData(SpellTargetObjectTypes.Corpse, SpellTargetReferenceTypes.Target, SpellTargetSelectionCategories.Default, SpellTargetCheckTypes.Ally, SpellTargetDirectionTypes.None), // 121 TARGET_CORPSE_TARGET_ALLY
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Threat, SpellTargetDirectionTypes.None), // 122 TARGET_UNIT_AREA_THREAT_LIST
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Tap, SpellTargetDirectionTypes.None), // 123 TARGET_UNIT_AREA_TAP_LIST
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 122 TARGET_UNIT_AREA_THREAT_LIST
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 123 TARGET_UNIT_AREA_TAP_LIST
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Default, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 124 TARGET_UNIT_TARGET_TAP_LIST
new StaticData(SpellTargetObjectTypes.Dest, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Default, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 125 TARGET_DEST_CASTER_GROUND_2
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 126 TARGET_UNIT_CASTER_AREA_ENEMY_CLUMP