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

Merge pull request #1699 from IainD92/RandomBotGuildTotals_fix

Browse Source 
Random bot guild count / generation fix
This commit is contained in:
kadeshar
2025-11-04 20:50:02 +01:00
committed by GitHub
parent d9f0d5a555 1d19dea974
commit e35900f9d0
1 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/RandomPlayerbotFactory.cpp
View File

@@ -875,23 +875,67 @@ void RandomPlayerbotFactory::CreateRandomGuilds()
LOG_INFO("playerbots", "Random bot guilds deleted"); LOG_INFO("playerbots", "Random bot guilds deleted");
} }
std::unordered_set<uint32> botAccounts;
botAccounts.reserve(sPlayerbotAIConfig->randomBotAccounts.size());
for (uint32 acc : sPlayerbotAIConfig->randomBotAccounts)
botAccounts.insert(acc);
// Recount bot guilds directly from the database (does not depend on connected bots)
uint32 guildNumber = 0; uint32 guildNumber = 0;
GuidVector availableLeaders; sPlayerbotAIConfig->randomBotGuilds.clear();
for (std::vector<uint32>::iterator i = randomBots.begin(); i != randomBots.end(); ++i) sPlayerbotAIConfig->randomBotGuilds.shrink_to_fit(); // avoids accumulating old capacity
if (!botAccounts.empty())
{ {
ObjectGuid leader = ObjectGuid::Create<HighGuid::Player>(*i); if (QueryResult res = CharacterDatabase.Query(
if (Guild* guild = sGuildMgr->GetGuildByLeader(leader)) // We only retrieve what is necessary (guildid, leader account)
"SELECT g.guildid, c.account "
"FROM guild g JOIN characters c ON g.leaderguid = c.guid"))
{ {
++guildNumber; do
sPlayerbotAIConfig->randomBotGuilds.push_back(guild->GetId()); {
Field* f = res->Fetch();
const uint32 guildId = f[0].Get<uint32>();
const uint32 accountId = f[1].Get<uint32>();
// Determine if guild leader's account is a bot account.
if (botAccounts.find(accountId) != botAccounts.end())
{
++guildNumber;
sPlayerbotAIConfig->randomBotGuilds.push_back(guildId);
}
} while (res->NextRow());
}
}
LOG_INFO("playerbots", "{}/{} random bot guilds exist in guild table",guildNumber, sPlayerbotAIConfig->randomBotGuildCount);
if (guildNumber >= sPlayerbotAIConfig->randomBotGuildCount)
{
LOG_DEBUG("playerbots", "No new random guilds required");
return;
}
// We list the available leaders (online bots, not in guilds)
GuidVector availableLeaders;
availableLeaders.reserve(randomBots.size()); // limit reallocs
for (const uint32 botLowGuid : randomBots)
{
ObjectGuid leader = ObjectGuid::Create<HighGuid::Player>(botLowGuid);
if (sGuildMgr->GetGuildByLeader(leader))
{
// already GuildLeader -> ignored
continue;
} }
else else
{ {
Player* player = ObjectAccessor::FindPlayer(leader); if (Player* player = ObjectAccessor::FindPlayer(leader))
if (player && !player->GetGuildId()) {
availableLeaders.push_back(leader); if (!player->GetGuildId())
availableLeaders.push_back(leader);
}
} }
} }
LOG_DEBUG("playerbots", "{} available leaders for new guilds found", availableLeaders.size());
// Create up to randomBotGuildCount by counting only EFFECTIVE creations // Create up to randomBotGuildCount by counting only EFFECTIVE creations
uint32 createdThisRun = 0; uint32 createdThisRun = 0;
@@ -899,10 +943,10 @@ void RandomPlayerbotFactory::CreateRandomGuilds()
{ {
std::string const guildName = CreateRandomGuildName(); std::string const guildName = CreateRandomGuildName();
if (guildName.empty()) if (guildName.empty())
continue; break; // no more names available in playerbots_guild_names
if (sGuildMgr->GetGuildByName(guildName)) if (sGuildMgr->GetGuildByName(guildName))
continue; continue; // name already taken, skip
if (availableLeaders.empty()) if (availableLeaders.empty())
{ {
@@ -981,8 +1025,7 @@ void RandomPlayerbotFactory::CreateRandomGuilds()
} }
// Shows the true total and how many were created during this run // Shows the true total and how many were created during this run
LOG_INFO("playerbots", "{} random bot guilds available (created this run: {})", LOG_INFO("playerbots", "{} random bot guilds created this run)", createdThisRun);
uint32(sPlayerbotAIConfig->randomBotGuilds.size()), createdThisRun);
} }
std::string const RandomPlayerbotFactory::CreateRandomGuildName() std::string const RandomPlayerbotFactory::CreateRandomGuildName()