yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor GossipHelloAction with overload (#1628)

Browse Source 
* Add overload for GossipHelloAction

* Refactor GossipHelloAction
This commit is contained in:
Spargel
2025-09-16 13:20:48 -05:00
committed by GitHub
parent b388657bf6
commit 907f1aff61
2 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/strategy/actions/GossipHelloAction.cpp
View File

@@ -26,55 +26,12 @@ bool GossipHelloAction::Execute(Event event)
p >> guid; p >> guid;
} }
if (!guid)
return false;
Creature* pCreature = bot->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
if (!pCreature)
{
LOG_DEBUG("playerbots",
"[PlayerbotMgr]: HandleMasterIncomingPacket - Received CMSG_GOSSIP_HELLO {} not found or you can't "
"interact with him.",
guid.ToString().c_str());
return false;
}
GossipMenuItemsMapBounds pMenuItemBounds =
sObjectMgr->GetGossipMenuItemsMapBounds(pCreature->GetCreatureTemplate()->GossipMenuId);
if (pMenuItemBounds.first == pMenuItemBounds.second)
return false;
std::string const text = event.getParam(); std::string const text = event.getParam();
int32 menuToSelect = -1; int32 menuToSelect = -1;
if (text.empty()) if (!text.empty())
{
WorldPacket p1;
p1 << guid;
bot->GetSession()->HandleGossipHelloOpcode(p1);
bot->SetFacingToObject(pCreature);
std::ostringstream out;
out << "--- " << pCreature->GetName() << " ---";
botAI->TellMasterNoFacing(out.str());
TellGossipMenus();
}
else if (!bot->PlayerTalkClass)
{
botAI->TellError("I need to talk first");
return false;
}
else
{
menuToSelect = atoi(text.c_str()); menuToSelect = atoi(text.c_str());
// if (menuToSelect > 0)
// menuToSelect--;
ProcessGossip(menuToSelect); return Execute(guid, menuToSelect, false);
}
bot->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID());
return true;
} }
void GossipHelloAction::TellGossipText(uint32 textId) void GossipHelloAction::TellGossipText(uint32 textId)
@@ -120,16 +77,16 @@ void GossipHelloAction::TellGossipMenus()
} }
} }
bool GossipHelloAction::ProcessGossip(int32 menuToSelect) bool GossipHelloAction::ProcessGossip(int32 menuToSelect, bool silent)
{ {
GossipMenu& menu = bot->PlayerTalkClass->GetGossipMenu(); GossipMenu& menu = bot->PlayerTalkClass->GetGossipMenu();
if (menuToSelect != -1 && !menu.GetItem(menuToSelect)) if (menuToSelect != -1 && !menu.GetItem(menuToSelect))
{ {
botAI->TellError("Unknown gossip option"); if (!silent)
botAI->TellError("Unknown gossip option");
return false; return false;
} }
// GossipMenuItem const* item = menu.GetItem(menuToSelect); //not used, line marked for removal.
WorldPacket p; WorldPacket p;
std::string code; std::string code;
p << GetMaster()->GetTarget(); p << GetMaster()->GetTarget();
@@ -137,7 +94,59 @@ bool GossipHelloAction::ProcessGossip(int32 menuToSelect)
p << code; p << code;
bot->GetSession()->HandleGossipSelectOptionOpcode(p); bot->GetSession()->HandleGossipSelectOptionOpcode(p);
TellGossipMenus(); if (!silent)
TellGossipMenus();
return true; return true;
} }
bool GossipHelloAction::Execute(ObjectGuid guid, int32 menuToSelect, bool silent)
{
if (!guid)
return false;
Creature* pCreature = bot->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
if (!pCreature)
{
LOG_DEBUG("playerbots",
"[PlayerbotMgr]: HandleMasterIncomingPacket - Received CMSG_GOSSIP_HELLO {} not found or you can't "
"interact with him.",
guid.ToString().c_str());
return false;
}
GossipMenuItemsMapBounds pMenuItemBounds =
sObjectMgr->GetGossipMenuItemsMapBounds(pCreature->GetCreatureTemplate()->GossipMenuId);
if (pMenuItemBounds.first == pMenuItemBounds.second)
return false;
if (menuToSelect == -1)
{
WorldPacket p1;
p1 << guid;
bot->GetSession()->HandleGossipHelloOpcode(p1);
bot->SetFacingToObject(pCreature);
if (!silent)
{
std::ostringstream out;
out << "--- " << pCreature->GetName() << " ---";
botAI->TellMasterNoFacing(out.str());
TellGossipMenus();
}
}
else if (!bot->PlayerTalkClass)
{
if (!silent)
botAI->TellError("I need to talk first");
return false;
}
else
{
if (!ProcessGossip(menuToSelect, silent))
return false;
}
bot->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID());
return true;
}

4
src/strategy/actions/GossipHelloAction.h
View File

@@ -16,10 +16,12 @@ public:
GossipHelloAction(PlayerbotAI* botAI) : Action(botAI, "gossip hello") {} GossipHelloAction(PlayerbotAI* botAI) : Action(botAI, "gossip hello") {}
bool Execute(Event event) override; bool Execute(Event event) override;
// Overload for direct usage
bool Execute(ObjectGuid guid, int32 menuToSelect, bool silent = false);
private: private:
void TellGossipMenus(); void TellGossipMenus();
bool ProcessGossip(int32 menuToSelect); bool ProcessGossip(int32 menuToSelect, bool silent);
void TellGossipText(uint32 textId); void TellGossipText(uint32 textId);
}; };