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

feat(Core/RPG): Wire makeShortCut into lastPath reuse for interrupt recovery

Browse Source
This commit is contained in:
bash 2026-05-08 21:32:38 +02:00
parent d04295955a
commit 7a46ed62cc
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Ai/World/Rpg/Action/NewRpgBaseAction.cpp
View File

@ -79,8 +79,11 @@ bool NewRpgBaseAction::MoveFarTo(WorldPosition dest)
} }
// 10% lastPath reuse — if the cached path's endpoint is still // 10% lastPath reuse — if the cached path's endpoint is still
// close (within 10%) to the new dest AND we're not nearly there, // close (within 10%) to the new dest, trim the cached path to
// keep the existing route. Matches cmangos ResolveMovePath. // the bot's current position via makeShortCut and re-dispatch.
// Mirrors cmangos ResolveMovePath: per-tick re-dispatch of the
// (trimmed) last path keeps the bot on-route after interrupts
// (knockback, combat, manual move) without needing a full replan.
{ {
LastMovement& lastMove = AI_VALUE(LastMovement&, "last movement"); LastMovement& lastMove = AI_VALUE(LastMovement&, "last movement");
if (!lastMove.lastPath.empty()) if (!lastMove.lastPath.empty())
@ -93,9 +96,42 @@ bool NewRpgBaseAction::MoveFarTo(WorldPosition dest)
float distFromBotToBack = bot->GetExactDist(&lastBack); float distFromBotToBack = bot->GetExactDist(&lastBack);
if (lastBack.distance(dest) < maxDistChange && distFromBotToBack > 10.0f) if (lastBack.distance(dest) < maxDistChange && distFromBotToBack > 10.0f)
{ {
EmitDebugMove("MoveFar", "reuse", WorldPosition botPos(bot);
dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ()); lastMove.lastPath.makeShortCut(botPos, sPlayerbotAIConfig.reactDistance);
return true;
// makeShortCut may clear the path if the bot drifted
// too far off (>reactDistance from any waypoint). In
// that case fall through to fresh planning.
if (!lastMove.lastPath.empty())
{
std::vector<WorldPosition> const& pts = lastMove.lastPath.getPointPath();
if (pts.size() >= 2)
{
Movement::PointsArray points;
points.reserve(pts.size());
for (auto const& wp : pts)
points.emplace_back(wp.GetPositionX(), wp.GetPositionY(), wp.GetPositionZ());
for (auto& pt : points)
bot->UpdateAllowedPositionZ(pt.x, pt.y, pt.z);
bot->GetMotionMaster()->Clear();
bot->GetMotionMaster()->MoveSplinePath(&points, FORCED_MOVEMENT_RUN);
G3D::Vector3 const& last = points.back();
float totalChainDist = 0.f;
for (size_t i = 1; i < points.size(); ++i)
totalChainDist += (points[i] - points[i - 1]).length();
float speed = std::max(bot->GetSpeed(MOVE_RUN), 0.1f);
uint32 expectedMs = static_cast<uint32>((totalChainDist / speed) * IN_MILLISECONDS);
uint32 cappedMs = std::min(expectedMs, (uint32)sPlayerbotAIConfig.maxWaitForMove);
lastMove.Set(bot->GetMapId(), last.x, last.y, last.z,
bot->GetOrientation(), cappedMs, MovementPriority::MOVEMENT_NORMAL);
EmitDebugMove("MoveFar", "reuse",
dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ());
return true;
}
}
// Path was cleared or collapsed — fall through to fresh planning.
} }
} }
} }