Fix a lot of things (#162)

- fix negative min setting value
- pause account before shutdown bot
- fix building list in build single section in building tab
- fix start adventures when hero not at home
- fix bot crash when missing chrome
- fix version form

Author: vinaghost

MainCore/Helper/BuildingsHelper.cs

@@ -14,7 +14,8 @@ public static class BuildingsHelper
 
         public static List<BuildingEnums> GetCanBuild(AppDbContext context, IPlanManager planManager, int accountId, int villageId)
         {
-            var result = new List<BuildingEnums>(); var tribe = context.AccountsInfo.Find(accountId).Tribe;
+            var result = new List<BuildingEnums>();
+            var tribe = context.AccountsInfo.Find(accountId).Tribe;
             for (var i = BuildingEnums.Sawmill; i <= BuildingEnums.Hospital; i++)
             {
                 if (CanBuild(context, planManager, villageId, tribe, i))
@@ -27,8 +28,7 @@ public static List<BuildingEnums> GetCanBuild(AppDbContext context, IPlanManager
 
         public static bool CanBuild(AppDbContext context, IPlanManager planManager, int villageId, TribeEnums tribe, BuildingEnums building)
         {
-            bool exists = (context.VillagesBuildings.Where(x => x.VillageId == villageId).FirstOrDefault(x => x.Type == building) is not null); //there is already a building of this type in the vill
-            if (exists)
+            if (IsExists(context, planManager, villageId, building))
             {
                 //check cranny/warehouse/grannary/trapper/GG/GW
                 return building switch
@@ -47,15 +47,52 @@ public static bool CanBuild(AppDbContext context, IPlanManager planManager, int
             if (reqTribe != TribeEnums.Any && reqTribe != tribe) return false;
             foreach (var prerequisite in prerequisites)
             {
+                if (prerequisite.Building.IsResourceField())
+                {
+                    if (prerequisite.Building == BuildingEnums.Cropland)
+                    {
+                        if (IsAutoCropFieldAboveLevel(planManager, villageId, prerequisite.Level)) return true;
+                    }
+                    else
+                    {
+                        if (IsAutoResourceFieldAboveLevel(planManager, villageId, prerequisite.Level)) return true;
+                    }
+                }
                 if (!IsBuildingAboveLevel(context, planManager, villageId, prerequisite.Building, prerequisite.Level)) return false;
             }
             return true;
         }
 
-        public static bool IsBuildingAboveLevel(AppDbContext context, IPlanManager planManager, int villageId, BuildingEnums building, int lvl)
+        private static bool IsExists(AppDbContext context, IPlanManager planManager, int villageId, BuildingEnums building)
+        {
+            var b = context.VillagesBuildings.Where(x => x.VillageId == villageId).FirstOrDefault(x => x.Type == building);
+            if (b is not null) return true;
+            var c = context.VillagesCurrentlyBuildings.Where(x => x.VillageId == villageId).FirstOrDefault(x => x.Type == building);
+            if (c is not null) return true;
+            var q = planManager.GetList(villageId).FirstOrDefault(x => x.Building == building);
+            if (q is not null) return true;
+            return false;
+        }
+
+        private static bool IsBuildingAboveLevel(AppDbContext context, IPlanManager planManager, int villageId, BuildingEnums building, int lvl)
+        {
+            var b = context.VillagesBuildings.Where(x => x.VillageId == villageId).Any(x => x.Type == building && lvl <= x.Level);
+            if (b) return true;
+            var c = context.VillagesCurrentlyBuildings.Where(x => x.VillageId == villageId).Any(x => x.Type == building && lvl <= x.Level);
+            if (c) return true;
+            var q = planManager.GetList(villageId).Any(x => x.Building == building && lvl <= x.Level);
+            if (q) return true;
+            return false;
+        }
+
+        private static bool IsAutoResourceFieldAboveLevel(IPlanManager planManager, int villageId, int lvl)
+        {
+            return planManager.GetList(villageId).Any(x => (x.ResourceType == ResTypeEnums.AllResources || x.ResourceType == ResTypeEnums.ExcludeCrop) && lvl <= x.Level);
+        }
+
+        private static bool IsAutoCropFieldAboveLevel(IPlanManager planManager, int villageId, int lvl)
         {
-            return (context.VillagesBuildings.Where(x => x.VillageId == villageId).Any(x => x.Type == building && lvl <= x.Level) ||
-                    planManager.GetList(villageId).Any(x => x.Building == building && lvl <= x.Level));
+            return planManager.GetList(villageId).Any(x => (x.ResourceType == ResTypeEnums.AllResources || x.ResourceType == ResTypeEnums.OnlyCrop) && lvl <= x.Level);
         }
 
         public static bool IsResourceField(this BuildingEnums building)

MainCore/Tasks/Misc/LoginTask.cs

@@ -146,7 +146,8 @@ private void AddTask()
             using var context = _contextFactory.CreateDbContext();
             var villages = context.Villages.Where(x => x.AccountId == AccountId);
             var listTask = _taskManager.GetList(AccountId);
-            var upgradeBuildingList = listTask.Where(x => x.GetType() == typeof(UpgradeBuilding)).OfType<UpgradeBuilding>();
+            var upgradeBuildingList = listTask.OfType<UpgradeBuilding>();
+            var updateList = listTask.OfType<UpdateDorf1>();
             foreach (var village in villages)
             {
                 var queue = _planManager.GetList(village.Id);
@@ -158,6 +159,15 @@ private void AddTask()
                         _taskManager.Add(AccountId, new UpgradeBuilding(village.Id, AccountId));
                     }
                 }
+                var setting = context.VillagesSettings.Find(village.Id);
+                if (setting.IsAutoRefresh)
+                {
+                    var update = updateList.FirstOrDefault(x => x.VillageId == village.Id);
+                    if (update is null)
+                    {
+                        _taskManager.Add(AccountId, new UpdateDorf1(village.Id, AccountId));
+                    }
+                }
             }
         }
     }

MainCore/Tasks/Sim/InstantUpgrade.cs

@@ -38,7 +38,7 @@ public override void Execute()
             NavigateHelper.AfterClicking(_chromeBrowser, context, AccountId);
 
             var tasks = _taskManager.GetList(AccountId);
-            var upgradeTask = tasks.Where(x => x.GetType() == typeof(UpgradeBuilding)).OfType<UpgradeBuilding>().FirstOrDefault(x => x.VillageId == VillageId);
+            var upgradeTask = tasks.OfType<UpgradeBuilding>().FirstOrDefault(x => x.VillageId == VillageId);
             if (upgradeTask is not null)
             {
                 upgradeTask.ExecuteAt = DateTime.Now;

MainCore/Tasks/Update/UpdateAdventures.cs

@@ -26,6 +26,12 @@ public override void Execute()
             var setting = context.AccountsSettings.Find(AccountId);
             if (setting.IsAutoAdventure)
             {
+                var hero = context.Heroes.Find(AccountId);
+                if (hero.Status != Enums.HeroStatusEnums.Home)
+                {
+                    _logManager.Warning(AccountId, "Hero is not at home. Cannot start adventures");
+                    return;
+                }
                 var adventures = context.Adventures.Where(a => a.AccountId == AccountId);
                 if (adventures.Any())
                 {

MainCore/Tasks/Update/UpdateDorf1.cs

@@ -28,7 +28,7 @@ private void NextExcute()
             var tasks = _taskManager.GetList(AccountId);
             var updateTasks = tasks.OfType<UpdateDorf1>().OrderByDescending(x => x.ExecuteAt);
             var updateTask = updateTasks.FirstOrDefault();
-
+            if (updateTask is null) return;
             using var context = _contextFactory.CreateDbContext();
             var setting = context.VillagesSettings.Find(VillageId);
             var rand = new Random(DateTime.Now.Second);

MainCore/Tasks/Update/UpdateInfo.cs

@@ -77,7 +77,7 @@ private void UpdateVillageList()
                 });
                 context.AddVillage(newVill.Id);
 
-                var tasks = _taskManager.GetList(AccountId).Where(x => x.GetType() == typeof(UpdateBothDorf)).Cast<UpdateVillage>().ToList();
+                var tasks = _taskManager.GetList(AccountId).OfType<UpdateVillage>().ToList();
                 var task = tasks.FirstOrDefault(x => x.VillageId == newVill.Id);
                 if (task is null)
                 {

WPFUI/App.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:WPFUI"
-             Startup="Application_Startup" Exit="Application_Exit">
+             Startup="Application_Startup">
     <Application.Resources>
     </Application.Resources>
 </Application>

WPFUI/App.xaml.cs

@@ -19,14 +19,16 @@ namespace WPFUI
     public partial class App : Application
     {
         private static ServiceProvider _provider;
-        public static IServiceProvider Provider => _provider;
+        public static ServiceProvider Provider => _provider;
 
         private static WaitingWindow _waitingWindow;
         private static MainWindow _mainWindow;
+        private static VersionWindow _versionWindow;
 
         public static T GetService<T>()
         {
             if (typeof(T) == typeof(WaitingWindow)) return (T)Convert.ChangeType(_waitingWindow, typeof(T));
+            if (typeof(T) == typeof(VersionWindow)) return (T)Convert.ChangeType(_versionWindow, typeof(T));
             if (typeof(T) == typeof(MainWindow)) return (T)Convert.ChangeType(_mainWindow, typeof(T));
 
             return Provider.GetRequiredService<T>();
@@ -35,15 +37,23 @@ public static T GetService<T>()
         private async void Application_Startup(object sender, StartupEventArgs e)
         {
             _provider = new ServiceCollection().ConfigureServices().BuildServiceProvider();
+            _versionWindow = new();
             _waitingWindow = new();
             _mainWindow = new();
 
             var waitingWindow = GetService<WaitingWindow>();
             waitingWindow.ViewModel.Show("loading data");
+            try
+            {
+                await ChromeDriverInstaller.Install();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Error");
+            }
 
             var tasks = new List<Task>
             {
-                ChromeDriverInstaller.Install(),
                 Task.Run(() =>
                 {
                     var chromeManager = GetService<IChromeManager>();
@@ -79,18 +89,15 @@ private async void Application_Startup(object sender, StartupEventArgs e)
 
             await Task.WhenAll(tasks);
 
-            var versionWindow = new VersionWindow();
+            var versionWindow = GetService<VersionWindow>();
+
             await versionWindow.ViewModel.Load();
-            if (versionWindow.ViewModel.IsNewVersion) versionWindow.Show();
 
             var mainWindow = GetService<MainWindow>();
             mainWindow.Show();
             waitingWindow.ViewModel.Close();
-        }
 
-        private void Application_Exit(object sender, ExitEventArgs e)
-        {
-            _provider.Dispose();
+            if (versionWindow.ViewModel.IsNewVersion) versionWindow.Show();
         }
     }
 

WPFUI/Models/AccountSetting.cs

@@ -1,4 +1,6 @@
-using ReactiveUI;
+using MainCore.Helper;
+using ReactiveUI;
+using System.Windows;
 
 namespace WPFUI.Models
 {
@@ -25,21 +27,25 @@ public void CopyTo(MainCore.Models.Database.AccountSetting settings)
             var clickDelay = int.Parse(ClickDelay);
             var clickDelayRange = int.Parse(ClickDelayRange);
             settings.ClickDelayMin = clickDelay - clickDelayRange;
+            if (settings.ClickDelayMin < 0) settings.ClickDelayMin = 0;
             settings.ClickDelayMax = clickDelay + clickDelayRange;
 
             var taskDelay = int.Parse(TaskDelay);
             var taskDelayRange = int.Parse(TaskDelayRange);
             settings.TaskDelayMin = taskDelay - taskDelayRange;
+            if (settings.TaskDelayMin < 0) settings.TaskDelayMin = 0;
             settings.TaskDelayMax = taskDelay + taskDelayRange;
 
             var workTime = int.Parse(WorkTime);
             var workTimeRange = int.Parse(WorkTimeRange);
             settings.WorkTimeMin = workTime - workTimeRange;
+            if (settings.WorkTimeMin < 0) settings.WorkTimeMin = 0;
             settings.WorkTimeMax = workTime + workTimeRange;
 
             var sleepTime = int.Parse(SleepTime);
             var sleepTimeRange = int.Parse(SleepTimeRange);
             settings.SleepTimeMin = sleepTime - sleepTimeRange;
+            if (settings.SleepTimeMin < 0) settings.SleepTimeMin = 0;
             settings.SleepTimeMax = sleepTime + sleepTimeRange;
 
             settings.IsDontLoadImage = IsDontLoadImage;
@@ -48,6 +54,51 @@ public void CopyTo(MainCore.Models.Database.AccountSetting settings)
             settings.IsAutoAdventure = IsAutoStartAdventure;
         }
 
+        public bool IsVaild()
+        {
+            if (!ClickDelay.IsNumeric())
+            {
+                MessageBox.Show("Click delay is not a number.", "Warning");
+                return false;
+            }
+            if (!ClickDelayRange.IsNumeric())
+            {
+                MessageBox.Show("Click delay range is not a number.", "Warning");
+                return false;
+            }
+            if (!TaskDelay.IsNumeric())
+            {
+                MessageBox.Show("Task delay is not a number.", "Warning");
+                return false;
+            }
+            if (!TaskDelayRange.IsNumeric())
+            {
+                MessageBox.Show("Task delay range is not a number.", "Warning");
+                return false;
+            }
+            if (!WorkTime.IsNumeric())
+            {
+                MessageBox.Show("Work time is not a number.", "Warning");
+                return false;
+            }
+            if (!WorkTimeRange.IsNumeric())
+            {
+                MessageBox.Show("Work time range is not a number.", "Warning");
+                return false;
+            }
+            if (!SleepTime.IsNumeric())
+            {
+                MessageBox.Show("Sleep time is not a number.", "Warning");
+                return false;
+            }
+            if (!SleepTimeRange.IsNumeric())
+            {
+                MessageBox.Show("Sleep time range is not a number.", "Warning");
+                return false;
+            }
+            return true;
+        }
+
         private string _clickDelay;
 
         public string ClickDelay

WPFUI/Models/VillageSetting.cs

@@ -31,17 +31,21 @@ public void CopyTo(MainCore.Models.Database.VillageSetting settings)
             settings.IsUseHeroRes = IsUseHeroRes;
             settings.IsInstantComplete = IsInstantComplete;
             settings.InstantCompleteTime = int.Parse(InstantCompleteTime);
+            if (settings.InstantCompleteTime < 0) settings.InstantCompleteTime = 0;
             settings.IsAdsUpgrade = IsAdsUpgrade;
             settings.AdsUpgradeTime = int.Parse(AdsUpgradeTime);
+            if (settings.AdsUpgradeTime < 0) settings.AdsUpgradeTime = 0;
 
             settings.IsAutoRefresh = IsAutoRefresh;
             var autoRefreshTime = int.Parse(AutoRefreshTime);
             var autoRefreshTimeTolerance = int.Parse(AutoRefreshTimeTolerance);
             settings.AutoRefreshTimeMin = autoRefreshTime - autoRefreshTimeTolerance;
+            if (settings.AutoRefreshTimeMin < 0) settings.AutoRefreshTimeMin = 0;
             settings.AutoRefreshTimeMax = autoRefreshTime + autoRefreshTimeTolerance;
 
             settings.IsAutoNPC = IsAutoNPC;
             settings.AutoNPCPercent = int.Parse(AutoNPCPercent);
+            if (settings.AutoRefreshTimeMin < 4) settings.AutoRefreshTimeMin = 4;
             settings.AutoNPCWood = int.Parse(AutoNPCWood);
             settings.AutoNPCClay = int.Parse(AutoNPCClay);
             settings.AutoNPCIron = int.Parse(AutoNPCIron);