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/Debug): Restructure debug-move whispers with via= field

Browse Source
This commit is contained in:
bash 2026-05-04 23:53:37 +02:00
parent 6fdde7eb20
commit 79d5c80267
3 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,26 +51,11 @@ MovementAction::MovementAction(PlayerbotAI* botAI, std::string const name) : Act
bot = botAI->GetBot(); bot = botAI->GetBot();
} }
void MovementAction::EmitDebugMove(char const* method, float x, float y, float z, char const* extra) void MovementAction::EmitDebugMove(char const* method, char const* generator, float x, float y, float z, char const* extra)
{ {
if (!botAI->HasStrategy("debug move", BOT_STATE_NON_COMBAT)) if (!botAI->HasStrategy("debug move", BOT_STATE_NON_COMBAT))
return; return;
// Suppress the trace when we're already in flight toward this exact
// destination. Many entry points (Follow / ChaseTo / Flee /
// ReachCombatTo / ...) re-enter every tick from combat triggers and
// hand the same coords to MoveTo, which internally no-ops; firing
// EmitDebugMove before that no-op produces per-tick whisper spam.
{
LastMovement& lastMove = AI_VALUE(LastMovement&, "last movement");
if (bot->isMoving()
&& bot->GetMapId() == lastMove.lastMoveToMapId
&& std::fabs(lastMove.lastMoveToX - x) < 1.0f
&& std::fabs(lastMove.lastMoveToY - y) < 1.0f
&& std::fabs(lastMove.lastMoveToZ - z) < 1.0f)
return;
}
auto resolveName = [&](ObjectGuid guid) -> std::string auto resolveName = [&](ObjectGuid guid) -> std::string
{ {
if (!guid) if (!guid)
@ -195,9 +180,11 @@ void MovementAction::EmitDebugMove(char const* method, float x, float y, float z
float dis = bot->GetExactDist(x, y, z); float dis = bot->GetExactDist(x, y, z);
std::ostringstream out; std::ostringstream out;
out << "[MOVE] type=" << method << " | state=" << statusName out << "[MOVE] meth=" << method
<< " | dist=" << dis << "y" << " | via=" << (generator && *generator ? generator : "-")
<< " | target=" << (targetName.empty() ? "-" : targetName.c_str()); << " | rpg=" << statusName
<< " | d=" << dis << "y"
<< " | targ=" << (targetName.empty() ? "-" : targetName.c_str());
if (extra && *extra) if (extra && *extra)
out << " | " << extra; out << " | " << extra;
botAI->TellMasterNoFacing(out); botAI->TellMasterNoFacing(out);
@ -242,7 +229,7 @@ bool MovementAction::JumpTo(uint32 mapId, float x, float y, float z, MovementPri
bool MovementAction::MoveNear(uint32 mapId, float x, float y, float z, float distance, MovementPriority priority) bool MovementAction::MoveNear(uint32 mapId, float x, float y, float z, float distance, MovementPriority priority)
{ {
float angle = GetFollowAngle(); float angle = GetFollowAngle();
EmitDebugMove("MoveNear:spline", x, y, z); EmitDebugMove("MoveNear", "mmap", x, y, z);
return MoveTo(mapId, x + cos(angle) * distance, y + sin(angle) * distance, z, false, false, false, false, priority); return MoveTo(mapId, x + cos(angle) * distance, y + sin(angle) * distance, z, false, false, false, false, priority);
} }
@ -286,7 +273,7 @@ bool MovementAction::MoveToLOS(WorldObject* target, bool ranged)
float x = target->GetPositionX(); float x = target->GetPositionX();
float y = target->GetPositionY(); float y = target->GetPositionY();
float z = target->GetPositionZ(); float z = target->GetPositionZ();
EmitDebugMove("MoveToLOS:spline", x, y, z); EmitDebugMove("MoveToLOS", "mmap", x, y, z);
// Use standard PathGenerator to find a route. // Use standard PathGenerator to find a route.
PathResult path = GeneratePath(x, y, z, DEFAULT_PATH_ACCEPT_MASK, false); PathResult path = GeneratePath(x, y, z, DEFAULT_PATH_ACCEPT_MASK, false);
@ -1017,7 +1004,7 @@ bool MovementAction::ReachCombatTo(Unit* target, float distance)
// prior spline is still playing. Emitting before the suppression // prior spline is still playing. Emitting before the suppression
// check produces per-tick whisper spam. // check produces per-tick whisper spam.
if (moved) if (moved)
EmitDebugMove("ReachCombatTo:spline", endPos.x, endPos.y, endPos.z); EmitDebugMove("ReachCombatTo", "mmap", endPos.x, endPos.y, endPos.z);
return moved; return moved;
} }
@ -1277,7 +1264,7 @@ bool MovementAction::Follow(Unit* target, float distance, float angle)
return false; return false;
} }
EmitDebugMove("Follow:spline", target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); EmitDebugMove("Follow", "follow", target->GetPositionX(), target->GetPositionY(), target->GetPositionZ());
/* /*
if (!bot->InBattleground() if (!bot->InBattleground()
@ -1449,7 +1436,7 @@ bool MovementAction::ChaseTo(WorldObject* obj, float distance)
} }
if (obj) if (obj)
EmitDebugMove("ChaseTo:spline", obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ()); EmitDebugMove("ChaseTo", "chase", obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ());
if (Vehicle* vehicle = bot->GetVehicle()) if (Vehicle* vehicle = bot->GetVehicle())
{ {
@ -1539,7 +1526,7 @@ bool MovementAction::Flee(Unit* target)
if (!sPlayerbotAIConfig.fleeingEnabled) if (!sPlayerbotAIConfig.fleeingEnabled)
return false; return false;
EmitDebugMove("Flee:spline", target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); EmitDebugMove("Flee", "flee", target->GetPositionX(), target->GetPositionY(), target->GetPositionZ());
if (!IsMovingAllowed()) if (!IsMovingAllowed())
{ {
@ -1720,7 +1707,7 @@ bool MovementAction::MoveAway(Unit* target, float distance, bool backwards)
{ {
return false; return false;
} }
EmitDebugMove("MoveAway:spline", target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); EmitDebugMove("MoveAway", "mmap", target->GetPositionX(), target->GetPositionY(), target->GetPositionZ());
float init_angle = target->GetAngle(bot); float init_angle = target->GetAngle(bot);
for (float delta = 0; delta <= M_PI / 2; delta += M_PI / 8) for (float delta = 0; delta <= M_PI / 2; delta += M_PI / 8)
{ {
@ -1800,7 +1787,7 @@ bool MovementAction::MoveFromGroup(float distance)
y /= count; y /= count;
// x and y are now average position of the group members // x and y are now average position of the group members
float angle = bot->GetAngle(x, y) + M_PI; float angle = bot->GetAngle(x, y) + M_PI;
EmitDebugMove("MoveFromGroup:spline", x, y, bot->GetPositionZ()); EmitDebugMove("MoveFromGroup", "mmap", x, y, bot->GetPositionZ());
return Move(angle, distance - closestDist); return Move(angle, distance - closestDist);
} }
} }
@ -1829,7 +1816,7 @@ bool MovementAction::MoveInside(uint32 mapId, float x, float y, float z, float d
{ {
return false; return false;
} }
EmitDebugMove("MoveInside:spline", x, y, z); EmitDebugMove("MoveInside", "mmap", x, y, z);
return MoveNear(mapId, x, y, z, distance, priority); return MoveNear(mapId, x, y, z, distance, priority);
} }
@ -2418,7 +2405,7 @@ bool MovementAction::FleePosition(Position pos, float radius, uint32 minInterval
} }
if (bestPos != Position()) if (bestPos != Position())
{ {
EmitDebugMove("FleePosition:spline", bestPos.GetPositionX(), bestPos.GetPositionY(), bestPos.GetPositionZ()); EmitDebugMove("FleePosition", "mmap", bestPos.GetPositionX(), bestPos.GetPositionY(), bestPos.GetPositionZ());
if (MoveTo(bot->GetMapId(), bestPos.GetPositionX(), bestPos.GetPositionY(), bestPos.GetPositionZ(), false, if (MoveTo(bot->GetMapId(), bestPos.GetPositionX(), bestPos.GetPositionY(), bestPos.GetPositionZ(), false,
false, true, false, MovementPriority::MOVEMENT_COMBAT)) false, true, false, MovementPriority::MOVEMENT_COMBAT))
{ {
@ -3315,7 +3302,7 @@ bool MovementAction::LaunchWalkSpline(TravelPlan& state)
lastMove.setPath(TravelPath(wpts)); lastMove.setPath(TravelPath(wpts));
} }
EmitDebugMove("TravelPlan:walk", last.x, last.y, last.z); EmitDebugMove("TravelPlan:walk-start", "mmap", last.x, last.y, last.z);
return false; // Walking return false; // Walking
} }
@ -3325,7 +3312,7 @@ bool MovementAction::MoveToSpline(TravelPlan& state, WorldPosition target)
if (!IsMovingAllowed()) if (!IsMovingAllowed())
return false; return false;
EmitDebugMove("TravelPlan:segment", target.GetPositionX(), target.GetPositionY(), target.GetPositionZ()); EmitDebugMove("TravelPlan:walk-waypoint", "mmap", target.GetPositionX(), target.GetPositionY(), target.GetPositionZ());
// Generate path // Generate path
state.walkPoints.clear(); state.walkPoints.clear();
@ -3763,7 +3750,7 @@ bool MovementAction::BoardTransport(Transport* transport)
{ {
transport->AddPassenger(bot, true); transport->AddPassenger(bot, true);
bot->StopMovingOnCurrentPos(); bot->StopMovingOnCurrentPos();
EmitDebugMove("TravelPlan:transport-board", transport->GetPositionX(), EmitDebugMove("TravelPlan:transport-board", "teleport", transport->GetPositionX(),
transport->GetPositionY(), transport->GetPositionZ()); transport->GetPositionY(), transport->GetPositionZ());
return true; return true;
} }
@ -3789,7 +3776,7 @@ bool MovementAction::BoardTransport(Transport* transport)
bot->SetStandState(UNIT_STAND_STATE_STAND); bot->SetStandState(UNIT_STAND_STATE_STAND);
mm->MovePoint(0, destX, destY, destZ, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, false, false); mm->MovePoint(0, destX, destY, destZ, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, false, false);
EmitDebugMove("TravelPlan:transport-walk", destX, destY, destZ); EmitDebugMove("TravelPlan:transport-walk", "spline", destX, destY, destZ);
} }
return false; return false;

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

@ -48,7 +48,7 @@ protected:
// context such as RPG status and target name. Optional `extra` // context such as RPG status and target name. Optional `extra`
// is appended verbatim (use it to attach hop labels like // is appended verbatim (use it to attach hop labels like
// "node:Stormwind innkeeper" or fallback reasons). // "node:Stormwind innkeeper" or fallback reasons).
virtual void EmitDebugMove(char const* method, float x, float y, float z, char const* extra = nullptr); virtual void EmitDebugMove(char const* method, char const* generator, float x, float y, float z, char const* extra = nullptr);
bool JumpTo(uint32 mapId, float x, float y, float z, MovementPriority priority = MovementPriority::MOVEMENT_NORMAL); bool JumpTo(uint32 mapId, float x, float y, float z, MovementPriority priority = MovementPriority::MOVEMENT_NORMAL);
bool MoveNear(uint32 mapId, float x, float y, float z, float distance = sPlayerbotAIConfig.contactDistance, bool MoveNear(uint32 mapId, float x, float y, float z, float distance = sPlayerbotAIConfig.contactDistance,

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

@ -198,7 +198,7 @@ bool NewRpgBaseAction::MoveFarTo(WorldPosition dest)
// Fire once on plan start so the user sees nodetravel as // Fire once on plan start so the user sees nodetravel as
// the chosen strategy. Per-step labels // the chosen strategy. Per-step labels
// (TravelPlan:walk/segment/...) continue from the executor. // (TravelPlan:walk/segment/...) continue from the executor.
EmitDebugMove("MoveFar:nodetravel", EmitDebugMove("MoveFar", "travelplan",
dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ()); dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ());
botAI->rpgInfo.RecordMoveFarAttempt(dest, /*wasNodeTravel=*/true); botAI->rpgInfo.RecordMoveFarAttempt(dest, /*wasNodeTravel=*/true);
return UpdateTravelPlan(); return UpdateTravelPlan();
@ -293,7 +293,7 @@ bool NewRpgBaseAction::MoveFarTo(WorldPosition dest)
forceMmapOverNodes ? "F-mmap " : "", forceMmapOverNodes ? "F-mmap " : "",
forceNodesOverMmap ? "F-nodes " : "", forceNodesOverMmap ? "F-nodes " : "",
bothExhausted ? "EXHAUST " : ""); bothExhausted ? "EXHAUST " : "");
EmitDebugMove("MoveFar:mmap", EmitDebugMove("MoveFar", "mmap",
points.back().x, points.back().y, points.back().z); points.back().x, points.back().y, points.back().z);
botAI->rpgInfo.RecordMoveFarAttempt(dest, /*wasNodeTravel=*/false); botAI->rpgInfo.RecordMoveFarAttempt(dest, /*wasNodeTravel=*/false);
@ -347,7 +347,7 @@ bool NewRpgBaseAction::MoveFarTo(WorldPosition dest)
forceMmapOverNodes ? "F-mmap " : "", forceMmapOverNodes ? "F-mmap " : "",
forceNodesOverMmap ? "F-nodes " : "", forceNodesOverMmap ? "F-nodes " : "",
bothExhausted ? "EXHAUST " : ""); bothExhausted ? "EXHAUST " : "");
EmitDebugMove("MoveFar:spline", EmitDebugMove("MoveFar", "spline",
dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ()); dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ());
botAI->rpgInfo.RecordMoveFarAttempt(dest, /*wasNodeTravel=*/false); botAI->rpgInfo.RecordMoveFarAttempt(dest, /*wasNodeTravel=*/false);
// Same exact_waypoint=false rationale as the mmap branch — terrain- // Same exact_waypoint=false rationale as the mmap branch — terrain-
@ -448,7 +448,7 @@ bool NewRpgBaseAction::MoveRandomNear(float moveStep, MovementPriority priority,
bool moved = MoveTo(bot->GetMapId(), dx, dy, dz, false, false, false, true, priority); bool moved = MoveTo(bot->GetMapId(), dx, dy, dz, false, false, false, true, priority);
if (moved) if (moved)
{ {
EmitDebugMove("MoveRandomNear:spline", dx, dy, dz); EmitDebugMove("MoveRandomNear", "mmap", dx, dy, dz);
return true; return true;
} }
} }
@ -482,7 +482,7 @@ bool NewRpgBaseAction::TakeFlight(std::vector<uint32> const& taxiNodes, Creature
LOG_DEBUG("playerbots", "[New RPG] Bot {} taking flight ({} nodes, {} to {})", LOG_DEBUG("playerbots", "[New RPG] Bot {} taking flight ({} nodes, {} to {})",
bot->GetName(), taxiNodes.size(), taxiNodes.front(), taxiNodes.back()); bot->GetName(), taxiNodes.size(), taxiNodes.front(), taxiNodes.back());
EmitDebugMove("TravelPlan:flight", flightMaster->GetPositionX(), flightMaster->GetPositionY(), EmitDebugMove("TravelPlan:flight", "taxi", flightMaster->GetPositionX(), flightMaster->GetPositionY(),
flightMaster->GetPositionZ()); flightMaster->GetPositionZ());
return true; return true;
} }