Alt login: Major refactor. Added config to allow preloading botlogin …

…info instead of just when needed. Expanded the login criteria to allow for more flexibility.
cmangos · Dec 11, 2024 · ab05467 · ab05467
1 parent 122cb4b
commit ab05467
Show file tree

Hide file tree

Showing 8 changed files with 402 additions and 401 deletions.
diff --git a/playerbot/PlayerbotAIConfig.cpp b/playerbot/PlayerbotAIConfig.cpp
@@ -264,11 +264,27 @@ bool PlayerbotAIConfig::Initialize()
 
     randomBotLoginWithPlayer = config.GetBoolDefault("AiPlayerbot.RandomBotLoginWithPlayer", false);
     asyncBotLogin = config.GetBoolDefault("AiPlayerbot.AsyncBotLogin", false);
+    preloadHolders = config.GetBoolDefault("AiPlayerbot.PreloadHolders", false);
+
     freeRoomForNonSpareBots = config.GetIntDefault("AiPlayerbot.FreeRoomForNonSpareBots", 1);
 
     loginBotsNearPlayerRange = config.GetIntDefault("AiPlayerbot.LoginBotsNearPlayerRange", 1000);
 
-    LoadListString<std::vector<std::string> >(config.GetStringDefault("AiPlayerbot.LoginCriteria", "classrace,guild"), loginCriteria);
+    LoadListString<std::vector<std::string> >(config.GetStringDefault("AiPlayerbot.DefaultLoginCriteria", "maxbots,spareroom,logoff,offline"), defaultLoginCriteria);
+
+    std::vector<std::string> criteriaValues = configA->GetValues("AiPlayerbot.LoginCriteria");
+    for (auto& value : criteriaValues)
+    {
+        loginCriteria.push_back({});
+        LoadListString<std::vector<std::string> >(config.GetStringDefault(value, ""), loginCriteria.back());
+    }
+
+    if (criteriaValues.empty())
+    {
+        loginCriteria.push_back({"guild"});
+        loginCriteria.push_back({"classrace,level"});
+    }
+
 
     for (uint32 level = 1; level <= DEFAULT_MAX_LEVEL; ++level)
     {
@@ -765,12 +781,6 @@ bool PlayerbotAIConfig::Initialize()
     if (sPlayerbotAIConfig.randomBotJoinBG)
         sRandomPlayerbotMgr.LoadBattleMastersCache();
 
-    if (sPlayerbotAIConfig.asyncBotLogin)
-    {
-        std::thread t([] {sPlayerBotLoginMgr.LoadBotsFromDb(); });
-        t.detach();
-    }
-
     sLog.outString("---------------------------------------");
     sLog.outString("        AI Playerbot initialized       ");
     sLog.outString("---------------------------------------");

diff --git a/playerbot/PlayerbotAIConfig.h b/playerbot/PlayerbotAIConfig.h
@@ -304,10 +304,11 @@ class PlayerbotAIConfig
     bool respawnModForPlayerBots, respawnModForInstances;
 
     bool randomBotLoginWithPlayer;
-    bool asyncBotLogin;
+    bool asyncBotLogin, preloadHolders;
     uint32 freeRoomForNonSpareBots;
     uint32 loginBotsNearPlayerRange;
-    std::vector<std::string> loginCriteria;
+    std::vector<std::string> defaultLoginCriteria;
+    std::vector<std::vector<std::string>> loginCriteria;
 
     bool jumpInBg;
     bool jumpWithPlayer;