nchebrov/mod-player-bot-level-brackets
1
0
Fork 0
mirror of https://github.com/kadeshar/mod-player-bot-level-brackets.git synced 2026-01-13 01:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63 from DustinHendrickson/revert-62-feat/ignore_arena_team

Browse Source 
Revert "feat: ignore arena team for downgrade"

Players reporting this broke processing. Noticed some weird stuff when I re-reviewed it. Reverting.
This commit is contained in:
Dustin Hendrickson
2025-10-11 22:22:20 -05:00
committed by GitHub
parent 827ae6ac12 af1ee91c17
commit a5eb4c6855
2 changed files with 38 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
conf/mod_player_bot_level_brackets.conf.dist
View File

@@ -44,7 +44,7 @@ BotLevelBrackets.FlaggedProcessLimit = 5
# #
# BotLevelBrackets.IgnoreGuildBotsWithRealPlayers # BotLevelBrackets.IgnoreGuildBotsWithRealPlayers
# Description: When enabled, bots that are in a guild with at least one real (non-bot) player are excluded # Description: When enabled, bots that are in a guild with at least one real (non-bot) player are excluded
# from bot bracket calculations and will not be level changed or flagged. # from bot bracket calculations and will not be level changed or flagged.
# This now works for both online and offline real players using persistent database tracking. # This now works for both online and offline real players using persistent database tracking.
# Default: 1 (enabled) # Default: 1 (enabled)
@@ -84,7 +84,7 @@ BotLevelBrackets.NumRanges = 9
# #
# BotLevelBrackets.Dynamic.UseDynamicDistribution # BotLevelBrackets.Dynamic.UseDynamicDistribution
# Description: Enables dynamic recalculation of bot distribution percentages based on the number of non-bot players # Description: Enables dynamic recalculation of bot distribution percentages based on the number of non-bot players
# present in each level bracket. # present in each level bracket.
# Default: 0 (disabled) # Default: 0 (disabled)
# Valid values: 0 (off) / 1 (on) # Valid values: 0 (off) / 1 (on)
@@ -120,14 +120,6 @@ BotLevelBrackets.Dynamic.RealPlayerWeight = 1.0
# #
BotLevelBrackets.Dynamic.SyncFactions = 0 BotLevelBrackets.Dynamic.SyncFactions = 0
#
# BotLevelBrackets.IgnoreArenaTeamBots
# Description: Ignore bots that are members of any arena team (prevents downgrades)
# Default: 1 (enabled)
# Valid values: 0 (off) / 1 (on)
#
BotLevelBrackets.IgnoreArenaTeamBots = 1
############################################## ##############################################
# Alliance Level Brackets Configuration # Alliance Level Brackets Configuration
############################################## ##############################################

99
src/mod-player-bot-level-brackets.cpp
View File

