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

Core/AI: Actually accurately reproduce the logic from before 8499434 that determines what summons start following on appearance. Third time's the charm?

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/c9d52c954793404af02f75af97390d7c82c433ff)
This commit is contained in:
hondacrx
2021-12-24 20:55:55 -05:00
parent 3126ac721d
commit 5a7d42530e
1 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/CoreAI/CreatureAI.cs
+44 -16
View File
@@ -18,6 +18,7 @@
using Framework.Constants;
using Framework.Dynamic;
using Game.Combat;
using Game.DataStorage;
using Game.Entities;
using Game.Maps;
using Game.Spells;
@@ -149,27 +150,54 @@ namespace Game.AI
me.GetMotionMaster().MoveDistract(5 * Time.InMilliseconds, me.GetAbsoluteAngle(who));
}
// adapted from logic in Spell:EFfectSummonType before commit 8499434
public static bool ShouldFollowOnSpawn(SummonPropertiesRecord properties)
{
// Summons without SummonProperties are generally scripted summons that don't belong to any owner
if (properties == null)
return false;
switch (properties.Control)
{
case SummonCategory.Pet:
return true;
case SummonCategory.Wild:
case SummonCategory.Ally:
case SummonCategory.Unk:
if (properties.GetFlags().HasFlag(SummonPropertiesFlags.JoinSummonerSpawnGroup))
return true;
switch (properties.Title)
{
case SummonTitle.Pet:
case SummonTitle.Guardian:
case SummonTitle.Runeblade:
case SummonTitle.Minion:
case SummonTitle.Companion:
return true;
default:
return false;
}
default:
return false;
}
}
// Called when creature appears in the world (spawn, respawn, grid load etc...)
public virtual void JustAppeared()
{
// Filter which type of summons apply the following follow handling
if (!me.IsSummon())
return;
// Summons without SummonProperties are generally scripted summons that don't belong to any owner
TempSummon summon = me.ToTempSummon();
if (summon.m_Properties == null || (summon.m_Properties.Control != SummonCategory.Unk && summon.m_Properties.Control != SummonCategory.Pet))
return;
// Not applied to vehicles
if (summon.GetVehicle())
return;
Unit owner = summon.GetCharmerOrOwner();
if (owner != null)
if (summon != null)
{
summon.GetMotionMaster().Clear();
summon.GetMotionMaster().MoveFollow(owner, SharedConst.PetFollowDist, summon.GetFollowAngle());
// Only apply this to specific types of summons
if (!summon.GetVehicle() && ShouldFollowOnSpawn(summon.m_Properties))
{
Unit owner = summon.GetCharmerOrOwner();
if (owner != null)
{
summon.GetMotionMaster().Clear();
summon.GetMotionMaster().MoveFollow(owner, SharedConst.PetFollowDist, summon.GetFollowAngle());
}
}
}
}