Merge pull request #122 from Erol444/fix-16-06-2022

Fix 16 06 2022

Author: vinaghost

TbsCore/Core/PostLoadHelper.cs

@@ -228,13 +228,6 @@ public static List<Action> GetPostLoadTasks(Account acc)
                     {
                         acc.Tasks.Add(  new TTWarsBuyAdventure() { ExecuteAt = DateTime.Now.AddSeconds(5) }, true);
                     }
-                    if (acc.Hero.Status == Hero.StatusEnum.Dead && acc.Hero.Settings.AutoReviveHero) //if hero is dead, revive him
-                    {
-                        acc.Tasks.Add(  new ReviveHero() {
-                            ExecuteAt = DateTime.Now.AddSeconds(5),
-                            Vill = AccountHelper.GetHeroReviveVillage(acc)
-                        }, true);
-                    }
                     if (HeroParser.LeveledUp(html) && acc.Hero.Settings.AutoSetPoints)
                     {
                         acc.Tasks.Add(  new HeroSetPoints() { ExecuteAt = DateTime.Now }, true);

TbsCore/Helpers/NavigationHelper.cs

@@ -285,42 +285,46 @@ public static async Task<bool> ToTreasury(Account acc, Village vill, TreasuryTab
 
         public static async Task<bool> ToHero(Account acc, HeroTab tab)
         {
-            var heroAvatarNode = acc.Wb.Html.GetElementbyId("heroImageButton");
+            var wait = new WebDriverWait(acc.Wb.Driver, TimeSpan.FromMinutes(1));
 
-            if (heroAvatarNode == null)
+            if (!(acc.Wb.CurrentUrl.Contains("hero/inventory") || acc.Wb.CurrentUrl.Contains("hero/attributes") || acc.Wb.CurrentUrl.Contains("hero/appearance")))
             {
-                acc.Logger.Warning($"Cannot find Hero avatar");
-                return false;
-            }
+                var heroAvatarNode = acc.Wb.Html.GetElementbyId("heroImageButton");
 
-            var elements = acc.Wb.Driver.FindElements(By.XPath(heroAvatarNode.XPath));
-            if (elements.Count == 0)
-            {
-                acc.Logger.Warning($"Cannot find Hero avatar");
-                return false;
-            }
-            elements[0].Click();
+                if (heroAvatarNode == null)
+                {
+                    acc.Logger.Warning($"Cannot find Hero avatar");
+                    return false;
+                }
 
-            var wait = new WebDriverWait(acc.Wb.Driver, TimeSpan.FromMinutes(1));
-            wait.Until(driver =>
+                var elements = acc.Wb.Driver.FindElements(By.XPath(heroAvatarNode.XPath));
+                if (elements.Count == 0)
+                {
+                    acc.Logger.Warning($"Cannot find Hero avatar");
+                    return false;
+                }
+                elements[0].Click();
+
+                wait.Until(driver =>
+                {
+                    acc.Wb.UpdateHtml();
+                    var heroDiv = acc.Wb.Html.GetElementbyId("heroV2");
+                    if (heroDiv == null) return false;
+                    var aNode = heroDiv.Descendants("a").FirstOrDefault(x => x.GetAttributeValue("data-tab", 0) == 1);
+                    if (aNode == null) return false;
+                    return aNode.HasClass("active");
+                });
+            }
             {
                 acc.Wb.UpdateHtml();
-                var heroDiv = acc.Wb.Html.GetElementbyId("heroV2");
-                if (heroDiv == null) return false;
-                var aNode = heroDiv.Descendants("a").FirstOrDefault(x => x.GetAttributeValue("data-tab", 0) == 1);
-                if (aNode == null) return false;
-                return aNode.HasClass("active");
-            });
-
-            if (tab == HeroTab.Inventory) return true;
-
-            var navigatorDiv = acc.Wb.Html.GetElementbyId("heroV2");
-            var tabNode = navigatorDiv.Descendants("a").FirstOrDefault(x => x.GetAttributeValue("data-tab", 0) == (int)tab);
-            if (tabNode == null) return false;
-            var tabElements = acc.Wb.Driver.FindElements(By.XPath(tabNode.XPath));
-            if (tabElements.Count == 0) return false;
-            tabElements[0].Click();
-
+                var navigatorDiv = acc.Wb.Html.GetElementbyId("heroV2");
+                var tabNode = navigatorDiv.Descendants("a").FirstOrDefault(x => x.GetAttributeValue("data-tab", 0) == (int)tab);
+                if (tabNode == null) return false;
+                if (tabNode.HasClass("active")) return true;
+                var tabElements = acc.Wb.Driver.FindElements(By.XPath(tabNode.XPath));
+                if (tabElements.Count == 0) return false;
+                tabElements[0].Click();
+            }
             wait.Until(driver =>
             {
                 acc.Wb.UpdateHtml();

TbsCore/Parsers/HeroParser.cs

@@ -184,11 +184,18 @@ public static int GetHeroHealth(HtmlDocument htmlDoc)
             var path = htmlDoc.GetElementbyId("healthMask").Descendants("path").FirstOrDefault();
             if (path == null) return 0;
             var commands = path.GetAttributeValue("d", "").Split(' ');
-            var xx = double.Parse(commands[commands.Length - 2], System.Globalization.CultureInfo.InvariantCulture);
-            var yy = double.Parse(commands[commands.Length - 1], System.Globalization.CultureInfo.InvariantCulture);
+            try
+            {
+                var xx = double.Parse(commands[commands.Length - 2], System.Globalization.CultureInfo.InvariantCulture);
+                var yy = double.Parse(commands[commands.Length - 1], System.Globalization.CultureInfo.InvariantCulture);
 
-            var rad = Math.Atan2(yy - 55, xx - 55);
-            return (int)Math.Round(-56.173 * rad + 96.077);
+                var rad = Math.Atan2(yy - 55, xx - 55);
+                return (int)Math.Round(-56.173 * rad + 96.077);
+            }
+            catch
+            {
+                return 100;
+            }
         }
 
         /// <summary>

TbsCore/Tasks/Others/ReviveHero.cs

@@ -19,39 +19,11 @@ public override async Task<TaskRes> Execute(Account acc)
             }
 
             {
-                var result = await NavigationHelper.ToHero(acc, NavigationHelper.HeroTab.Attributes);
+                var result = await NavigationHelper.ToHero(acc, NavigationHelper.HeroTab.Inventory);
                 if (StopFlag) return TaskRes.Executed;
                 if (!result) return TaskRes.Executed;
             }
 
-            if (acc.Hero.Settings.AutoAuction)
-            {
-                var items = acc.Hero.Items;
-                foreach (var item in items)
-                {
-                    var (heroItemEnum, amount) = (item.Item, item.Count);
-                    var category = HeroHelper.GetHeroItemCategory(heroItemEnum);
-                    switch (category)
-                    {
-                        case HeroItemCategory.Resource:
-                            continue;
-
-                        case HeroItemCategory.Stackable:
-                            if (amount < 5) continue;
-                            break;
-
-                        case HeroItemCategory.Horse:
-                            continue;
-                    }
-
-                    acc.Tasks.Add(new SellOnAuctions()
-                    {
-                        ExecuteAt = DateTime.Now
-                    }, true);
-                    break;
-                }
-            }
-
             if (acc.Hero.Settings.AutoRefreshInfo)
             {
                 NextExecute = DateTime.Now.AddMinutes(