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

clean-ups and fixes

Browse Source 
simplified code
fixed bug where neutral creatures were not captured by the aggroby filter
trim white spaces so space between filter and message is permitted but not required
This commit is contained in:
crow
2025-09-02 18:00:33 -05:00
parent 876455baca
commit 3717c6133e
1 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/ChatFilter.cpp
View File

@@ -9,9 +9,11 @@
#include "Playerbots.h" #include "Playerbots.h"
#include "RtiTargetValue.h" #include "RtiTargetValue.h"
#include "AiFactory.h" #include "AiFactory.h"
#include "Log.h"
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <string>
static std::string ToLower(const std::string& str) static std::string ToLower(const std::string& str)
{ {
@@ -439,25 +441,18 @@ public:
return message; return message;
} }
// Trim any leading spaces after @aura or @noaura (can use space between prefix and spell ID if desired, but not required)
std::string auraIdOrName = message.substr(prefixLen); std::string auraIdOrName = message.substr(prefixLen);
auraIdOrName.erase(0, auraIdOrName.find_first_not_of(' '));
if (auraIdOrName.empty()) if (auraIdOrName.empty())
{ {
return message; return message;
} }
std::string rest = "";
uint32 auraId = 0; uint32 auraId = 0;
size_t spacePos = auraIdOrName.find(' '); size_t spacePos = auraIdOrName.find(' ');
std::string idStr = (spacePos != std::string::npos) ? auraIdOrName.substr(0, spacePos) : auraIdOrName; std::string idStr = (spacePos != std::string::npos) ? auraIdOrName.substr(0, spacePos) : auraIdOrName;
if (spacePos != std::string::npos) std::string rest = (spacePos != std::string::npos) ? auraIdOrName.substr(spacePos + 1) : "";
{
rest = auraIdOrName.substr(spacePos + 1);
}
else
{
rest = "";
}
if (!idStr.empty()) if (!idStr.empty())
{ {
bool isNumeric = std::all_of(idStr.begin(), idStr.end(), ::isdigit); bool isNumeric = std::all_of(idStr.begin(), idStr.end(), ::isdigit);
@@ -468,10 +463,7 @@ public:
} }
if (auraId == 0) if (auraId == 0)
{
// Only allow numeric spell IDs
return message; return message;
}
bool hasAura = bot->HasAura(auraId); bool hasAura = bot->HasAura(auraId);
bool match = isNoAura ? !hasAura : hasAura; bool match = isNoAura ? !hasAura : hasAura;
@@ -496,15 +488,17 @@ public:
return message; return message;
} }
// Trim any leading spaces after @aggroby (can use space between prefix and entry ID/creature name if desired, but not required)
std::string enemyStr = message.substr(prefixLen); std::string enemyStr = message.substr(prefixLen);
enemyStr.erase(0, enemyStr.find_first_not_of(' '));
if (enemyStr.empty()) if (enemyStr.empty())
{ {
return message; return message;
} }
// If creature name is more than one word, it must be enclosed in quotes, e.g. @aggroby "Scarlet Commander Mograine" flee
std::string rest = ""; std::string rest = "";
std::string enemyName = ""; std::string enemyName = "";
std::string entryIdStr = "";
bool isName = false; bool isName = false;
uint32 entryId = 0; uint32 entryId = 0;
@@ -534,11 +528,11 @@ public:
} }
else else
{ {
size_t spacePos = enemyStr.find(' '); size_t splitPos = enemyStr.find_first_of(" ");
std::string idOrName = (spacePos != std::string::npos) ? enemyStr.substr(0, spacePos) : enemyStr; std::string idOrName = (splitPos != std::string::npos) ? enemyStr.substr(0, splitPos) : enemyStr;
if (spacePos != std::string::npos) if (splitPos != std::string::npos)
{ {
rest = enemyStr.substr(spacePos + 1); rest = enemyStr.substr(splitPos + 1);
} }
else else
{ {
@@ -559,22 +553,17 @@ public:
} }
} }
// Use nearest hostile npcs value and filter by entryID or name within 100 yards
const float radius = 100.0f; const float radius = 100.0f;
GuidVector npcs = botAI->GetAiObjectContext()->GetValue<GuidVector>("nearest hostile npcs")->Get(); GuidVector npcs = botAI->GetAiObjectContext()->GetValue<GuidVector>("nearest npcs")->Get();
bool match = false; bool match = false;
for (const auto& guid : npcs) for (const auto& guid : npcs)
{ {
Unit* unit = botAI->GetUnit(guid); Creature* c = botAI->GetCreature(guid);
if (!unit) if (!c)
{ {
continue; continue;
} }
if (!unit->IsCreature())
{
continue;
}
Creature* c = static_cast<Creature*>(unit);
bool nameMatch = isName && ToLower(c->GetName()) == ToLower(enemyName); bool nameMatch = isName && ToLower(c->GetName()) == ToLower(enemyName);
bool idMatch = (entryId != 0) && c->GetEntry() == entryId; bool idMatch = (entryId != 0) && c->GetEntry() == entryId;
if ((nameMatch || idMatch) && c->GetDistance2d(bot) <= radius) if ((nameMatch || idMatch) && c->GetDistance2d(bot) <= radius)