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

Fix faction count calculation error (#1085)

Browse Source 
* Fix faction count on add randombots

Co-authored-by: kadeshar <kadeshar@gmail.com>

* Fix class balance issue with periodic login and logout

---------

Co-authored-by: kadeshar <kadeshar@gmail.com>
This commit is contained in:
Yunfan Li
2025-03-18 02:40:03 +08:00
committed by GitHub
parent 015d6605a6
commit f039e88393
1 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/RandomPlayerbotMgr.cpp
View File

@@ -50,6 +50,12 @@
#include "World.h" #include "World.h"
#include "RandomPlayerbotFactory.h" #include "RandomPlayerbotFactory.h"
struct GuidClassRaceInfo {
ObjectGuid::LowType guid;
uint32 rClass;
uint32 rRace;
};
void PrintStatsThread() { sRandomPlayerbotMgr->PrintStats(); } void PrintStatsThread() { sRandomPlayerbotMgr->PrintStats(); }
void activatePrintStatsThread() void activatePrintStatsThread()
@@ -465,9 +471,17 @@ uint32 RandomPlayerbotMgr::AddRandomBots()
{ {
maxAllowedBotCount -= currentBots.size(); maxAllowedBotCount -= currentBots.size();
maxAllowedBotCount = std::min(sPlayerbotAIConfig->randomBotsPerInterval, maxAllowedBotCount); maxAllowedBotCount = std::min(sPlayerbotAIConfig->randomBotsPerInterval, maxAllowedBotCount);
uint32 totalRatio = sPlayerbotAIConfig->randomBotAllianceRatio + sPlayerbotAIConfig->randomBotHordeRatio;
uint32 allowedAllianceCount = maxAllowedBotCount * (sPlayerbotAIConfig->randomBotAllianceRatio) / totalRatio;
uint32 remainder = maxAllowedBotCount * (sPlayerbotAIConfig->randomBotAllianceRatio) % totalRatio;
// Fix #1082: Randomly add one based on reminder
if (remainder && urand(1, totalRatio) <= remainder) {
allowedAllianceCount++;
}
uint32 allowedAllianceCount = maxAllowedBotCount * (sPlayerbotAIConfig->randomBotAllianceRatio) /
(sPlayerbotAIConfig->randomBotAllianceRatio + sPlayerbotAIConfig->randomBotHordeRatio);
uint32 allowedHordeCount = maxAllowedBotCount - allowedAllianceCount; uint32 allowedHordeCount = maxAllowedBotCount - allowedAllianceCount;
for (std::vector<uint32>::iterator i = sPlayerbotAIConfig->randomBotAccounts.begin(); for (std::vector<uint32>::iterator i = sPlayerbotAIConfig->randomBotAccounts.begin();
@@ -493,11 +507,28 @@ uint32 RandomPlayerbotMgr::AddRandomBots()
PreparedQueryResult result = CharacterDatabase.Query(stmt); PreparedQueryResult result = CharacterDatabase.Query(stmt);
if (!result) if (!result)
continue; continue;
std::vector<uint32> guids;
do std::vector<GuidClassRaceInfo> allGuidInfos;
{
do {
Field* fields = result->Fetch(); Field* fields = result->Fetch();
ObjectGuid::LowType guid = fields[0].Get<uint32>(); GuidClassRaceInfo info;
info.guid = fields[0].Get<uint32>();
info.rClass = fields[1].Get<uint8>();
info.rRace = fields[2].Get<uint8>();
allGuidInfos.push_back(info);
} while (result->NextRow());
// random shuffle for class balance
std::mt19937 rnd(time(0));
std::shuffle(allGuidInfos.begin(), allGuidInfos.end(), rnd);
std::vector<uint32> guids;
for (const auto& info : allGuidInfos) {
ObjectGuid::LowType guid = info.guid;
uint32 rClass = info.rClass;
uint32 rRace = info.rRace;
if (GetEventValue(guid, "add")) if (GetEventValue(guid, "add"))
continue; continue;
@@ -510,40 +541,24 @@ uint32 RandomPlayerbotMgr::AddRandomBots()
if (std::find(currentBots.begin(), currentBots.end(), guid) != currentBots.end()) if (std::find(currentBots.begin(), currentBots.end(), guid) != currentBots.end())
continue; continue;
if (sPlayerbotAIConfig->disableDeathKnightLogin) if (sPlayerbotAIConfig->disableDeathKnightLogin) {
{ if (rClass == CLASS_DEATH_KNIGHT) {
uint32 rClass = fields[1].Get<uint8>();
if (rClass == CLASS_DEATH_KNIGHT)
{
continue; continue;
} }
} }
uint32 rRace = fields[2].Get<uint8>();
uint32 isAlliance = IsAlliance(rRace); uint32 isAlliance = IsAlliance(rRace);
if (!allowedAllianceCount && isAlliance) bool factionNotAllowed = (!allowedAllianceCount && isAlliance) || (!allowedHordeCount && !isAlliance);
{
if (factionNotAllowed)
continue; continue;
}
if (!allowedHordeCount && !isAlliance) if (isAlliance) {
{
continue;
}
if (isAlliance)
{
allowedAllianceCount--; allowedAllianceCount--;
} } else {
else
{
allowedHordeCount--; allowedHordeCount--;
} }
guids.push_back(guid);
} while (result->NextRow());
std::mt19937 rnd(time(0));
std::shuffle(guids.begin(), guids.end(), rnd);
for (uint32& guid : guids)
{
uint32 add_time = sPlayerbotAIConfig->enablePeriodicOnlineOffline uint32 add_time = sPlayerbotAIConfig->enablePeriodicOnlineOffline
? urand(sPlayerbotAIConfig->minRandomBotInWorldTime, ? urand(sPlayerbotAIConfig->minRandomBotInWorldTime,
sPlayerbotAIConfig->maxRandomBotInWorldTime) sPlayerbotAIConfig->maxRandomBotInWorldTime)