flerp/mod-teleport-to-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to fix evaluation again

Browse Source
This commit is contained in:
Flerp 2025-10-31 06:25:06 -07:00
parent 35727d0a48
commit d61990d029
1 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/teleport-to-node.cpp
View File

@ -1,30 +1,21 @@
/*
* Teleport to nearest mining node (.telenode)
* - AzerothCore ChatCommandTable style (matches si_commandscript)
* - Skips depleted/in-use nodes using loot/go state
* - Avoids "sticky" re-teleport by skipping the last-node GUID and a min distance
*/
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "CommandScript.h" #include "CommandScript.h"
#include "Chat.h" #include "Chat.h"
#include "ChatCommand.h" #include "ChatCommand.h"
#include "Player.h" #include "Player.h"
#include "GameObject.h" #include "GameObject.h"
#include "ObjectGuid.h"
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include <limits> #include <limits>
#include <cstdint>
using namespace Acore::ChatCommands; using namespace Acore::ChatCommands;
// === CONFIG === static constexpr float TELEPORT_DISTANCE = 200.0f;
static constexpr float TELEPORT_DISTANCE = 200.0f; // yards (search radius) static constexpr float Z_BUMP = 1.5f;
static constexpr float Z_BUMP = 1.5f; // anti-clip offset on Z static constexpr float MIN_RETELEPORT_DIST = 8.0f;
static constexpr float MIN_RETELEPORT_DIST = 8.0f; // don't pick nodes closer than this to the player
// Mining node entries (trim to the entries you actually want)
static const std::vector<uint32> kVeinEntries = { static const std::vector<uint32> kVeinEntries = {
324,1610,1667,1731,1732,1733,1734,2054,2055,3763,3764,19903, 324,1610,1667,1731,1732,1733,1734,2054,2055,3763,3764,19903,
73940,73941,103711,103713,105569,123848,150080,150082,175404, 73940,73941,103711,103713,105569,123848,150080,150082,175404,
@ -34,37 +25,29 @@ static const std::vector<uint32> kVeinEntries = {
189978,189979,189980,189981,195036, 189978,189979,189980,189981,195036,
}; };
// Remember the last teleported-to node for each player (prevents “sticky” coords) static std::unordered_map<uint64, uint64> s_lastNodeByPlayer;
static std::unordered_map<ObjectGuid, ObjectGuid, ObjectGuid::Hash> s_lastNodeByPlayer;
static GameObject* FindNearestReadyVein(Player* player, float maxRange, float minDistanceFromPlayer) static GameObject* FindNearestReadyVein(Player* player, float maxRange, float minDistanceFromPlayer)
{ {
GameObject* nearest = nullptr; GameObject* nearest = nullptr;
float nearestDist = std::numeric_limits<float>::infinity(); float nearestDist = std::numeric_limits<float>::infinity();
uint64 lastNode = 0;
// Skip the last node we teleported to (if any) if (auto it = s_lastNodeByPlayer.find(player->GetGUID().GetRawValue()); it != s_lastNodeByPlayer.end())
ObjectGuid lastNodeGuid; lastNode = it->second;
if (auto it = s_lastNodeByPlayer.find(player->GetGUID()); it != s_lastNodeByPlayer.end())
lastNodeGuid = it->second;
for (uint32 entry : kVeinEntries) for (uint32 entry : kVeinEntries)
{ {
// Fast query: nearest object of this entry (we still validate it)
if (GameObject* go = player->FindNearestGameObject(entry, maxRange)) if (GameObject* go = player->FindNearestGameObject(entry, maxRange))
{ {
// Don’t pick the node we just used if (go->GetGUID().GetRawValue() == lastNode)
if (go->GetGUID() == lastNodeGuid)
continue; continue;
// Ignore nodes not in the default/usable state or not loot-ready
// (common depleted states are GO_ACTIVATED/GO_JUST_DEACTIVATED)
if (go->GetLootState() != GO_READY) if (go->GetLootState() != GO_READY)
continue; continue;
if (go->GetGoState() != GO_STATE_READY) if (go->GetGoState() != GO_STATE_READY)
continue; continue;
// Don’t pick a node that’s basically under the player
float d = player->GetDistance(go); float d = player->GetDistance(go);
if (d < minDistanceFromPlayer) if (d < minDistanceFromPlayer)
continue; continue;
@ -87,14 +70,12 @@ static bool DoTeleNode(Player* player)
if (player->IsInCombat()) if (player->IsInCombat())
{ {
ChatHandler(player->GetSession()).PSendSysMessage("You can't use this while in combat."); ChatHandler(player->GetSession()).PSendSysMessage("You can't use this while in combat.");
return true; // handled return true;
} }
if (GameObject* node = FindNearestReadyVein(player, TELEPORT_DISTANCE, MIN_RETELEPORT_DIST)) if (GameObject* node = FindNearestReadyVein(player, TELEPORT_DISTANCE, MIN_RETELEPORT_DIST))
{ {
// Remember this node so the next call won’t bounce back here if it hasn’t despawned yet s_lastNodeByPlayer[player->GetGUID().GetRawValue()] = node->GetGUID().GetRawValue();
s_lastNodeByPlayer[player->GetGUID()] = node->GetGUID();
player->TeleportTo( player->TeleportTo(
node->GetMapId(), node->GetMapId(),
node->GetPositionX(), node->GetPositionX(),
@ -116,7 +97,6 @@ class telenode_commandscript : public CommandScript
public: public:
telenode_commandscript() : CommandScript("telenode_commandscript") { } telenode_commandscript() : CommandScript("telenode_commandscript") { }
// Matches your si_commandscript style: ChatCommandTable with { name, handler, SEC, Console }
ChatCommandTable GetCommands() const override ChatCommandTable GetCommands() const override
{ {
static ChatCommandTable commandTable = static ChatCommandTable commandTable =
@ -144,7 +124,6 @@ private:
} }
}; };
// Export symbol; call this from your module loader (e.g., Addmod_teleport_to_nodeScripts)
void AddSC_telenode_commandscript() void AddSC_telenode_commandscript()
{ {
new telenode_commandscript(); new telenode_commandscript();