From b1dc9c787ad1db683ddf35422b5ecdc4863dfc35 Mon Sep 17 00:00:00 2001 From: bash Date: Sat, 30 May 2026 22:49:47 +0200 Subject: [PATCH] refactor(Core/Movement): Drop dead StartTravelPlan + UpdateTravelPlan + debug node lookup --- src/Ai/Base/Actions/MovementActions.cpp | 16 ---------------- src/Ai/World/Rpg/Action/NewRpgBaseAction.cpp | 18 ------------------ src/Ai/World/Rpg/Action/NewRpgBaseAction.h | 3 --- 3 files changed, 37 deletions(-) diff --git a/src/Ai/Base/Actions/MovementActions.cpp b/src/Ai/Base/Actions/MovementActions.cpp index 459c676af..254a12f50 100644 --- a/src/Ai/Base/Actions/MovementActions.cpp +++ b/src/Ai/Base/Actions/MovementActions.cpp @@ -162,22 +162,6 @@ void MovementAction::EmitDebugMove(char const* method, char const* generator, fl default: break; } - // Travel-plan override: when actively routing through the node - // graph, prefer the next-hop node name over any RPG-level target. - if (info.HasActiveTravelPlan()) - { - TravelPlan const& plan = info.travelPlan; - if (plan.stepIdx < plan.steps.GetPathRef().size()) - { - PathNodePoint const& pnt = plan.steps.GetPathRef()[plan.stepIdx]; - if (pnt.type == PathNodeType::NODE_NODE || pnt.type == PathNodeType::NODE_PATH) - { - if (TravelNode* n = sTravelNodeMap.getNode(pnt.point, nullptr, 5.0f)) - targetName = "node:" + n->getName(); - } - } - } - float dis = bot->GetExactDist(x, y, z); std::ostringstream out; out << "[M] | " << method diff --git a/src/Ai/World/Rpg/Action/NewRpgBaseAction.cpp b/src/Ai/World/Rpg/Action/NewRpgBaseAction.cpp index ca1271cc0..bd4df746a 100644 --- a/src/Ai/World/Rpg/Action/NewRpgBaseAction.cpp +++ b/src/Ai/World/Rpg/Action/NewRpgBaseAction.cpp @@ -306,24 +306,6 @@ bool NewRpgBaseAction::DispatchPathPoints(WorldPosition const& dest, return true; } -void NewRpgBaseAction::StartTravelPlan(WorldPosition dest) -{ - TravelPlan& plan = botAI->rpgInfo.travelPlan; - GetTravelPlan(plan, dest); -} - -bool NewRpgBaseAction::UpdateTravelPlan() -{ - TravelPlan& plan = botAI->rpgInfo.travelPlan; - - bool result = ExecuteTravelPlan(plan); - - if (!plan.IsActive()) - botAI->rpgInfo.ClearTravel(); - - return result; -} - bool NewRpgBaseAction::MoveWorldObjectTo(ObjectGuid guid, float distance) { WorldObject* object = botAI->GetWorldObject(guid); diff --git a/src/Ai/World/Rpg/Action/NewRpgBaseAction.h b/src/Ai/World/Rpg/Action/NewRpgBaseAction.h index d69b50fcc..be71915aa 100644 --- a/src/Ai/World/Rpg/Action/NewRpgBaseAction.h +++ b/src/Ai/World/Rpg/Action/NewRpgBaseAction.h @@ -83,9 +83,6 @@ protected: bool CheckRpgStatusAvailable(NewRpgStatus status); private: - void StartTravelPlan(WorldPosition dest); - bool UpdateTravelPlan(); - // Centralized dispatch helper. Applies underwater fixup, ClipPath // (truncate at first hostile in attack range with LOS, level+5 cap), // inactive-bot teleport (with self-bot carve-out), masterWalking