Merge pull request #48 from Erol444/develop

Erol444 · web-flow · commit 3193a3d63520 · 2021-08-22T17:42:18.000+02:00
Update chrome driver and fix dorf2 info missing
diff --git a/TbsCore/Core/TaskExecutor.cs b/TbsCore/Core/TaskExecutor.cs
@@ -61,7 +61,7 @@ public static async Task PageLoaded(Account acc)
             if (IsSysMsg(acc)) //Check if there is a system message (eg. Artifacts/WW plans appeared)
             {
                 await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf1.php?ok");
-                await Task.Delay(AccountHelper.Delay());
+                await Task.Delay(AccountHelper.Delay(acc));
             }
 
             //TODO: limit this for performance reasons?
@@ -78,7 +78,7 @@ public static async Task PageLoaded(Account acc)
         public static async Task Execute(Account acc, BotTask task)
         {
             // Before every execution, wait a random delay
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
 
             if (task.Vill == null) task.Vill = acc.Villages.FirstOrDefault(x => x.Active);
 
diff --git a/TbsCore/Core/WebBrowserInfo.cs b/TbsCore/Core/WebBrowserInfo.cs
@@ -175,14 +175,14 @@ public async Task Navigate(string url)
                         repeatCnt = 0;
                         var changeAccess = new ChangeAccess();
                         await changeAccess.Execute(acc);
-                        await Task.Delay(AccountHelper.Delay() * 5);
+                        await Task.Delay(AccountHelper.Delay(acc) * 5);
                     }
-                    await Task.Delay(AccountHelper.Delay());
+                    await Task.Delay(AccountHelper.Delay(acc));
                 }
             }
             while (repeat);
 
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
 
             UpdateHtml();
 
diff --git a/TbsCore/Helpers/AccountHelper.cs b/TbsCore/Helpers/AccountHelper.cs
@@ -49,11 +49,11 @@ public static Village GetQuestsClaimVillage(Account acc)
         /// Returns a random delay (click delay, ~0.5-1.6sec).
         /// </summary>
         /// <returns>Random delay in milliseconds</returns>
-        public static int Delay()
+        public static int Delay(Account acc)
         {
             //Return random delay
             Random rnd = new Random();
-            return rnd.Next(500, 1600);
+            return acc.Settings.DelayClicking + rnd.Next(-500, 500);
         }
 
         public static void StartAccountTasks(Account acc)
diff --git a/TbsCore/Helpers/DriverHelper.cs b/TbsCore/Helpers/DriverHelper.cs
@@ -22,7 +22,7 @@ public static async Task<bool> ExecuteScript(Account acc, string script, bool lo
                 acc.Wb.ExecuteScript(script);
                 if (update)
                 {
-                    await Task.Delay(AccountHelper.Delay());
+                    await Task.Delay(AccountHelper.Delay(acc));
                     acc.Wb.UpdateHtml();
                 }
                 return true;
diff --git a/TbsCore/Helpers/MarketHelper.cs b/TbsCore/Helpers/MarketHelper.cs
@@ -156,7 +156,7 @@ public static async Task<TimeSpan> MarketSendResource(Account acc, long[] resour
                     sendRes[i] -= remainder;
                     await DriverHelper.WriteById(acc, "r" + (i + 1), sendRes[i]);
                 }
-                await Task.Delay(AccountHelper.Delay() / 5);
+                await Task.Delay(AccountHelper.Delay(acc) / 5);
             }
 
             // Input coordinates
@@ -166,7 +166,7 @@ public static async Task<TimeSpan> MarketSendResource(Account acc, long[] resour
             if (times != 1)
             {
                 acc.Wb.ExecuteScript($"document.getElementById('x2').value='{times}'");
-                await Task.Delay(AccountHelper.Delay() / 5);
+                await Task.Delay(AccountHelper.Delay(acc) / 5);
             }
             await DriverHelper.ClickById(acc, "enabledButton");
 
diff --git a/TbsCore/Models/Settings/GeneralSettings.cs b/TbsCore/Models/Settings/GeneralSettings.cs
@@ -25,7 +25,8 @@ public void Init()
 
             DonateAbove = 95;
             DonateExcessOf = 65;
-            DiscordWebhook = false;
+            DiscordWebhook = false;
+            DelayClicking = 3000;
         }
 
         public bool AutoActivateProductionBoost { get; set; }
