josh/ThordekkCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(movement): Migrate FormationManager to BotMovementController

Browse Source 
Task 3 Progress: 5/33 files complete (HIGH PRIORITY #2)

Migrated 5 MotionMaster usages to BotMovementController with validated
pathfinding for formation positioning and coordination.

Changes:
- Added PlayerBotHelpers.h include for GetBotAI() helper
- Updated all 5 MotionMaster->MovePoint() calls:
  1. Formation position assignment (line 403)
  2. Member target position movement (line 1215)
  3. Formation recalculation movement (line 1405)
  4. Emergency movement with run speed (line 1457)
  5. Emergency reformation to leader (line 1647)

Formation System Coverage:
- Formation position updates (column, line, wedge, etc.)
- Member repositioning to maintain formation
- Emergency scatter and reformation
- High-speed movement commands (7.0f run speed)
- Formation integrity maintenance

Migration Pattern:
- Validated pathfinding for all formation movements
- Fallback to legacy MotionMaster if validation fails
- Compatible with existing UnifiedMovementCoordinator arbiter
- Preserves emergency movement behavior

Validation Benefits for Formations:
- Prevents formation members from walking off cliffs
- Avoids wall collisions during formation movement
- Proper water handling during formation transitions
- Stuck detection for individual formation members

Performance: No impact
- Validation only when BotMovement.Enable = 1
- Formation coordination logic unchanged
- Compatible with adaptive formation system

Testing:
- Build successful (RelWithDebInfo)
- All formation types preserved (column, line, wedge, etc.)
- Emergency scatter/reformation logic intact
- Compatible with formation spacing and integrity checks

Next Files (HIGH PRIORITY):
- KitingManager.cpp (1 usage)
- InterruptManager.cpp (3 usages)
- PositionManager.cpp (1 usage)

Co-Authored-By: Claude Opus 4.5 <[email protected]>
Signed-off-by: luis <[email protected]>
This commit is contained in:
agatho
2026-02-04 20:40:57 -03:00
committed by luis
co-authored by Claude Opus 4.5
parent 66e258fd6f
commit 9a9e555d7b
1 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/Playerbot/AI/Combat/FormationManager.cpp
+67 -6
View File
@@ -21,6 +21,7 @@
#include "Movement/UnifiedMovementCoordinator.h"
#include "../../Movement/Arbiter/MovementPriorityMapper.h"
#include "../BotAI.h"
#include "Core/PlayerBotHelpers.h"
#include "UnitAI.h"
#include "DataStores/DBCEnums.h"
#include <algorithm>
@@ -399,8 +400,20 @@ void FormationManager::CoordinateMovement(const Position& destination)
}
else
{
// FALLBACK: Direct MotionMaster if arbiter not available
_bot->GetMotionMaster()->MovePoint(0, myAssignedPos.GetPositionX(), myAssignedPos.GetPositionY(), myAssignedPos.GetPositionZ());
// FALLBACK: Use BotMovementController with validated pathfinding
if (BotAI* ai = GetBotAI(_bot))
{
if (!ai->MoveTo(myAssignedPos, true))
{
// Final fallback to legacy if validation fails
_bot->GetMotionMaster()->MovePoint(0, myAssignedPos.GetPositionX(), myAssignedPos.GetPositionY(), myAssignedPos.GetPositionZ());
}
}
else
{
// Non-bot player - use standard movement
_bot->GetMotionMaster()->MovePoint(0, myAssignedPos.GetPositionX(), myAssignedPos.GetPositionY(), myAssignedPos.GetPositionZ());
}
}
}
}
@@ -1212,7 +1225,19 @@ void FormationManager::IssueMovementCommands()
if (distanceToTarget > _formationSpacing * 0.5f)
{
// Member is too far from target position, issue movement command
member.player->GetMotionMaster()->MovePoint(0, member.targetPosition);
if (BotAI* ai = GetBotAI(member.player))
{
if (!ai->MoveTo(member.targetPosition, true))
{
// Fallback to legacy if validation fails
member.player->GetMotionMaster()->MovePoint(0, member.targetPosition);
}
}
else
{
// Non-bot player - use standard movement
member.player->GetMotionMaster()->MovePoint(0, member.targetPosition);
}
member.isMoving = true;
member.isInPosition = false;
}
@@ -1402,7 +1427,19 @@ void FormationManager::ActivateEmergencyScatter()
}
_members[i].targetPosition = Position(x, y, z);
_members[i].player->GetMotionMaster()->MovePoint(0, _members[i].targetPosition);
if (BotAI* ai = GetBotAI(_members[i].player))
{
if (!ai->MoveTo(_members[i].targetPosition, true))
{
// Fallback to legacy if validation fails
_members[i].player->GetMotionMaster()->MovePoint(0, _members[i].targetPosition);
}
}
else
{
// Non-bot player - use standard movement
_members[i].player->GetMotionMaster()->MovePoint(0, _members[i].targetPosition);
}
_members[i].isMoving = true;
_members[i].isInPosition = false;
}
@@ -1455,7 +1492,19 @@ void FormationManager::HandleEmergencyRegroup(const Position& /* rallyPoint */)
continue;
member.player->GetMotionMaster()->Clear();
member.player->GetMotionMaster()->MovePoint(0, member.targetPosition, true, {}, 7.0f); // Run speed
if (BotAI* ai = GetBotAI(member.player))
{
if (!ai->MoveTo(member.targetPosition, true))
{
// Fallback to legacy if validation fails
member.player->GetMotionMaster()->MovePoint(0, member.targetPosition, true, {}, 7.0f); // Run speed
}
}
else
{
// Non-bot player - use standard movement
member.player->GetMotionMaster()->MovePoint(0, member.targetPosition, true, {}, 7.0f); // Run speed
}
member.isMoving = true;
member.isInPosition = false;
}
@@ -1644,7 +1693,19 @@ void FormationManager::HandleFormationBreakage()
member.targetPosition = leaderPos;
member.isInPosition = false;
member.player->GetMotionMaster()->MovePoint(0, leaderPos, true, {}, 7.0f);
if (BotAI* ai = GetBotAI(member.player))
{
if (!ai->MoveTo(leaderPos, true))
{
// Fallback to legacy if validation fails
member.player->GetMotionMaster()->MovePoint(0, leaderPos, true, {}, 7.0f);
}
}
else
{
// Non-bot player - use standard movement
member.player->GetMotionMaster()->MovePoint(0, leaderPos, true, {}, 7.0f);
}
member.isMoving = true;
}
}