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

Core/Commands: Enable setting linked aggro and formation movement with .npc add formation and fix swapped saved dist/angle values

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/fd26363940c13a4581eb43554fd5d1caf2c00fbd)
This commit is contained in:
Hondacrx
2025-08-18 19:48:05 -04:00
parent 191fe326c2
commit a8e4653a46
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/NPCCommands.cs
+13 -8
View File
@@ -773,7 +773,7 @@ namespace Game.Chat
} }
[Command("formation", RBACPermissions.CommandNpcAddFormation)] [Command("formation", RBACPermissions.CommandNpcAddFormation)]
static bool HandleNpcAddFormationCommand(CommandHandler handler, ulong leaderGUID) static bool HandleNpcAddFormationCommand(CommandHandler handler, ulong leaderGUID, bool? linkedAggro, bool? formationMovement)
{ {
Creature creature = handler.GetSelectedCreature(); Creature creature = handler.GetSelectedCreature();
if (creature == null || creature.GetSpawnId() == 0) if (creature == null || creature.GetSpawnId() == 0)
@@ -793,18 +793,23 @@ namespace Game.Chat
return false; return false;
Player chr = handler.GetSession().GetPlayer(); Player chr = handler.GetSession().GetPlayer();
float followAngle = (creature.GetAbsoluteAngle(chr) - chr.GetOrientation()) * 180.0f / MathF.PI; float followAngle = creature.GetRelativeAngle(chr) * 180.0f / MathF.PI;
float followDist = MathF.Sqrt(MathF.Pow(chr.GetPositionX() - creature.GetPositionX(), 2f) + MathF.Pow(chr.GetPositionY() - creature.GetPositionY(), 2f)); float followDist = chr.GetExactDist2d(creature);
uint groupAI = 0; GroupAIFlags groupAI = 0;
FormationMgr.AddFormationMember(lowguid, followAngle, followDist, leaderGUID, groupAI); if (linkedAggro == true)
groupAI |= GroupAIFlags.MembersAssistMember;
if (formationMovement == true)
groupAI |= GroupAIFlags.IdleInFormation;
FormationMgr.AddFormationMember(lowguid, followAngle, followDist, leaderGUID, (uint)groupAI);
creature.SearchFormation(); creature.SearchFormation();
PreparedStatement stmt = WorldDatabase.GetPreparedStatement(WorldStatements.INS_CREATURE_FORMATION); PreparedStatement stmt = WorldDatabase.GetPreparedStatement(WorldStatements.INS_CREATURE_FORMATION);
stmt.AddValue(0, leaderGUID); stmt.AddValue(0, leaderGUID);
stmt.AddValue(1, lowguid); stmt.AddValue(1, lowguid);
stmt.AddValue(2, followAngle); stmt.AddValue(2, followDist);
stmt.AddValue(3, followDist); stmt.AddValue(3, followAngle);
stmt.AddValue(4, groupAI); stmt.AddValue(4, (uint)groupAI);
DB.World.Execute(stmt); DB.World.Execute(stmt);