@@ -131,6 +132,11 @@ public void Init()
         /// Announce every bot online
         /// </summary>
         public bool DiscordOnlineAnnouncement { get; set; }
+
+        /// <summary>
+        /// How long should bot click between 2 click ( bot will +- 500ms for random )
+        /// </summary>
+        public int DelayClicking { get; set; }
     }
 
     /// <summary>
diff --git a/TbsCore/Parsers/InfrastructureParser.cs b/TbsCore/Parsers/InfrastructureParser.cs
@@ -13,7 +13,18 @@ public static class InfrastructureParser
         public static List<Building> GetBuildings(Account acc, HtmlAgilityPack.HtmlDocument htmlDoc)
         {
             List<Building> buildings = new List<Building>();
-            var villMap = htmlDoc.GetElementbyId("village_map");
+            HtmlAgilityPack.HtmlNode villMap = null;
+            switch (acc.AccInfo.ServerVersion)
+            {
+                case Classificator.ServerVersionEnum.T4_5:
+                    villMap = htmlDoc.GetElementbyId("villageContent");
+                    break;
+
+                case Classificator.ServerVersionEnum.T4_4:
+                    villMap = htmlDoc.GetElementbyId("village_map");
+                    break;
+            }
+
             if (villMap == null) return buildings;
 
             var fields = villMap.ChildNodes.Where(x => x.Name == "div").ToList();
diff --git a/TbsCore/Tasks/LowLevel/AddFarm.cs b/TbsCore/Tasks/LowLevel/AddFarm.cs
@@ -27,7 +27,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 await DriverHelper.WriteById(acc, $"t{i + 1}", Farm.Troops[i]);
             }
 
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
 
             // Click "save"
             switch (acc.AccInfo.ServerVersion)
diff --git a/TbsCore/Tasks/LowLevel/ChangeVillageName.cs b/TbsCore/Tasks/LowLevel/ChangeVillageName.cs
@@ -31,7 +31,7 @@ public override async Task<TaskRes> Execute(Account acc)
                         acc.Wb.ExecuteScript(script); //insert new name into the textbox
                     }
 
-                    await Task.Delay(AccountHelper.Delay());
+                    await Task.Delay(AccountHelper.Delay(acc));
 
                     acc.Wb.ExecuteScript("document.getElementById('PlayerProfileEditor').submit()"); //click save button
 
@@ -64,7 +64,7 @@ public override async Task<TaskRes> Execute(Account acc)
                         acc.Wb.FindElementByXPath($"//input[@name='dname[{change.Item1}]=']").SendKeys(change.Item2);
                     }
 
-                    await Task.Delay(AccountHelper.Delay());
+                    await Task.Delay(AccountHelper.Delay(acc));
                     acc.Wb.FindElementById("btn_ok").Click();  //click save button
 
                     return TaskRes.Executed;
diff --git a/TbsCore/Tasks/LowLevel/CheckAttacks.cs b/TbsCore/Tasks/LowLevel/CheckAttacks.cs
@@ -44,7 +44,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/build.php?gid=16&tt=1&filter=1&subfilters=1&page={++page}");
                 var pageAttacks = TroopsMovementParser.ParseTroopsOverview(acc, acc.Wb.Html);
                 attacks.AddRange(pageAttacks);
-                await Task.Delay(AccountHelper.Delay());
+                await Task.Delay(AccountHelper.Delay(acc));
             }
             while (!acc.Wb.Html // While the next page img isn't disabled
                 .GetElementbyId("build")
diff --git a/TbsCore/Tasks/LowLevel/CheckProxy.cs b/TbsCore/Tasks/LowLevel/CheckProxy.cs
@@ -34,7 +34,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 else
                 {
                     acc.Logger.Warning($"There's only one access to this account! Will retry same proxy after 1 min...");
-                    await Task.Delay(AccountHelper.Delay() * 15);
+                    await Task.Delay(AccountHelper.Delay(acc) * 15);
                     this.NextExecute = DateTime.MinValue.AddMinutes(1);
                 }
             }
