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

feat(movement): Migrate InterruptManager to BotMovementController

Browse Source 
Task 3 Progress: 7/33 files complete (HIGH PRIORITY #4)

Migrated 3 MotionMaster usages to BotMovementController for interrupt
execution positioning with validated pathfinding.

Changes:
- Added PlayerBotHelpers.h include
- Updated all 3 MovePoint() calls:
  1. Plan execution position (line 565)
  2. Cover position for LoS interrupt (line 1263)
  3. Move position for interrupt setup (line 1419)

Interrupt System Benefits:
- Validated positioning for interrupt execution
- Ground validation prevents positioning errors
- Collision detection for LoS interrupt coverage
- Proper pathfinding to optimal interrupt positions

Performance: No impact when disabled
Testing: Build successful (RelWithDebInfo)

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:42:46 -03:00
committed by luis
co-authored by Claude Opus 4.5
parent 0180e347a0
commit c793963a79
1 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/Playerbot/AI/Combat/InterruptManager.cpp
+47 -8
View File
@@ -30,6 +30,7 @@
#include "Movement/UnifiedMovementCoordinator.h"
#include "../../Movement/Arbiter/MovementPriorityMapper.h"
#include "../BotAI.h"
#include "Core/PlayerBotHelpers.h"
#include "UnitAI.h"
// WoW 12.0: SpellAttr16 and SpellPvpModifier support
#include "DB2Stores.h"
@@ -561,10 +562,24 @@ bool InterruptManager::ExecuteInterruptPlan(const InterruptPlan& plan)
}
else
{
// FALLBACK: Direct MotionMaster if arbiter not available
_bot->GetMotionMaster()->MovePoint(0, plan.executionPosition.GetPositionX(),
plan.executionPosition.GetPositionY(),
plan.executionPosition.GetPositionZ());
// FALLBACK: Use BotMovementController with validated pathfinding
if (BotAI* ai = GetBotAI(_bot))
{
if (!ai->MoveTo(plan.executionPosition, true))
{
// Final fallback to legacy if validation fails
_bot->GetMotionMaster()->MovePoint(0, plan.executionPosition.GetPositionX(),
plan.executionPosition.GetPositionY(),
plan.executionPosition.GetPositionZ());
}
}
else
{
// Non-bot player - use standard movement
_bot->GetMotionMaster()->MovePoint(0, plan.executionPosition.GetPositionX(),
plan.executionPosition.GetPositionY(),
plan.executionPosition.GetPositionZ());
}
}
return false;
}
@@ -1259,8 +1274,20 @@ bool InterruptManager::AttemptLoSInterrupt(Unit* target)
}
else
{
// Fallback to direct MotionMaster
_bot->GetMotionMaster()->MovePoint(0, coverPos.GetPositionX(), coverPos.GetPositionY(), coverPos.GetPositionZ());
// Fallback: Use BotMovementController with validated pathfinding
if (BotAI* ai = GetBotAI(_bot))
{
if (!ai->MoveTo(coverPos, true))
{
// Final fallback to legacy if validation fails
_bot->GetMotionMaster()->MovePoint(0, coverPos.GetPositionX(), coverPos.GetPositionY(), coverPos.GetPositionZ());
}
}
else
{
// Non-bot player - use standard movement
_bot->GetMotionMaster()->MovePoint(0, coverPos.GetPositionX(), coverPos.GetPositionY(), coverPos.GetPositionZ());
}
TC_LOG_DEBUG("module.playerbot.interrupt",
"AttemptLoSInterrupt: Bot {} (fallback) moving to cover for LoS interrupt",
@@ -1415,8 +1442,20 @@ bool InterruptManager::AttemptMovementInterrupt(Unit* target)
}
else
{
// FALLBACK: Direct MotionMaster if arbiter not available
_bot->GetMotionMaster()->MovePoint(0, movePos.GetPositionX(), movePos.GetPositionY(), movePos.GetPositionZ());
// FALLBACK: Use BotMovementController with validated pathfinding
if (BotAI* ai = GetBotAI(_bot))
{
if (!ai->MoveTo(movePos, true))
{
// Final fallback to legacy if validation fails
_bot->GetMotionMaster()->MovePoint(0, movePos.GetPositionX(), movePos.GetPositionY(), movePos.GetPositionZ());
}
}
else
{
// Non-bot player - use standard movement
_bot->GetMotionMaster()->MovePoint(0, movePos.GetPositionX(), movePos.GetPositionY(), movePos.GetPositionZ());
}
}
return true;
}