@@ -61,7 +61,6 @@ static bool g_BotDistLiteDebugMode = false;
static bool g_UseDynamicDistribution = false; static bool g_UseDynamicDistribution = false;
static bool g_IgnoreFriendListed = true; static bool g_IgnoreFriendListed = true;
static uint32 g_FlaggedProcessLimit = 5; // 0 = unlimited static uint32 g_FlaggedProcessLimit = 5; // 0 = unlimited
static bool g_IgnoreArenaTeamBots = true;
// Real player weight to boost bracket contributions. // Real player weight to boost bracket contributions.
static float g_RealPlayerWeight = 1.0f; static float g_RealPlayerWeight = 1.0f;
@@ -109,7 +108,7 @@ static void LoadBotLevelBracketsConfig()
{ {
g_BotLevelBracketsEnabled = sConfigMgr->GetOption<bool>("BotLevelBrackets.Enabled", true); g_BotLevelBracketsEnabled = sConfigMgr->GetOption<bool>("BotLevelBrackets.Enabled", true);
g_IgnoreGuildBotsWithRealPlayers = sConfigMgr->GetOption<bool>("BotLevelBrackets.IgnoreGuildBotsWithRealPlayers", true); g_IgnoreGuildBotsWithRealPlayers = sConfigMgr->GetOption<bool>("BotLevelBrackets.IgnoreGuildBotsWithRealPlayers", true);
g_IgnoreArenaTeamBots = sConfigMgr->GetOption<bool>("BotLevelBrackets.IgnoreArenaTeamBots", true);
g_BotDistFullDebugMode = sConfigMgr->GetOption<bool>("BotLevelBrackets.FullDebugMode", false); g_BotDistFullDebugMode = sConfigMgr->GetOption<bool>("BotLevelBrackets.FullDebugMode", false);
g_BotDistLiteDebugMode = sConfigMgr->GetOption<bool>("BotLevelBrackets.LiteDebugMode", false); g_BotDistLiteDebugMode = sConfigMgr->GetOption<bool>("BotLevelBrackets.LiteDebugMode", false);
g_BotDistCheckFrequency = sConfigMgr->GetOption<uint32>("BotLevelBrackets.CheckFrequency", 300); g_BotDistCheckFrequency = sConfigMgr->GetOption<uint32>("BotLevelBrackets.CheckFrequency", 300);
@@ -168,8 +167,8 @@ static void LoadBotLevelBracketsConfig()
LOG_ERROR("server.loading", "[BotLevelBrackets] FATAL: Bracket mismatch detected between factions at index {}. " LOG_ERROR("server.loading", "[BotLevelBrackets] FATAL: Bracket mismatch detected between factions at index {}. "
"Alliance: {}-{}, Horde: {}-{}. " "Alliance: {}-{}, Horde: {}-{}. "
"When SyncFactions is enabled, both bracket number and min/max levels must match exactly. " "When SyncFactions is enabled, both bracket number and min/max levels must match exactly. "
"Check your configuration.", "Check your configuration.",
i, g_AllianceLevelRanges[i].lower, g_AllianceLevelRanges[i].upper, i, g_AllianceLevelRanges[i].lower, g_AllianceLevelRanges[i].upper,
g_HordeLevelRanges[i].lower, g_HordeLevelRanges[i].upper); g_HordeLevelRanges[i].lower, g_HordeLevelRanges[i].upper);
std::terminate(); std::terminate();
} }
@@ -202,29 +201,6 @@ static bool IsPlayerBot(Player* player)
return botAI && botAI->IsBotAI(); return botAI && botAI->IsBotAI();
} }
/**
* @brief Checks if player is in arena team.
*
* Checks if player is in arena team
*
* @param p Pointer to the Player object to check.
* @return true if the player is in a team.
*/
static bool BotInArenaTeam(Player* p)
{
if (!p || !p->IsInWorld() || !p->GetSession() || p->GetSession()->isLogingOut() || p->IsDuringRemoveFromWorld())
return false;
// Check if player is in an arena team
for (uint32 arena_slot = 0; arena_slot < MAX_ARENA_SLOT; ++arena_slot)
{
uint32 arenaTeamId = p->GetArenaTeamId(arena_slot);
if (arenaTeamId)
return true;
}
return false;
}
/** /**
* @brief Checks if the given player is a random bot. * @brief Checks if the given player is a random bot.
@@ -382,7 +358,7 @@ static void LoadPersistentGuildTracker()
{ {
g_PersistentRealPlayerGuildIds.clear(); g_PersistentRealPlayerGuildIds.clear();
QueryResult result = CharacterDatabase.Query("SELECT guild_id FROM bot_level_brackets_guild_tracker WHERE has_real_players = 1"); QueryResult result = CharacterDatabase.Query("SELECT guild_id FROM bot_level_brackets_guild_tracker WHERE has_real_players = 1");
if (!result) if (!result)
{ {
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
@@ -391,12 +367,12 @@ static void LoadPersistentGuildTracker()
} }
return; return;
} }
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Loading persistent guild tracker data from database..."); LOG_INFO("server.loading", "[BotLevelBrackets] Loading persistent guild tracker data from database...");
} }
do do
{ {
uint32 guildId = result->Fetch()->Get<uint32>(); uint32 guildId = result->Fetch()->Get<uint32>();
@@ -406,7 +382,7 @@ static void LoadPersistentGuildTracker()
LOG_INFO("server.loading", "[BotLevelBrackets] Loaded guild {} as having real players.", guildId); LOG_INFO("server.loading", "[BotLevelBrackets] Loaded guild {} as having real players.", guildId);
} }
} while (result->NextRow()); } while (result->NextRow());
if (g_BotDistFullDebugMode || g_BotDistLiteDebugMode) if (g_BotDistFullDebugMode || g_BotDistLiteDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Loaded {} guilds with real players from persistent storage.", g_PersistentRealPlayerGuildIds.size()); LOG_INFO("server.loading", "[BotLevelBrackets] Loaded {} guilds with real players from persistent storage.", g_PersistentRealPlayerGuildIds.size());
@@ -427,17 +403,17 @@ static void UpdatePersistentGuildTracker()
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Starting additive-only persistent guild tracker update..."); LOG_INFO("server.loading", "[BotLevelBrackets] Starting additive-only persistent guild tracker update...");
} }
// Find guilds with currently online real players // Find guilds with currently online real players
std::unordered_set<uint32> currentRealPlayerGuilds; std::unordered_set<uint32> currentRealPlayerGuilds;
const auto& allPlayers = ObjectAccessor::GetPlayers(); const auto& allPlayers = ObjectAccessor::GetPlayers();
for (const auto& itr : allPlayers) for (const auto& itr : allPlayers)
{ {
Player* player = itr.second; Player* player = itr.second;
if (!player || !player->IsInWorld()) if (!player || !player->IsInWorld())
continue; continue;
if (!IsPlayerBot(player)) if (!IsPlayerBot(player))
{ {
uint32 guildId = player->GetGuildId(); uint32 guildId = player->GetGuildId();
@@ -447,9 +423,9 @@ static void UpdatePersistentGuildTracker()
} }
} }
} }
uint32 addedCount = 0; uint32 addedCount = 0;
// Update or insert guilds with real players - ensure has_real_players is set to 1 // Update or insert guilds with real players - ensure has_real_players is set to 1
for (uint32 guildId : currentRealPlayerGuilds) for (uint32 guildId : currentRealPlayerGuilds)
{ {
@@ -459,15 +435,15 @@ static void UpdatePersistentGuildTracker()
"VALUES ({}, 1)", "VALUES ({}, 1)",
guildId guildId
); );
// Add to our in-memory cache // Add to our in-memory cache
g_PersistentRealPlayerGuildIds.insert(guildId); g_PersistentRealPlayerGuildIds.insert(guildId);
addedCount++; addedCount++;
} }
if (g_BotDistFullDebugMode || g_BotDistLiteDebugMode) if (g_BotDistFullDebugMode || g_BotDistLiteDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Additive guild tracker update complete. {} guilds processed, {} total tracked guilds.", LOG_INFO("server.loading", "[BotLevelBrackets] Additive guild tracker update complete. {} guilds processed, {} total tracked guilds.",
addedCount, g_PersistentRealPlayerGuildIds.size()); addedCount, g_PersistentRealPlayerGuildIds.size());
} }
} }
@@ -486,7 +462,7 @@ static void CleanupGuildTracker()
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Starting guild tracker cleanup - removing guilds with no online real players..."); LOG_INFO("server.loading", "[BotLevelBrackets] Starting guild tracker cleanup - removing guilds with no online real players...");
} }
// Get current guilds with online real players // Get current guilds with online real players
std::unordered_set<uint32> currentRealPlayerGuilds; std::unordered_set<uint32> currentRealPlayerGuilds;
const auto& allPlayers = ObjectAccessor::GetPlayers(); const auto& allPlayers = ObjectAccessor::GetPlayers();
@@ -495,7 +471,7 @@ static void CleanupGuildTracker()
Player* player = itr.second; Player* player = itr.second;
if (!player || !player->IsInWorld()) if (!player || !player->IsInWorld())
continue; continue;
if (!IsPlayerBot(player)) if (!IsPlayerBot(player))
{ {
uint32 guildId = player->GetGuildId(); uint32 guildId = player->GetGuildId();
@@ -505,7 +481,7 @@ static void CleanupGuildTracker()
} }
} }
} }
// Find guilds to remove (those in tracker but not in current real player guilds) // Find guilds to remove (those in tracker but not in current real player guilds)
std::vector<uint32> guildsToRemove; std::vector<uint32> guildsToRemove;
for (uint32 trackedGuildId : g_PersistentRealPlayerGuildIds) for (uint32 trackedGuildId : g_PersistentRealPlayerGuildIds)
@@ -515,7 +491,7 @@ static void CleanupGuildTracker()
guildsToRemove.push_back(trackedGuildId); guildsToRemove.push_back(trackedGuildId);
} }
} }
// Remove guilds that no longer have real players online // Remove guilds that no longer have real players online
uint32 removedCount = 0; uint32 removedCount = 0;
for (uint32 guildId : guildsToRemove) for (uint32 guildId : guildsToRemove)
@@ -525,21 +501,21 @@ static void CleanupGuildTracker()
"UPDATE bot_level_brackets_guild_tracker SET has_real_players = 0 WHERE guild_id = {}", "UPDATE bot_level_brackets_guild_tracker SET has_real_players = 0 WHERE guild_id = {}",
guildId guildId
); );
// Remove from in-memory caches // Remove from in-memory caches
g_PersistentRealPlayerGuildIds.erase(guildId); g_PersistentRealPlayerGuildIds.erase(guildId);
g_RealPlayerGuildIds.erase(guildId); g_RealPlayerGuildIds.erase(guildId);
removedCount++; removedCount++;
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Removed guild {} from tracker - no real players online.", guildId); LOG_INFO("server.loading", "[BotLevelBrackets] Removed guild {} from tracker - no real players online.", guildId);
} }
} }
if (g_BotDistFullDebugMode || g_BotDistLiteDebugMode) if (g_BotDistFullDebugMode || g_BotDistLiteDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Guild tracker cleanup complete. {} guilds removed, {} guilds remain.", LOG_INFO("server.loading", "[BotLevelBrackets] Guild tracker cleanup complete. {} guilds removed, {} guilds remain.",
removedCount, g_PersistentRealPlayerGuildIds.size()); removedCount, g_PersistentRealPlayerGuildIds.size());
} }
} }
@@ -654,7 +630,7 @@ static void AdjustBotToRange(Player* bot, int targetRangeIndex, const LevelRange
{ {
return; return;
} }
if (targetRangeIndex < 0 || targetRangeIndex >= g_NumRanges) if (targetRangeIndex < 0 || targetRangeIndex >= g_NumRanges)
{ {
return; return;
@@ -1020,7 +996,7 @@ static void ProcessPendingLevelResets()
break; break;
Player* bot = ObjectAccessor::FindPlayer(it->botGuid); Player* bot = ObjectAccessor::FindPlayer(it->botGuid);
if (!bot) if (!bot)
{ {
it = g_PendingLevelResets.erase(it); it = g_PendingLevelResets.erase(it);
@@ -1052,8 +1028,6 @@ static void ProcessPendingLevelResets()
continue; continue;
} }
if (g_IgnoreArenaTeamBots && BotInArenaTeam(bot)) { it = g_PendingLevelResets.erase(it); continue; }
if (bot && bot->IsInWorld() && IsBotSafeForLevelReset(bot)) if (bot && bot->IsInWorld() && IsBotSafeForLevelReset(bot))
{ {
AdjustBotToRange(bot, targetRange, it->factionRanges); AdjustBotToRange(bot, targetRange, it->factionRanges);
@@ -1253,7 +1227,7 @@ public:
{ {
return; return;
} }
m_timer += diff; m_timer += diff;
m_flaggedTimer += diff; m_flaggedTimer += diff;
m_guildTrackerTimer += diff; m_guildTrackerTimer += diff;
@@ -1305,7 +1279,6 @@ public:
continue; continue;
if (IsPlayerBot(player)) if (IsPlayerBot(player))
continue; // Only count real players. continue; // Only count real players.
if (g_IgnoreArenaTeamBots && BotInArenaTeam(player)) continue;
int rangeIndex = GetOrFlagPlayerBracket(player); int rangeIndex = GetOrFlagPlayerBracket(player);
if (rangeIndex < 0) if (rangeIndex < 0)
continue; continue;
@@ -1402,7 +1375,7 @@ public:
} }
} }
} }
uint32 totalAllianceBots = 0; uint32 totalAllianceBots = 0;
std::vector<int> allianceActualCounts(g_NumRanges, 0); std::vector<int> allianceActualCounts(g_NumRanges, 0);
std::vector< std::vector<Player*> > allianceBotsByRange(g_NumRanges); std::vector< std::vector<Player*> > allianceBotsByRange(g_NumRanges);
@@ -1469,7 +1442,7 @@ public:
allianceBotsByRange[rangeIndex].push_back(player); allianceBotsByRange[rangeIndex].push_back(player);
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Alliance bot '{}' with level {} added to range {}.", LOG_INFO("server.loading", "[BotLevelBrackets] Alliance bot '{}' with level {} added to range {}.",
player->GetName(), player->GetLevel(), rangeIndex + 1); player->GetName(), player->GetLevel(), rangeIndex + 1);
} }
} }
@@ -1488,7 +1461,7 @@ public:
hordeBotsByRange[rangeIndex].push_back(player); hordeBotsByRange[rangeIndex].push_back(player);
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Horde bot '{}' with level {} added to range {}.", LOG_INFO("server.loading", "[BotLevelBrackets] Horde bot '{}' with level {} added to range {}.",
player->GetName(), player->GetLevel(), rangeIndex + 1); player->GetName(), player->GetLevel(), rangeIndex + 1);
} }
} }
@@ -1520,7 +1493,7 @@ public:
allianceDesiredCounts[i] = static_cast<int>(round((g_AllianceLevelRanges[i].desiredPercent / 100.0) * totalAllianceBots)); allianceDesiredCounts[i] = static_cast<int>(round((g_AllianceLevelRanges[i].desiredPercent / 100.0) * totalAllianceBots));
if (g_BotDistFullDebugMode || g_BotDistLiteDebugMode) if (g_BotDistFullDebugMode || g_BotDistLiteDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Alliance Range {} ({}-{}): Desired = {}, Actual = {}.", LOG_INFO("server.loading", "[BotLevelBrackets] Alliance Range {} ({}-{}): Desired = {}, Actual = {}.",
i + 1, g_AllianceLevelRanges[i].lower, g_AllianceLevelRanges[i].upper, i + 1, g_AllianceLevelRanges[i].lower, g_AllianceLevelRanges[i].upper,
allianceDesiredCounts[i], allianceActualCounts[i]); allianceDesiredCounts[i], allianceActualCounts[i]);
} }
@@ -1579,7 +1552,7 @@ public:
g_PendingLevelResets.push_back({bot->GetGUID(), targetRange, g_AllianceLevelRanges.data()}); g_PendingLevelResets.push_back({bot->GetGUID(), targetRange, g_AllianceLevelRanges.data()});
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Alliance bot '{}' flagged for pending level reset to range {}-{}.", LOG_INFO("server.loading", "[BotLevelBrackets] Alliance bot '{}' flagged for pending level reset to range {}-{}.",
bot->GetName(), g_AllianceLevelRanges[targetRange].lower, g_AllianceLevelRanges[targetRange].upper); bot->GetName(), g_AllianceLevelRanges[targetRange].lower, g_AllianceLevelRanges[targetRange].upper);
} }
} }
@@ -1619,7 +1592,7 @@ public:
g_PendingLevelResets.push_back({bot->GetGUID(), targetRange, g_AllianceLevelRanges.data()}); g_PendingLevelResets.push_back({bot->GetGUID(), targetRange, g_AllianceLevelRanges.data()});
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Alliance flagged bot '{}' flagged for pending level reset to range {}-{}.", LOG_INFO("server.loading", "[BotLevelBrackets] Alliance flagged bot '{}' flagged for pending level reset to range {}-{}.",
bot->GetName(), g_AllianceLevelRanges[targetRange].lower, g_AllianceLevelRanges[targetRange].upper); bot->GetName(), g_AllianceLevelRanges[targetRange].lower, g_AllianceLevelRanges[targetRange].upper);
} }
} }
@@ -1700,7 +1673,7 @@ public:
g_PendingLevelResets.push_back({bot->GetGUID(), targetRange, g_HordeLevelRanges.data()}); g_PendingLevelResets.push_back({bot->GetGUID(), targetRange, g_HordeLevelRanges.data()});
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Horde bot '{}' flagged for pending level reset to range {}-{}.", LOG_INFO("server.loading", "[BotLevelBrackets] Horde bot '{}' flagged for pending level reset to range {}-{}.",
bot->GetName(), g_HordeLevelRanges[targetRange].lower, g_HordeLevelRanges[targetRange].upper); bot->GetName(), g_HordeLevelRanges[targetRange].lower, g_HordeLevelRanges[targetRange].upper);
} }
} }
@@ -1739,7 +1712,7 @@ public:
g_PendingLevelResets.push_back({bot->GetGUID(), targetRange, g_HordeLevelRanges.data()}); g_PendingLevelResets.push_back({bot->GetGUID(), targetRange, g_HordeLevelRanges.data()});
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Horde flagged bot '{}' flagged for pending level reset to range {}-{}.", LOG_INFO("server.loading", "[BotLevelBrackets] Horde flagged bot '{}' flagged for pending level reset to range {}-{}.",
bot->GetName(), g_HordeLevelRanges[targetRange].lower, g_HordeLevelRanges[targetRange].upper); bot->GetName(), g_HordeLevelRanges[targetRange].lower, g_HordeLevelRanges[targetRange].upper);
} }
} }
@@ -1762,7 +1735,7 @@ public:
for (int i = 0; i < g_NumRanges; ++i) for (int i = 0; i < g_NumRanges; ++i)
{ {
allianceDesiredCounts[i] = static_cast<int>(round((g_AllianceLevelRanges[i].desiredPercent / 100.0) * totalAllianceBots)); allianceDesiredCounts[i] = static_cast<int>(round((g_AllianceLevelRanges[i].desiredPercent / 100.0) * totalAllianceBots));
LOG_INFO("server.loading", "[BotLevelBrackets] Alliance Range {} ({}-{}): Desired = {}, Actual = {}.", LOG_INFO("server.loading", "[BotLevelBrackets] Alliance Range {} ({}-{}): Desired = {}, Actual = {}.",
i + 1, g_AllianceLevelRanges[i].lower, g_AllianceLevelRanges[i].upper, i + 1, g_AllianceLevelRanges[i].lower, g_AllianceLevelRanges[i].upper,
allianceDesiredCounts[i], allianceActualCounts[i]); allianceDesiredCounts[i], allianceActualCounts[i]);
} }
@@ -1794,7 +1767,7 @@ public:
{ {
return; return;
} }
CleanupGuildTracker(); CleanupGuildTracker();
} }