diff --git a/TbsCore/Tasks/LowLevel/ClaimBeginnerTask.cs b/TbsCore/Tasks/LowLevel/ClaimBeginnerTask.cs
@@ -14,7 +14,7 @@ public override async Task<TaskRes> Execute(Account acc)
         {
             var script = $"document.getElementById('mentorTaskList').querySelector('[data-questid=\"{this.QuestToClaim.Id}\"]').click();";
             await DriverHelper.ExecuteScript(acc, script);
-            await Task.Delay(AccountHelper.Delay() * 2);
+            await Task.Delay(AccountHelper.Delay(acc) * 2);
 
             string buttonId = "";
             switch (acc.AccInfo.ServerVersion)
diff --git a/TbsCore/Tasks/LowLevel/ClaimBeginnerTask2021.cs b/TbsCore/Tasks/LowLevel/ClaimBeginnerTask2021.cs
@@ -31,7 +31,7 @@ public override async Task<TaskRes> Execute(Account acc)
 
         private async Task ClaimRewards(Account acc)
         {
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
             do
             {
                 await DriverHelper.ClickByClassName(acc, "collect", false);
diff --git a/TbsCore/Tasks/LowLevel/HeroSetPoints.cs b/TbsCore/Tasks/LowLevel/HeroSetPoints.cs
@@ -45,7 +45,7 @@ public override async Task<TaskRes> Execute(Account acc)
                     // Execute the script (set point) to add 1 point
                     acc.Wb.ExecuteScript(script);
                 }
-                await Task.Delay(AccountHelper.Delay());
+                await Task.Delay(AccountHelper.Delay(acc));
             }
 
             acc.Wb.ExecuteScript("document.getElementById('saveHeroAttributes').click();");
diff --git a/TbsCore/Tasks/LowLevel/ImproveTroop.cs b/TbsCore/Tasks/LowLevel/ImproveTroop.cs
@@ -70,7 +70,7 @@ public override async Task<TaskRes> Execute(Account acc)
             // If we have plus account and there is currently no other troop to improve, go ahead and improve the unit again
             this.NextExecute = (currentlyImproving.Count() == 0 && maxImproving == 2) ?
                 DateTime.MinValue :
-                DateTime.Now.Add(cost.TimeCost).AddMilliseconds(5 * AccountHelper.Delay());
+                DateTime.Now.Add(cost.TimeCost).AddMilliseconds(5 * AccountHelper.Delay(acc));
             return TaskRes.Executed;
         }
 
diff --git a/TbsCore/Tasks/LowLevel/LoginTask.cs b/TbsCore/Tasks/LowLevel/LoginTask.cs
@@ -10,7 +10,7 @@ public override async Task<TaskRes> Execute(Account acc)
         {
             if (!TaskExecutor.IsLoginScreen(acc))
             {
-                await Task.Delay(AccountHelper.Delay() * 2);
+                await Task.Delay(AccountHelper.Delay(acc) * 2);
                 return TaskRes.Executed;
             }
 
diff --git a/TbsCore/Tasks/LowLevel/ReadMessage.cs b/TbsCore/Tasks/LowLevel/ReadMessage.cs
@@ -17,7 +17,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 {
                     var url = msg.ParentNode.GetAttributeValue("href", "").Replace("amp;", "");
                     await acc.Wb.Navigate(acc.AccInfo.ServerUrl + "/" + url);
-                    await Task.Delay(AccountHelper.Delay() * 5);
+                    await Task.Delay(AccountHelper.Delay(acc) * 5);
                 }
                 else return TaskRes.Executed;
             }
diff --git a/TbsCore/Tasks/LowLevel/ResearchTroop.cs b/TbsCore/Tasks/LowLevel/ResearchTroop.cs
@@ -47,7 +47,7 @@ public override async Task<TaskRes> Execute(Account acc)
 
             await DriverHelper.ClickById(acc, button.Id);
 
