Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues 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
This commit is contained in:
Shauren
2025-06-24 23:31:53 +02:00
parent 39c06d40e2
commit fd26363940
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/master/2025_06_24_00_world.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `command` SET `help`='Syntax: .npc add formation $leader [$linkedAggro] [$formationMovement]\n\nAdd selected creature to a leader\'s formation.' WHERE `name`='npc add formation';

15
src/server/scripts/Commands/cs_npc.cpp
View File

@@ -1338,7 +1338,7 @@ public:
return true;
}
static bool HandleNpcAddFormationCommand(ChatHandler* handler, ObjectGuid::LowType leaderGUID)
static bool HandleNpcAddFormationCommand(ChatHandler* handler, ObjectGuid::LowType leaderGUID, Optional<bool> linkedAggro, Optional<bool> formationMovement)
{
Creature* creature = handler->getSelectedCreature();
@@ -1361,17 +1361,22 @@ public:
Player* chr = handler->GetSession()->GetPlayer();
float followAngle = (creature->GetAbsoluteAngle(chr) - chr->GetOrientation()) * 180.0f / float(M_PI);
float followDist = std::sqrt(std::pow(chr->GetPositionX() - creature->GetPositionX(), 2.f) + std::pow(chr->GetPositionY() - creature->GetPositionY(), 2.f));
float followAngle = creature->GetRelativeAngle(chr) * 180.0f / float(M_PI);
float followDist = chr->GetExactDist2d(creature);
uint32 groupAI = 0;
if (linkedAggro == true)
groupAI |= FLAG_MEMBERS_ASSIST_MEMBER;
if (formationMovement == true)
groupAI |= FLAG_IDLE_IN_FORMATION;
sFormationMgr->AddFormationMember(lowguid, followAngle, followDist, leaderGUID, groupAI);
creature->SearchFormation();
WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_INS_CREATURE_FORMATION);
stmt->setUInt64(0, leaderGUID);
stmt->setUInt64(1, lowguid);
stmt->setFloat (2, followAngle);
stmt->setFloat (3, followDist);
stmt->setFloat (2, followDist);
stmt->setFloat (3, followAngle);
stmt->setUInt32(4, groupAI);
WorldDatabase.Execute(stmt);