Modified the botActiveAlone autoscale functionality by making it expl…

…icit and enabled by default
liyunfan1223 · Sep 30, 2024 · 3eea353 · 3eea353
1 parent 54a8445
commit 3eea353
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 30 deletions.
diff --git a/conf/playerbots.conf.dist b/conf/playerbots.conf.dist
@@ -1462,6 +1462,11 @@ AiPlayerbot.RandombotsWalkingRPG.InDoors = 0
 # The default is 10. With 10% of all bots going active or inactive each minute.
 AiPlayerbot.BotActiveAlone = 100
 
+# Specify 1 for enabled, 0 for disabled.
+# The default is 1. Automatically adjusts 'BotActiveAlone' percentage based on server 
+# latency. Which provides the server additional breathing space when needed.
+AiPlayerbot.botActiveAloneAutoScale = 1
+
 # Premade spell to avoid (undetected spells)
 # spellid-radius, ...
 AiPlayerbot.PremadeAvoidAoe = 62234-4

diff --git a/src/PlayerbotAI.cpp b/src/PlayerbotAI.cpp
@@ -4063,8 +4063,6 @@ bool PlayerbotAI::AllowActive(ActivityType activityType)
             return true;
     }
 
-    uint32 maxDiff = sWorldUpdateTime.GetMaxUpdateTime();
-
     Group* group = bot->GetGroup();
     if (group)
     {
@@ -4144,35 +4142,31 @@ bool PlayerbotAI::AllowActive(ActivityType activityType)
     if (sPlayerbotAIConfig->botActiveAlone <= 0)
         return false;
 
-    if (sPlayerbotAIConfig->botActiveAlone >= 100)
-        return true;
-
-    if (maxDiff > 1000)
-        return false;
-
-    uint32 mod = 100;
-
-    // if has real players - slow down continents without player
-    if (maxDiff > 100)
-        mod = 50;
-
-    if (maxDiff > 150)
-        mod = 25;
-
-    if (maxDiff > 200)
-        mod = 10;
-
-    if (maxDiff > 250)
-    {
-        if (Map* map = bot->GetMap())
-        {
-            if (map->GetEntry()->IsWorldMap())
+    // use the configured 'botActiveAlone 'percentages. Downscale the activity, within 
+    // reason ,with the intension to give the server some breathing space when needed.
+    uint32 mod = sPlayerbotAIConfig->botActiveAlone > 100 ? 100 : sPlayerbotAIConfig->botActiveAlone;
+
+    if (sPlayerbotAIConfig->botActiveAloneAutoScale) {
+        uint32 maxDiff = sWorldUpdateTime.GetMaxUpdateTime();
+        if (maxDiff > 1000)
+            return false;
+        if (maxDiff > 100)
+            mod = 50;
+        if (maxDiff > 150)
+            mod = 25;
+        if (maxDiff > 200)
+            mod = 10;
+        if (maxDiff > 250)
+        {
+            if (Map* map = bot->GetMap())
             {
-                if (!HasRealPlayers(map))
-                    return false;
-
-                if (!map->IsGridLoaded(bot->GetPositionX(), bot->GetPositionY()))
-                    return false;
+                if (map->GetEntry()->IsWorldMap())
+                {
+                    if (!HasRealPlayers(map))
+                        return false;
+                    if (!map->IsGridLoaded(bot->GetPositionX(), bot->GetPositionY()))
+                        return false;
+                }
             }
         }
     }

diff --git a/src/PlayerbotAIConfig.cpp b/src/PlayerbotAIConfig.cpp
@@ -465,6 +465,7 @@ bool PlayerbotAIConfig::Initialize()
     playerbotsXPrate = sConfigMgr->GetOption<int32>("AiPlayerbot.KillXPRate", 1);
     disableDeathKnightLogin = sConfigMgr->GetOption<bool>("AiPlayerbot.DisableDeathKnightLogin", 0);
     botActiveAlone = sConfigMgr->GetOption<int32>("AiPlayerbot.BotActiveAlone", 100);
+    botActiveAloneAutoScale = sConfigMgr->GetOption<bool>("AiPlayerbot.botActiveAloneAutoScale", true);
 
     enablePrototypePerformanceDiff = sConfigMgr->GetOption<bool>("AiPlayerbot.EnablePrototypePerformanceDiff", false);
     diffWithPlayer = sConfigMgr->GetOption<int32>("AiPlayerbot.DiffWithPlayer", 100);

diff --git a/src/PlayerbotAIConfig.h b/src/PlayerbotAIConfig.h
@@ -263,6 +263,7 @@ class PlayerbotAIConfig
     uint32 playerbotsXPrate;
     bool disableDeathKnightLogin;
     uint32 botActiveAlone;
+    bool botActiveAloneAutoScale;
 
     uint32 enablePrototypePerformanceDiff;
     uint32 diffWithPlayer;