-            var executeNext = DateTime.Now.Add(dur).AddMilliseconds(10 * AccountHelper.Delay());
+            var executeNext = DateTime.Now.Add(dur).AddMilliseconds(10 * AccountHelper.Delay(acc));
             if (Vill.Settings.AutoImprove)
             {
                 acc.Tasks.Add(new ImproveTroop() { Vill = this.Vill, ExecuteAt = DateTime.Now.Add(dur) });
diff --git a/TbsCore/Tasks/LowLevel/SendFarmlist.cs b/TbsCore/Tasks/LowLevel/SendFarmlist.cs
@@ -68,7 +68,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 await DriverHelper.CheckById(acc, checkbox.Id, true, update: false);
             }
 
-            await Task.Delay(AccountHelper.Delay() * 2);
+            await Task.Delay(AccountHelper.Delay(acc) * 2);
 
             switch (acc.AccInfo.ServerVersion)
             {
diff --git a/TbsCore/Tasks/LowLevel/SendSettlers.cs b/TbsCore/Tasks/LowLevel/SendSettlers.cs
@@ -37,7 +37,7 @@ public override async Task<TaskRes> Execute(Account acc)
             }
 
             await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/karte.php");
-            await Task.Delay(AccountHelper.Delay() * 3);
+            await Task.Delay(AccountHelper.Delay(acc) * 3);
 
             var newVillage = acc.NewVillages.Locations.FirstOrDefault();
 
diff --git a/TbsCore/Tasks/LowLevel/SendTroops.cs b/TbsCore/Tasks/LowLevel/SendTroops.cs
@@ -68,7 +68,7 @@ public override async Task<TaskRes> Execute(Account acc)
             //Click on "Send" button
             await DriverHelper.ClickById(acc, "btn_ok");
 
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
 
             // Select catapult targets
             if (this.TroopsMovement.Target1 != Classificator.BuildingEnum.Site)
diff --git a/TbsCore/Tasks/LowLevel/SendWaves.cs b/TbsCore/Tasks/LowLevel/SendWaves.cs
@@ -217,7 +217,7 @@ public override async Task<TaskRes> Execute(Account acc)
             }
             acc.Logger.Information($"Successfully sent {wavesReady.Count} waves!");
 
-            await Task.Delay(AccountHelper.Delay() * 2);
+            await Task.Delay(AccountHelper.Delay(acc) * 2);
             await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/build.php?gid=16&tt=1&filter=2&subfilters=4");
             //Todo: check waves?
             return TaskRes.Executed;
diff --git a/TbsCore/Tasks/LowLevel/TTWars/TTWarsPlusAndBoost.cs b/TbsCore/Tasks/LowLevel/TTWars/TTWarsPlusAndBoost.cs
@@ -17,7 +17,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 return TaskRes.Executed;
             }
             var buttonid = button.GetAttributeValue("id", "");
-            await Task.Delay(AccountHelper.Delay() / 3);
+            await Task.Delay(AccountHelper.Delay(acc) / 3);
 
             acc.Wb.ExecuteScript($"document.getElementById('{buttonid}').click()"); //boost production
 
diff --git a/TbsCore/Tasks/LowLevel/TrainExchangeRes.cs b/TbsCore/Tasks/LowLevel/TrainExchangeRes.cs
@@ -32,7 +32,7 @@ public override async Task<TaskRes> Execute(Account acc)
             string distributeid = distribute.GetAttributeValue("id", "");
             acc.Wb.ExecuteScript($"document.getElementById('{distributeid}').click()"); //Distribute resources button
 
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
             acc.Wb.ExecuteScript($"document.getElementById('npc_market_button').click()"); //Exchange resources button
 
             return TaskRes.Executed;
diff --git a/TbsCore/Tasks/LowLevel/TrainSettlers.cs b/TbsCore/Tasks/LowLevel/TrainSettlers.cs
@@ -86,7 +86,7 @@ public override async Task<TaskRes> Execute(Account acc)
             }
 
             acc.Wb.ExecuteScript($"document.getElementsByName('t10')[0].value='{maxNum}'");
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
 
             // Click Train button
             await TbsCore.Helpers.DriverHelper.ExecuteScript(acc, "document.getElementById('s1').click()");
