Merge pull request #110 from Erol444/fix-29-04-2022

Fix 29 04 2022
Erol444 · Apr 29, 2022 · 1f4029d · 1f4029d
2 parents a65de3e + a0d326f
commit 1f4029d
Show file tree

Hide file tree

Showing 189 changed files with 5,275 additions and 5,129 deletions.
diff --git a/TbsCore/Core/PostLoadHelper.cs b/TbsCore/Core/PostLoadHelper.cs
@@ -5,9 +5,10 @@
 using TbsCore.Models.AccModels;
 using TbsCore.Models.JsObjects;
 using TbsCore.Models.VillageModels;
-using TbsCore.Helpers;
 using TbsCore.Parsers;
-using TbsCore.Tasks.LowLevel;
+using TbsCore.Tasks.Others;
+using TbsCore.Tasks.Sim;
+using TbsCore.Tasks.Update;
 using static TbsCore.Tasks.BotTask;
 
 namespace TbsCore.Helpers
@@ -91,7 +92,7 @@ public static List<Action> GetPostLoadTasks(Account acc)
                         acc.Wb.Html.GetElementbyId("mentorTaskList") == null &&
                         acc.Quests.ClaimBeginnerQuests)
                     {
-                        acc.Tasks.Add(new ClaimBeginnerTask2021() { ExecuteAt = DateTime.Now}, true);
+                        acc.Tasks.Add(new ClaimBeginnerTask2021() { Vill = vill, ExecuteAt = DateTime.Now}, true); ;
                         return;
                     }
 

diff --git a/TbsCore/Core/TaskExecutor.cs b/TbsCore/Core/TaskExecutor.cs
@@ -7,7 +7,9 @@
 using TbsCore.Models.VillageModels;
 using TbsCore.Parsers;
 using TbsCore.Tasks;
-using TbsCore.Tasks.LowLevel;
+using TbsCore.Tasks.Browser;
+using TbsCore.Tasks.Others;
+using TbsCore.Tasks.Update;
 using static TbsCore.Tasks.BotTask;
 
 namespace TbsCore.Helpers

diff --git a/TbsCore/Core/TaskTimer.cs b/TbsCore/Core/TaskTimer.cs
@@ -3,8 +3,8 @@
 using System.Threading.Tasks;
 using System.Timers;
 using TbsCore.Helpers;
-using TbsCore.Tasks;
-using TbsCore.Tasks.LowLevel;
+using TbsCore.Tasks.Browser;
+using TbsCore.Tasks.Others;
 using static TbsCore.Tasks.BotTask;
 
 namespace TbsCore.Models.AccModels
@@ -100,17 +100,6 @@ private async void NewTick()
             }
 
             task.Stage = TaskStage.Executing;
-
-            //If correct village is selected, otherwise change village
-            if (task.Vill != null && task.GetType() != typeof(UpgradeBuilding))
-            {
-                var active = _acc.Villages.FirstOrDefault(x => x.Active);
-                if (active != null && active != task.Vill)
-                {
-                    await VillageHelper.SwitchVillage(_acc, task.Vill.Id);
-                }
-            }
-
             await TaskExecutor.Execute(_acc, task);
 
             IsTaskExcuting = false;

diff --git a/TbsCore/Core/WebBrowserInfo.cs b/TbsCore/Core/WebBrowserInfo.cs
@@ -1,18 +1,13 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
-using RestSharp;
+using OpenQA.Selenium.Chrome.ChromeDriverExtensions;
 using System;
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Threading.Tasks;
+using TbsCore.Database;
 using TbsCore.Helpers;
-using TbsCore.Models;
-using TbsCore.Tasks.LowLevel;
 using TbsCore.Helpers.ChromeExtension;
