Merge pull request #111 from Erol444/fix-30-04-2022

Fix 30 04 2022

Author: vinaghost

TbsCore/Helpers/Classificator.cs

@@ -201,10 +201,10 @@ public enum HeroItemEnum
             Stackable_Ointment_0, // =106
 
             Stackable_Scroll_0,
-            NonStackable_Bucket_0,
-            NonStackable_Tablets_0,
-            NonStackable_Book_0, // =110
-            NonStackable_Artwork_0,
+            Stackable_Bucket_0,
+            Stackable_Tablets_0,
+            Stackable_Book_0, // =110
+            Stackable_Artwork_0,
             Stackable_SmallBandage_0,
             Stackable_BigBandage_0,
             Stackable_Cage_0,

TbsCore/Tasks/Sim/ClaimBeginnerTask2021.cs

@@ -88,14 +88,17 @@ private async Task<bool> ClaimRewards(Account acc)
                     if (!result) return false;
                 }
 
-                var collectNode = acc.Wb.Html.DocumentNode.Descendants("button").FirstOrDefault(x => x.HasClass("collect"));
-                if (collectNode == null) return true;
+                var collectNodes = acc.Wb.Html.DocumentNode.Descendants("button").Where(x => x.HasClass("collect"));
+                if (collectNodes.Count() == 0) return true;
 
-                var collectElement = acc.Wb.Driver.FindElement(By.XPath(collectNode.XPath));
-                collectElement.Click();
-                if (StopFlag) return false;
+                foreach (var node in collectNodes)
+                {
+                    var collectElement = acc.Wb.Driver.FindElement(By.XPath(node.XPath));
+                    collectElement.Click();
+                    if (StopFlag) return false;
 
-                await AccountHelper.DelayWait(acc, 5);
+                    await AccountHelper.DelayWait(acc, 5);
+                }
 
                 {
                     var result = await Update(acc);

TbsCore/Tasks/Update/CheckAttacks.cs

@@ -16,6 +16,13 @@ public class CheckAttacks : BotTask
     {
         public override async Task<TaskRes> Execute(Account acc)
         {
+            StopFlag = false;
+            {
+                acc.Logger.Information($"Checking current village ...");
+                var result = await NavigationHelper.SwitchVillage(acc, Vill);
+                if (StopFlag) return TaskRes.Executed;
+                if (!result) return TaskRes.Executed;
+            }
             //await NavigationHelper.ToRallyPoint(acc, Vill, NavigationHelper.RallyPointTab.Overview)
             await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/build.php?gid=16&tt=1&filter=1&subfilters=1");
 

TbsCore/Tasks/Update/UpdateTroops.cs

@@ -15,6 +15,13 @@ public class UpdateTroops : BotTask
         /// </summary>
         public override async Task<TaskRes> Execute(Account acc)
         {
+            StopFlag = false;
+            {
+                acc.Logger.Information($"Checking current village ...");
+                var result = await NavigationHelper.SwitchVillage(acc, Vill);
+                if (StopFlag) return TaskRes.Executed;
+                if (!result) return TaskRes.Executed;
+            }
             // If we have Plus account, just check that.
             if (acc.AccInfo.PlusAccount)
             {

TbsCore/Tasks/Update/UpdateVillage.cs

@@ -17,8 +17,16 @@ public override async Task<TaskRes> Execute(Account acc)
         {
             acc.Tasks.Remove(typeof(UpdateDorf1), Vill, thisTask: this);
             acc.Tasks.Remove(typeof(UpdateDorf2), Vill, thisTask: this);
+            StopFlag = false;
+            {
+                acc.Logger.Information($"Checking current village ...");
+                var result = await NavigationHelper.SwitchVillage(acc, Vill);
+                if (StopFlag) return TaskRes.Executed;
+                if (!result) return TaskRes.Executed;
+            }
 
             await NavigationHelper.ToDorf1(acc);
+            await AccountHelper.DelayWait(acc);
             await NavigationHelper.ToDorf2(acc);
 
             // On new village import the building tasks
@@ -29,7 +37,6 @@ public override async Task<TaskRes> Execute(Account acc)
 
             await UpdateTroopsResearchedAndLevels(acc);
 
-            await Task.Delay(AccountHelper.Delay(acc));
             await UpdateTroopsTraining(acc);
 
             var firstTroop = TroopsData.TribeFirstTroop(acc.AccInfo.Tribe);