From 4eb40c03952840c6c8ba7e79c5c0730702c1ae58 Mon Sep 17 00:00:00 2001 From: bash Date: Thu, 17 Oct 2024 20:28:56 +0000 Subject: [PATCH] minor bugfix and back to original cmangos values --- src/PlayerbotAI.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PlayerbotAI.cpp b/src/PlayerbotAI.cpp index 94bc7d2d..023ec7b6 100644 --- a/src/PlayerbotAI.cpp +++ b/src/PlayerbotAI.cpp @@ -4224,19 +4224,18 @@ std::pair PlayerbotAI::GetPriorityBracket(ActivePiorityType type case ActivePiorityType::PLAYER_GUILD: return {0, 50}; case ActivePiorityType::IN_ACTIVE_AREA: - return {30, 100}; - case ActivePiorityType::IN_ACTIVE_MAP: - return {50, 100}; - case ActivePiorityType::IN_INACTIVE_MAP: - return {70, 100}; case ActivePiorityType::IN_EMPTY_SERVER: + return {50, 100}; + case ActivePiorityType::IN_ACTIVE_MAP: + return {70, 100}; + case ActivePiorityType::IN_INACTIVE_MAP: return {80, 100}; default: return {90, 100}; } return {90, 100}; -} +} bool PlayerbotAI::AllowActive(ActivityType activityType) { @@ -4300,7 +4299,8 @@ bool PlayerbotAI::AllowActive(ActivityType activityType) } // GetPriorityBracket acitivity - float activePerc = 100; + float normalizedBotActiveAlone = sPlayerbotAIConfig->botActiveAlone > 100 ? 100 : sPlayerbotAIConfig->botActiveAlone; + float activePerc = normalizedBotActiveAlone; if (sPlayerbotAIConfig->botActiveAloneSmartScale && bot->GetLevel() >= sPlayerbotAIConfig->botActiveAloneSmartScaleWhenMinLevel && bot->GetLevel() <= sPlayerbotAIConfig->botActiveAloneSmartScaleWhenMaxLevel) @@ -4311,7 +4311,7 @@ bool PlayerbotAI::AllowActive(ActivityType activityType) if (priorityBracket.first >= activityPercentage) return false; if (priorityBracket.second <= activityPercentage && priorityBracket.second < 100) return true; activePerc = (activityPercentage - priorityBracket.first) / (priorityBracket.second - priorityBracket.first); - activePerc *= (priorityBracket.second == 100) ? sPlayerbotAIConfig->botActiveAlone : 100; + activePerc *= (priorityBracket.second == 100) ? normalizedBotActiveAlone : 100; } // The last number if the amount it cycles per min. Currently set to 1% of the active bots.