Log if character creation fails without removing the bot anymore

jackpoz · Aug 10, 2019 · 7424e05 · 7424e05
1 parent 1471af4
commit 7424e05
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/BotFarm/BotFactory.cs b/BotFarm/BotFactory.cs
@@ -139,7 +139,6 @@ public BotGame CreateBot(bool startBot)
                                                 Settings.Default.RealmID,
                                                 0,
                                                 botBehavior);
-            game.SettingUp = true;
             if (startBot)
                 game.Start();
             botInfos.Add(new BotInfo(username, password, botBehavior.Name));

diff --git a/BotFarm/BotGame.cs b/BotFarm/BotGame.cs
@@ -20,12 +20,6 @@ namespace BotFarm
 {
     class BotGame : AutomatedGame
     {
-        public bool SettingUp
-        {
-            get;
-            set;
-        }
-
         public BotBehaviorSettings Behavior
         {
             get;
@@ -202,13 +196,13 @@ public override void Start()
 
         public override void NoCharactersFound()
         {
-            if (!SettingUp)
-            {
-                Log("Removing current bot because there are no characters");
-                BotFactory.Instance.RemoveBot(this);
-            }
-            else
-                CreateCharacter(Race.Human, Class.Priest);
+            CreateCharacter(Race.Human, Class.Priest);
+        }
+
+        public override void CharacterCreationFailed(CommandDetail result)
+        {
+#warning ToDo: create a character with a different name
+            Log($"Bot {Username} failed creating a character with error {result.ToString()}", LogLevel.Error);
         }
 
         public override void InvalidCredentials()

diff --git a/Client/AutomatedGame.cs b/Client/AutomatedGame.cs
@@ -420,6 +420,11 @@ public async Task Dispose()
         public virtual void NoCharactersFound()
         { }
 
+        public virtual void CharacterCreationFailed(CommandDetail result)
+        {
+            NoCharactersFound();
+        }
+
         public virtual void InvalidCredentials()
         { }
 
@@ -818,7 +823,7 @@ protected void HandleCharCreate(InPacket packet)
             if (response == CommandDetail.CHAR_CREATE_SUCCESS)
                 SendPacket(new OutPacket(WorldCommand.CMSG_CHAR_ENUM));
             else
-                NoCharactersFound();
+                CharacterCreationFailed(response);
         }
 
         [PacketHandler(WorldCommand.SMSG_LOGOUT_RESPONSE)]

diff --git a/Client/World/Network/AuthResponse.cs b/Client/World/Network/AuthResponse.cs
@@ -5,7 +5,7 @@
 
 namespace Client.World.Network
 {
-    enum CommandDetail : byte
+    public enum CommandDetail : byte
     {
         AUTH_OK = 12,
         AUTH_FAILED = 13,