veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-06-20 15:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Movement): WaitForReach formula parity + PointsArray overload

Browse Source
This commit is contained in:
bash 2026-05-31 18:05:35 +02:00
parent 32b687f00a
commit d00ad8d327
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Ai/Base/Actions/MovementActions.cpp
View File

@ -888,25 +888,52 @@ float MovementAction::MoveDelay(float distance, bool backwards)
return delay;
}
// TODO should this be removed? (or modified to use "last movement" value?)
void MovementAction::WaitForReach(float distance)
{
float delay = 1000.0f * MoveDelay(distance);
// Reference formula: 1000 * MoveDelay(distance) + reactDelay. The
// reactDelay gives the bot a small slack at the end of a move so the
// next action sees the bot at rest rather than mid-spline.
float delay = 1000.0f * MoveDelay(distance) + sPlayerbotAIConfig.reactDelay;
if (delay > sPlayerbotAIConfig.maxWaitForMove)
delay = sPlayerbotAIConfig.maxWaitForMove;
// Combat clamp deliberately disabled (reference comments it out):
// clamping to globalCoolDown in combat caused bots to re-evaluate
// mid-pull and abandon a chase before reaching attack range. The
// commented block is preserved verbatim should we need to revisit.
/*
Unit* target = *botAI->GetAiObjectContext()->GetValue<Unit*>("current target");
Unit* player = *botAI->GetAiObjectContext()->GetValue<Unit*>("enemy player target");
if ((player || target) && delay > sPlayerbotAIConfig.globalCoolDown)
delay = sPlayerbotAIConfig.globalCoolDown;
*/
if (delay < 0)
delay = 0;
// Reference uses SetDuration on the Action; AC's equivalent is
// SetNextCheckDelay on the AI loop. Same outcome: re-evaluation is
// postponed by `delay` ms.
botAI->SetNextCheckDelay((uint32)delay);
}
void MovementAction::WaitForReach(Movement::PointsArray const& path)
{
float distance = 0.0f;
if (!path.empty())
{
G3D::Vector3 const* previousPoint = &path[0];
for (auto it = path.begin() + 1; it != path.end(); ++it)
{
G3D::Vector3 const& pathPoint = (*it);
distance += (*previousPoint - pathPoint).length();
previousPoint = &pathPoint;
}
}
WaitForReach(distance);
}
// similiar to botAI->SetNextCheckDelay() but only stops movement
void MovementAction::SetNextMovementDelay(float delayMillis)
{

4
src/Ai/Base/Actions/MovementActions.h
View File

@ -96,6 +96,10 @@ protected:
bool ReachCombatTo(Unit* target, float distance = 0.0f);
float MoveDelay(float distance, bool backwards = false);
void WaitForReach(float distance);
// PointsArray overload: sums segment distances and calls the float
// version. Matches the reference's WaitForReach(PointsArray) used at
// the end of DispatchMovement.
void WaitForReach(Movement::PointsArray const& path);
void SetNextMovementDelay(float delayMillis);
bool IsMovingAllowed(WorldObject* target);
bool IsDuplicateMove(float x, float y, float z);