-using static TbsCore.Tasks.BotTask;
-using OpenQA.Selenium.Chrome.ChromeDriverExtensions;
-using System.Collections.ObjectModel;
-using TbsCore.Database;
 
 namespace TbsCore.Models.AccModels
 {

diff --git a/TbsCore/Database/DbRepository.cs b/TbsCore/Database/DbRepository.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using TbsCore.Models.AccModels;
 using TbsCore.Models.Database;
-using TbsCore.Helpers;
 
 namespace TbsCore.Database
 {

diff --git a/TbsCore/Database/TbsContext.cs b/TbsCore/Database/TbsContext.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.IO;
-using TbsCore.Models.Database;
 using TbsCore.Helpers;
+using TbsCore.Models.Database;
 
 namespace TbsCore.Database
 {

diff --git a/TbsCore/Extensions/AccountExtension.cs b/TbsCore/Extensions/AccountExtension.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using TbsCore.Models.AccModels;
+using TbsCore.Models.AccModels;
 
 namespace TbsCore.Extensions
 {

diff --git a/TbsCore/Extensions/RallyPointNavigationHelper.cs b/TbsCore/Extensions/RallyPointNavigationHelper.cs
@@ -1,11 +1,4 @@
-using System.Threading.Tasks;
-using TbsCore.Helpers;
-using TbsCore.Models.AccModels;
-using TbsCore.Models.VillageModels;
-using static TbsCore.Helpers.Classificator;
-using System;
-
-namespace TbsCore.Extensions
+namespace TbsCore.Extensions
 {
     /// <summary>
     /// WIP!

diff --git a/TbsCore/Helpers/AccountHelper.cs b/TbsCore/Helpers/AccountHelper.cs
@@ -3,14 +3,16 @@
 using System.Threading.Tasks;
 using TbsCore.Models.AccModels;
 using TbsCore.Models.VillageModels;
-using TbsCore.Tasks.LowLevel;
-using TbsCore.Tasks.SecondLevel;
+using TbsCore.Tasks.Browser;
+using TbsCore.Tasks.Farming;
+using TbsCore.Tasks.Sim;
+using TbsCore.Tasks.Update;
 
 namespace TbsCore.Helpers
 {
     public static class AccountHelper
     {
-        private static Random rnd = new Random();
+        private static readonly Random rnd = new Random();
 
         public static Village GetMainVillage(Account acc)
         {
@@ -56,7 +58,7 @@ public static Village GetQuestsClaimVillage(Account acc)
         /// <returns>Random delay in milliseconds</returns>
         public static int Delay(Account acc) => rnd.Next(acc.Settings.DelayClickingMin, acc.Settings.DelayClickingMax);
 
-        public static Task DelayWait(Account acc) => Task.Delay(Delay(acc));
+        public static Task DelayWait(Account acc, int multiple = 1) => Task.Delay(Delay(acc) * multiple);
 
         public static void StartAccountTasks(Account acc)
         {

diff --git a/TbsCore/Helpers/AttackHelper.cs b/TbsCore/Helpers/AttackHelper.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TbsCore.Parsers;
+using TbsCore.Parsers;
 
 namespace TbsCore.Helpers
 {

diff --git a/TbsCore/Helpers/BuildingHelper.cs b/TbsCore/Helpers/BuildingHelper.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using TbsCore.Helpers;
 using TbsCore.Models.AccModels;
 using TbsCore.Models.BuildingModels;
 using TbsCore.Models.VillageModels;
-using TbsCore.Tasks;
-using TbsCore.Tasks.LowLevel;
+using TbsCore.Tasks.Sim;
 using TbsCore.TravianData;
 using static TbsCore.Helpers.Classificator;
 

diff --git a/TbsCore/Helpers/ChromeExtension/DisableWebRTCLeak.cs b/TbsCore/Helpers/ChromeExtension/DisableWebRTCLeak.cs
@@ -1,7 +1,5 @@
 using System;
 using System.IO;
-using System.IO.Compression;
-using TbsCore.Models.Access;
 
 namespace TbsCore.Helpers.ChromeExtension
 {

diff --git a/TbsCore/Helpers/GithubHelper.cs b/TbsCore/Helpers/GithubHelper.cs
@@ -1,6 +1,6 @@
-using System;
+using Octokit;
+using System;
 using System.Threading.Tasks;
-using Octokit;
 
 namespace TbsCore.Helpers
 {

diff --git a/TbsCore/Helpers/HeroHelper.cs b/TbsCore/Helpers/HeroHelper.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using TbsCore.Helpers;
 using TbsCore.Models.AccModels;
 using TbsCore.Models.MapModels;
-using TbsCore.Models.ResourceModels;
 using TbsCore.Models.VillageModels;
 using TbsCore.Parsers;
-using TbsCore.Tasks.LowLevel;
+using TbsCore.Tasks.Farming;
+using TbsCore.Tasks.Others;
 using TbsCore.TravianData;
 using static TbsCore.Helpers.Classificator;
 

diff --git a/TbsCore/Helpers/HttpHelper.cs b/TbsCore/Helpers/HttpHelper.cs
@@ -3,7 +3,6 @@
 using System.Net;
 using System.Threading.Tasks;
 using TbsCore.Database;
-using TbsCore.Models.Access;
 using TbsCore.Models.AccModels;
 
 namespace TbsCore.Helpers

diff --git a/TbsCore/Helpers/IoHelperCore.cs b/TbsCore/Helpers/IoHelperCore.cs
@@ -4,10 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Discord.Webhook;
 using TbsCore.Database;
-using TbsCore.Models.Access;
-using TbsCore.Models.Logging;
 using TbsCore.Models.AccModels;
 using TbsCore.Models.BuildingModels;
 using TbsCore.Models.VillageModels;

diff --git a/TbsCore/Helpers/MapHelper.cs b/TbsCore/Helpers/MapHelper.cs
@@ -4,14 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using TbsCore.Helpers;
+using System.Threading.Tasks;
 using TbsCore.Models.AccModels;
 using TbsCore.Models.MapModels;
-using TbsCore.Models.VillageModels;
-using TbsCore.TravianData;
-using TbsCore.Parsers;
 using TbsCore.Models.TroopsModels;
-using System.Threading.Tasks;
+using TbsCore.Parsers;
 
 namespace TbsCore.Helpers
 {

diff --git a/TbsCore/Helpers/MarketHelper.cs b/TbsCore/Helpers/MarketHelper.cs
@@ -10,7 +10,7 @@
 
 using TbsCore.Parsers;
 using TbsCore.Tasks;
-using TbsCore.Tasks.LowLevel;
+using TbsCore.Tasks.Others;
 
 namespace TbsCore.Helpers
 {
@@ -183,7 +183,7 @@ public static async Task<TimeSpan> MarketSendResource(Account acc, long[] resour
                 // Error "Abuse! You have not enough resources." is displayed.
             }
             //get duration of transit
-            // Class destination when ok. 
+            // Class destination when ok.
 
             var dur = durNode.Descendants("td").ToList()[3].InnerText.Replace("\t", "").Replace("\n", "");