diff --git a/TbsCore/Tasks/LowLevel/TrainTroops.cs b/TbsCore/Tasks/LowLevel/TrainTroops.cs
@@ -192,7 +192,7 @@ public void RepeatTrainingCycle(HtmlDocument htmlDoc, Account acc)
             }
             else
             {
-                var subtractMillis = AccountHelper.Delay() * 50; //~30sec
+                var subtractMillis = AccountHelper.Delay(acc) * 50; //~30sec
                 var later = DateTime.Now.AddMinutes(10);
                 // Don't training again sooner than after 10min
                 if (later > trainingEnds) trainingEnds = later;
diff --git a/TbsCore/Tasks/LowLevel/UpdateTaskUseRes.cs b/TbsCore/Tasks/LowLevel/UpdateTaskUseRes.cs
@@ -11,15 +11,15 @@ public override async Task<TaskRes> Execute(Account acc)
         {
             // Troops task
             TroopsHelper.ReStartTroopTraining(acc, Vill);
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
             TroopsHelper.ReStartResearchAndImprovement(acc, Vill);
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
 
             // Building task
             BuildingHelper.ReStartBuilding(acc, Vill);
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
             BuildingHelper.ReStartDemolishing(acc, Vill);
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
 
             // Celebration task
             AccountHelper.ReStartCelebration(acc, Vill);
diff --git a/TbsCore/Tasks/LowLevel/UpdateVillage.cs b/TbsCore/Tasks/LowLevel/UpdateVillage.cs
@@ -20,7 +20,7 @@ public override async Task<TaskRes> Execute(Account acc)
             acc.Tasks.Remove(typeof(UpdateDorf2), Vill, thisTask: this);
 
             await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf1.php"); // Update dorf1
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
             await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf2.php"); // Update dorf2
 
             // On new village import the building tasks
@@ -32,7 +32,7 @@ public override async Task<TaskRes> Execute(Account acc)
             await UpdateTroopsResearchedAndLevels(acc);
 
             await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf2.php");
-            await Task.Delay(AccountHelper.Delay());
+            await Task.Delay(AccountHelper.Delay(acc));
             await UpdateTroopsTraining(acc);
 
             var firstTroop = TroopsData.TribeFirstTroop(acc.AccInfo.Tribe);
@@ -114,7 +114,7 @@ public async Task UpdateTroopsTraining(Account acc)
                         break;
                 }
                 await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf2.php");
-                await Task.Delay(AccountHelper.Delay());
+                await Task.Delay(AccountHelper.Delay(acc));
             }
         }
     }
