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

Core/Spells: Implemented target 105 TARGET_UNIT_CASTER_AND_PASSENGERS

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/bbdb70ed57887465f5e06a131c8326b71743950c)
This commit is contained in:
hondacrx
2022-02-16 13:17:28 -05:00
parent 5c6a175dc1
commit 393cd1e6d0
3 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Spells/SpellConst.cs
+1 -1
View File
@@ -2679,7 +2679,7 @@ namespace Framework.Constants
UnitPassenger6 = 102, UnitPassenger6 = 102,
UnitPassenger7 = 103, UnitPassenger7 = 103,
UnitConeCasterToDestEnemy = 104, UnitConeCasterToDestEnemy = 104,
UnitUnk105 = 105, // 1 Spell UnitCasterAndPassengers = 105,
DestChannelCaster = 106, DestChannelCaster = 106,
UnkDestAreaUnk107 = 107, // Not Enough Info - Only Generic Spells Avalible UnkDestAreaUnk107 = 107, // Not Enough Info - Only Generic Spells Avalible
GameobjectCone_108 = 108, GameobjectCone_108 = 108,
Source/Game/Spells/Spell.cs
+21 -34
View File
@@ -745,58 +745,45 @@ namespace Game.Spells
Cypher.Assert(false, "Spell.SelectImplicitAreaTargets: received not implemented target reference type"); Cypher.Assert(false, "Spell.SelectImplicitAreaTargets: received not implemented target reference type");
return; return;
} }
List<WorldObject> targets = new();
float radius = spellEffectInfo.CalcRadius(m_caster) * m_spellValue.RadiusMod;
List<WorldObject> targets = new();
switch (targetType.GetTarget()) switch (targetType.GetTarget())
{ {
case Targets.UnitCasterAndPassengers:
targets.Add(m_caster);
Unit unit = m_caster.ToUnit();
if (unit != null)
{
Vehicle vehicleKit = unit.GetVehicleKit();
if (vehicleKit != null)
for (sbyte seat = 0; seat < SharedConst.MaxVehicleSeats; ++seat)
{
Unit passenger = vehicleKit.GetPassenger(seat);
if (passenger != null)
targets.Add(passenger);
}
}
break;
case Targets.UnitTargetAllyOrRaid: case Targets.UnitTargetAllyOrRaid:
Unit targetedUnit = m_targets.GetUnitTarget(); Unit targetedUnit = m_targets.GetUnitTarget();
if (targetedUnit != null) if (targetedUnit != null)
{ {
if (!m_caster.IsUnit() || !m_caster.ToUnit().IsInRaidWith(targetedUnit)) if (!m_caster.IsUnit() || !m_caster.ToUnit().IsInRaidWith(targetedUnit))
{
targets.Add(m_targets.GetUnitTarget()); targets.Add(m_targets.GetUnitTarget());
else
CallScriptObjectAreaTargetSelectHandlers(targets, spellEffectInfo.EffectIndex, targetType); SearchAreaTargets(targets, radius, targetedUnit, referer, targetType.GetObjectType(), targetType.GetCheckType(), spellEffectInfo.ImplicitTargetConditions);
if (!targets.Empty())
{
// Other special target selection goes here
uint maxTargets = m_spellValue.MaxAffectedTargets;
if (maxTargets != 0)
targets.RandomResize(maxTargets);
foreach (WorldObject target in targets)
{
Unit unit = target.ToUnit();
if (unit != null)
AddUnitTarget(unit, effMask, false, true, center);
else
{
GameObject gObjTarget = target.ToGameObject();
if (gObjTarget != null)
AddGOTarget(gObjTarget, effMask);
}
}
}
return;
}
center = targetedUnit;
} }
break; break;
case Targets.UnitCasterAndSummons: case Targets.UnitCasterAndSummons:
targets.Add(m_caster); targets.Add(m_caster);
SearchAreaTargets(targets, radius, center, referer, targetType.GetObjectType(), targetType.GetCheckType(), spellEffectInfo.ImplicitTargetConditions);
break; break;
default: default:
SearchAreaTargets(targets, radius, center, referer, targetType.GetObjectType(), targetType.GetCheckType(), spellEffectInfo.ImplicitTargetConditions);
break; break;
} }
float radius = spellEffectInfo.CalcRadius(m_caster) * m_spellValue.RadiusMod;
SearchAreaTargets(targets, radius, center, referer, targetType.GetObjectType(), targetType.GetCheckType(), spellEffectInfo.ImplicitTargetConditions);
CallScriptObjectAreaTargetSelectHandlers(targets, spellEffectInfo.EffectIndex, targetType); CallScriptObjectAreaTargetSelectHandlers(targets, spellEffectInfo.EffectIndex, targetType);
if (!targets.Empty()) if (!targets.Empty())
Source/Game/Spells/SpellInfo.cs
+1 -1
View File
@@ -5028,7 +5028,7 @@ namespace Game.Spells
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Default, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 102 TARGET_UNIT_PASSENGER_6 new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Default, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 102 TARGET_UNIT_PASSENGER_6
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Default, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 103 TARGET_UNIT_PASSENGER_7 new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Default, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 103 TARGET_UNIT_PASSENGER_7
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Dest, SpellTargetSelectionCategories.Cone, SpellTargetCheckTypes.Enemy, SpellTargetDirectionTypes.Front), // 104 TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Dest, SpellTargetSelectionCategories.Cone, SpellTargetCheckTypes.Enemy, SpellTargetDirectionTypes.Front), // 104 TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY
new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 105 TARGET_UNIT_UNK_105 new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Area, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 105 TARGET_UNIT_CASTER_AND_PASSENGERS
new StaticData(SpellTargetObjectTypes.Dest, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Channel, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 106 TARGET_DEST_CHANNEL_CASTER new StaticData(SpellTargetObjectTypes.Dest, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Channel, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 106 TARGET_DEST_CHANNEL_CASTER
new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.Dest, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 107 TARGET_UNK_DEST_AREA_UNK_107 new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.Dest, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 107 TARGET_UNK_DEST_AREA_UNK_107
new StaticData(SpellTargetObjectTypes.Gobj, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Cone, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.Front), // 108 TARGET_GAMEOBJECT_CONE_108 new StaticData(SpellTargetObjectTypes.Gobj, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Cone, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.Front), // 108 TARGET_GAMEOBJECT_CONE_108