diff --git a/TbsCore/Tasks/LowLevel/UpgradeBuilding.cs b/TbsCore/Tasks/LowLevel/UpgradeBuilding.cs
@@ -258,7 +258,7 @@ private async Task<TaskRes> Upgrade(Account acc, HtmlNode node)
 
         private async Task PostTaskCheckDorf(Account acc)
         {
-            await System.Threading.Tasks.Task.Delay(AccountHelper.Delay());
+            await System.Threading.Tasks.Task.Delay(AccountHelper.Delay(acc));
             await TaskExecutor.PageLoaded(acc);
 
             // Check if residence is getting upgraded to level 10 => train settlers
@@ -298,17 +298,17 @@ private async Task PostTaskCheckDorf(Account acc)
         private async Task<bool> TryFastUpgrade(Account acc)
         {
             if (!await DriverHelper.ClickByClassName(acc, "videoFeatureButton green", false)) return false;
-            await System.Threading.Tasks.Task.Delay(AccountHelper.Delay());
+            await System.Threading.Tasks.Task.Delay(AccountHelper.Delay(acc));
 
             // Confirm
             acc.Wb.UpdateHtml();
             if (acc.Wb.Html.DocumentNode.SelectSingleNode("//input[@name='adSalesVideoInfoScreen']") != null)
             {
                 await DriverHelper.ClickByName(acc, "adSalesVideoInfoScreen");
-                await System.Threading.Tasks.Task.Delay(AccountHelper.Delay());
+                await System.Threading.Tasks.Task.Delay(AccountHelper.Delay(acc));
 
                 await DriverHelper.ExecuteScript(acc, "jQuery(window).trigger('showVideoWindowAfterInfoScreen')");
-                await System.Threading.Tasks.Task.Delay(AccountHelper.Delay());
+                await System.Threading.Tasks.Task.Delay(AccountHelper.Delay(acc));
             }
 
             // Has to be a legit "click"
@@ -343,7 +343,7 @@ private async Task<bool> TryFastUpgrade(Account acc)
             if (acc.Wb.Html.GetElementbyId("dontShowThisAgain") != null)
             {
                 await DriverHelper.ClickById(acc, "dontShowThisAgain");
-                await System.Threading.Tasks.Task.Delay(AccountHelper.Delay());
+                await System.Threading.Tasks.Task.Delay(AccountHelper.Delay(acc));
                 await DriverHelper.ClickByClassName(acc, "dialogButtonOk ok");
             }
 
diff --git a/TbsCore/Tasks/SecondLevel/AttackOasis.cs b/TbsCore/Tasks/SecondLevel/AttackOasis.cs
@@ -68,7 +68,7 @@ public override async Task<TaskRes> Execute(Account acc)
             {
                 var oasis = oasisFiltered[i];
 
-                await Task.Delay(AccountHelper.Delay() * 3);
+                await Task.Delay(AccountHelper.Delay(acc) * 3);
                 acc.Logger.Information($"[{i + 1}/{oasisFiltered.Count}] Searching for oasis to attack, checking {oasis}");
                 var animals = MapHelper.GetOasisAnimals(acc, oasis);
 
diff --git a/TbsCore/Tasks/SecondLevel/SendFLs.cs b/TbsCore/Tasks/SecondLevel/SendFLs.cs
diff --git a/TbsCore/Tasks/SecondLevel/TransitToMainAcc.cs b/TbsCore/Tasks/SecondLevel/TransitToMainAcc.cs
diff --git a/TbsCore/TbsCore.csproj b/TbsCore/TbsCore.csproj
diff --git a/TbsCore/packages.lock.json b/TbsCore/packages.lock.json
diff --git a/TravBotSharp/TbsWinForms.csproj b/TravBotSharp/TbsWinForms.csproj
diff --git a/TravBotSharp/Views/DebugUc.cs b/TravBotSharp/Views/DebugUc.cs
diff --git a/TravBotSharp/Views/GeneralUc.Designer.cs b/TravBotSharp/Views/GeneralUc.Designer.cs
diff --git a/TravBotSharp/Views/GeneralUc.cs b/TravBotSharp/Views/GeneralUc.cs
diff --git a/TravBotSharp/Views/VillageViews/FarmingNonGoldUc.cs b/TravBotSharp/Views/VillageViews/FarmingNonGoldUc.cs
diff --git a/TravBotSharp/packages.config b/TravBotSharp/packages.config

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static async Task PageLoaded(Account acc)`
`61`	`61`	`if (IsSysMsg(acc)) //Check if there is a system message (eg. Artifacts/WW plans appeared)`
`62`	`62`	`{`
`63`	`63`	`await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf1.php?ok");`
`64`		`- await Task.Delay(AccountHelper.Delay());`
	`64`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`//TODO: limit this for performance reasons?`
`@@ -78,7 +78,7 @@ public static async Task PageLoaded(Account acc)`
`78`	`78`	`public static async Task Execute(Account acc, BotTask task)`
`79`	`79`	`{`
`80`	`80`	`// Before every execution, wait a random delay`
`81`		`- await Task.Delay(AccountHelper.Delay());`
	`81`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`82`	`82`
`83`	`83`	`if (task.Vill == null) task.Vill = acc.Villages.FirstOrDefault(x => x.Active);`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -175,14 +175,14 @@ public async Task Navigate(string url)`
`175`	`175`	`repeatCnt = 0;`
`176`	`176`	`var changeAccess = new ChangeAccess();`
`177`	`177`	`await changeAccess.Execute(acc);`
`178`		`- await Task.Delay(AccountHelper.Delay() * 5);`
	`178`	`+ await Task.Delay(AccountHelper.Delay(acc) * 5);`
`179`	`179`	`}`
`180`		`- await Task.Delay(AccountHelper.Delay());`
	`180`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`	`while (repeat);`
`184`	`184`
`185`		`- await Task.Delay(AccountHelper.Delay());`
	`185`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`186`	`186`
`187`	`187`	`UpdateHtml();`
`188`	`188`
Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,11 @@ public static Village GetQuestsClaimVillage(Account acc)`
`49`	`49`	`/// Returns a random delay (click delay, ~0.5-1.6sec).`
`50`	`50`	`/// </summary>`
`51`	`51`	`/// <returns>Random delay in milliseconds</returns>`
`52`		`- public static int Delay()`
	`52`	`+ public static int Delay(Account acc)`
`53`	`53`	`{`
`54`	`54`	`//Return random delay`
`55`	`55`	`Random rnd = new Random();`
`56`		`- return rnd.Next(500, 1600);`
	`56`	`+ return acc.Settings.DelayClicking + rnd.Next(-500, 500);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public static void StartAccountTasks(Account acc)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static async Task<bool> ExecuteScript(Account acc, string script, bool lo`
`22`	`22`	`acc.Wb.ExecuteScript(script);`
`23`	`23`	`if (update)`
`24`	`24`	`{`
`25`		`- await Task.Delay(AccountHelper.Delay());`
	`25`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`26`	`26`	`acc.Wb.UpdateHtml();`
`27`	`27`	`}`
`28`	`28`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public static async Task<TimeSpan> MarketSendResource(Account acc, long[] resour`
`156`	`156`	`sendRes[i] -= remainder;`
`157`	`157`	`await DriverHelper.WriteById(acc, "r" + (i + 1), sendRes[i]);`
`158`	`158`	`}`
`159`		`- await Task.Delay(AccountHelper.Delay() / 5);`
	`159`	`+ await Task.Delay(AccountHelper.Delay(acc) / 5);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`// Input coordinates`
`@@ -166,7 +166,7 @@ public static async Task<TimeSpan> MarketSendResource(Account acc, long[] resour`
`166`	`166`	`if (times != 1)`
`167`	`167`	`{`
`168`	`168`	`acc.Wb.ExecuteScript($"document.getElementById('x2').value='{times}'");`
`169`		`- await Task.Delay(AccountHelper.Delay() / 5);`
	`169`	`+ await Task.Delay(AccountHelper.Delay(acc) / 5);`
`170`	`170`	`}`
`171`	`171`	`await DriverHelper.ClickById(acc, "enabledButton");`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public override async Task<TaskRes> Execute(Account acc)`
`27`	`27`	`await DriverHelper.WriteById(acc, $"t{i + 1}", Farm.Troops[i]);`
`28`	`28`	`}`
`29`	`29`
`30`		`- await Task.Delay(AccountHelper.Delay());`
	`30`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`31`	`31`
`32`	`32`	`// Click "save"`
`33`	`33`	`switch (acc.AccInfo.ServerVersion)`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public override async Task<TaskRes> Execute(Account acc)`
`31`	`31`	`acc.Wb.ExecuteScript(script); //insert new name into the textbox`
`32`	`32`	`}`
`33`	`33`
`34`		`- await Task.Delay(AccountHelper.Delay());`
	`34`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`35`	`35`
`36`	`36`	`acc.Wb.ExecuteScript("document.getElementById('PlayerProfileEditor').submit()"); //click save button`
`37`	`37`
`@@ -64,7 +64,7 @@ public override async Task<TaskRes> Execute(Account acc)`
`64`	`64`	`acc.Wb.FindElementByXPath($"//input[@name='dname[{change.Item1}]=']").SendKeys(change.Item2);`
`65`	`65`	`}`
`66`	`66`
`67`		`- await Task.Delay(AccountHelper.Delay());`
	`67`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`68`	`68`	`acc.Wb.FindElementById("btn_ok").Click(); //click save button`
`69`	`69`
`70`	`70`	`return TaskRes.Executed;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public override async Task<TaskRes> Execute(Account acc)`
`44`	`44`	`await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/build.php?gid=16&tt=1&filter=1&subfilters=1&page={++page}");`
`45`	`45`	`var pageAttacks = TroopsMovementParser.ParseTroopsOverview(acc, acc.Wb.Html);`
`46`	`46`	`attacks.AddRange(pageAttacks);`
`47`		`- await Task.Delay(AccountHelper.Delay());`
	`47`	`+ await Task.Delay(AccountHelper.Delay(acc));`
`48`	`48`	`}`
`49`	`49`	`while (!acc.Wb.Html // While the next page img isn't disabled`
`50`	`50`	`.GetElementbyId("build")`