Merge pull request #195 from Erol444/release/2.3.0

Release 2.3.0 - Change to numeric input instead of text input - Fix sleep problem - Fix wrong condition on auto NPC crop (thanks to @valenciaga1231) - Add auto NPC for normal resource - Add ignore Roman tribe's advantage (build 2 buildings instead of 3 for first village) If you like my work, you can donate to me through [ko-fi.com/vinaghost](https://ko-fi.com/vinaghost)
Erol444 · Nov 23, 2022 · 5ca74e0 · 5ca74e0
2 parents 9dc927e + 4fbbb62
commit 5ca74e0
Show file tree

Hide file tree

Showing 64 changed files with 288 additions and 147 deletions.
diff --git a/.github/workflows/hotfix.yml b/.github/workflows/hotfix.yml
@@ -112,7 +112,7 @@ jobs:
         uses: sarisia/actions-status-discord@v1
         with:
           webhook: ${{ secrets.DISCORD_BOT }}
-          title: New hotfix
+          title: New patch
           nodetail: true
           description: |
               Version `TBS-${{needs.version.outputs.version}}`

diff --git a/.gitignore b/.gitignore
@@ -376,4 +376,6 @@ data/
 
 Web/Client/
 Web/Server/
-Web/Shared/
+Web/Shared/
+/TBS.db-shm
+/TBS.db-wal
diff --git a/MainCore/AppDbContext.cs b/MainCore/AppDbContext.cs
@@ -507,6 +507,8 @@ public void AddVersionInfo()
                 KeyValuePair.Create(202210061322,"NPCMigrations"),
                 KeyValuePair.Create(202210162304,"TroopsMigrations"),
                 KeyValuePair.Create(202210181120,"UpgradeTroopMigrations"),
+                KeyValuePair.Create(202210271504,"NPCForWarhouse"),
+                KeyValuePair.Create(2022102716038,"IgnoreRomanAdvantage"),
             };
             foreach (var migration in migrations)
             {

diff --git a/MainCore/Helper/BuildingsHelper.cs b/MainCore/Helper/BuildingsHelper.cs
@@ -1,6 +1,6 @@
 using MainCore.Enums;
 using MainCore.Models.Runtime;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/MainCore/Helper/CheckHelper.cs b/MainCore/Helper/CheckHelper.cs
@@ -1,7 +1,7 @@
 using HtmlAgilityPack;
 using MainCore.Enums;
-using MainCore.Services;
 using System.Linq;
+using MainCore.Services.Interface;
 
 #if TRAVIAN_OFFICIAL
 

diff --git a/MainCore/Helper/ClickHelper.cs b/MainCore/Helper/ClickHelper.cs
@@ -1,5 +1,5 @@
 using HtmlAgilityPack;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using OpenQA.Selenium;
 using System;
 

diff --git a/MainCore/Helper/HeroHelper.cs b/MainCore/Helper/HeroHelper.cs
@@ -1,6 +1,6 @@
 using HtmlAgilityPack;
 using MainCore.Enums;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using OpenQA.Selenium;
 using System;
 

diff --git a/MainCore/Helper/NavigateHelper.cs b/MainCore/Helper/NavigateHelper.cs
@@ -1,9 +1,9 @@
-using MainCore.Services;
-using System;
+using System;
 using OpenQA.Selenium;
 using MainCore.Exceptions;
 using System.Threading;
 using System.Collections.ObjectModel;
+using MainCore.Services.Interface;
 
 #if TRAVIAN_OFFICIAL
 

diff --git a/MainCore/Helper/UpdateHelper.cs b/MainCore/Helper/UpdateHelper.cs
@@ -1,6 +1,6 @@
 using MainCore.Enums;
 using MainCore.Models.Database;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/MainCore/Helper/UpgradeBuildingHelper.cs b/MainCore/Helper/UpgradeBuildingHelper.cs
@@ -1,7 +1,7 @@
 using MainCore.Enums;
 using MainCore.Models.Database;
 using MainCore.Models.Runtime;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,17 +27,18 @@ public static PlanTask NextBuildingTask(AppDbContext context, IPlanManager planM
                 var accountInfo = context.AccountsInfo.Find(accountId);
                 var tribe = accountInfo.Tribe;
                 var hasPlusAccount = accountInfo.HasPlusAccount;
+                var setting = context.VillagesSettings.Find(villageId);
 
                 var maxBuild = 1;
                 if (hasPlusAccount) maxBuild++;
-                if (tribe == TribeEnums.Romans) maxBuild++;
+                if (tribe == TribeEnums.Romans && !setting.IsIgnoreRomanAdvantage) maxBuild++;
                 if (totalBuild == maxBuild)
                 {
                     logManager.Information(accountId, "Amount of currently building is equal with maximum building can build in same time");
                     return null;
                 }
 
-                if (tribe == TribeEnums.Romans && maxBuild - totalBuild == 1)
+                if (tribe == TribeEnums.Romans && !setting.IsIgnoreRomanAdvantage && maxBuild - totalBuild == 1)
                 {
                     var numRes = currentList.Count(x => x.Type.IsResourceField());
                     var numInfra = totalBuild - numRes;

diff --git a/MainCore/Migrations/202210271504_NPCForWarhouse.cs b/MainCore/Migrations/202210271504_NPCForWarhouse.cs
@@ -0,0 +1,22 @@
+using FluentMigrator;
+
+namespace MainCore.Migrations
+{
+    [Migration(202210271504)]
+    public class NPCForWarhouse : Migration
+    {
+        public override void Down()
+        {
+            Delete
+                .Column("IsNPCOverflow")
+                .Column("AutoNPCWarehousePercent").FromTable("VillagesSettings");
+        }
+
+        public override void Up()
+        {
+            Alter.Table("VillagesSettings")
+                .AddColumn("IsNPCOverflow").AsBoolean().WithDefaultValue(false)
+                .AddColumn("AutoNPCWarehousePercent").AsInt32().WithDefaultValue(90);
+        }
+    }
+}
diff --git a/MainCore/Migrations/2022102716038_IgnoreRomanAdvantage.cs b/MainCore/Migrations/2022102716038_IgnoreRomanAdvantage.cs
@@ -0,0 +1,20 @@
+using FluentMigrator;
+
+namespace MainCore.Migrations
+{
+    [Migration(2022102716038)]
+    public class IgnoreRomanAdvantage : Migration
+    {
+        public override void Down()
+        {
+            Delete
+                .Column("IsIgnoreRomanAdvantage").FromTable("VillagesSettings");
+        }
+
+        public override void Up()
+        {
+            Alter.Table("VillagesSettings")
+                .AddColumn("IsIgnoreRomanAdvantage").AsBoolean().WithDefaultValue(false);
+        }
+    }
+}
diff --git a/MainCore/Models/Database/VillageSetting.cs b/MainCore/Models/Database/VillageSetting.cs
@@ -6,7 +6,7 @@ public class VillageSetting
     {
         public int VillageId { get; set; }
         public bool IsUseHeroRes { get; set; }
-
+        public bool IsIgnoreRomanAdvantage { get; set; }
         public bool IsInstantComplete { get; set; }
         public int InstantCompleteTime { get; set; }
 
@@ -18,7 +18,9 @@ public class VillageSetting
         public int AutoRefreshTimeMax { get; set; }
 
         public bool IsAutoNPC { get; set; }
+        public bool IsNPCOverflow { get; set; }
         public int AutoNPCPercent { get; set; }
+        public int AutoNPCWarehousePercent { get; set; }
         public int AutoNPCWood { get; set; }
         public int AutoNPCClay { get; set; }
         public int AutoNPCIron { get; set; }

diff --git a/MainCore/Services/ChromeBrowser.cs → ...Services/Implementations/ChromeBrowser.cs b/MainCore/Services/ChromeBrowser.cs → ...Services/Implementations/ChromeBrowser.cs
@@ -1,13 +1,14 @@
 using HtmlAgilityPack;
 using MainCore.Models.Database;
+using MainCore.Services.Interface;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Chrome.ChromeDriverExtensions;
 using OpenQA.Selenium.Support.UI;
 using System;
 using System.IO;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class ChromeBrowser : IChromeBrowser
     {

diff --git a/MainCore/Services/ChromeDriverInstaller.cs → .../Implementations/ChromeDriverInstaller.cs b/MainCore/Services/ChromeDriverInstaller.cs → .../Implementations/ChromeDriverInstaller.cs
@@ -8,7 +8,7 @@
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public static class ChromeDriverInstaller
     {

diff --git a/MainCore/Services/ChromeManager.cs → ...Services/Implementations/ChromeManager.cs b/MainCore/Services/ChromeManager.cs → ...Services/Implementations/ChromeManager.cs
@@ -3,8 +3,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using MainCore.Services.Interface;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class ChromeManager : IChromeManager
     {

diff --git a/MainCore/Services/EventManager.cs → .../Services/Implementations/EventManager.cs b/MainCore/Services/EventManager.cs → .../Services/Implementations/EventManager.cs
@@ -1,7 +1,7 @@
 using MainCore.Models.Runtime;
 using System;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class EventManager
     {

diff --git a/MainCore/Services/LogManager.cs → ...re/Services/Implementations/LogManager.cs b/MainCore/Services/LogManager.cs → ...re/Services/Implementations/LogManager.cs
@@ -1,11 +1,12 @@
 using MainCore.Enums;
 using MainCore.Models.Runtime;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
 using System;
 using System.Collections.Generic;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class LogManager : ILogManager
     {

diff --git a/MainCore/Services/PlanManager.cs → ...e/Services/Implementations/PlanManager.cs b/MainCore/Services/PlanManager.cs → ...e/Services/Implementations/PlanManager.cs
@@ -1,11 +1,12 @@
 using MainCore.Helper;
 using MainCore.Models.Runtime;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class PlanManager : IPlanManager
     {

diff --git a/MainCore/Services/RestClientManager.cs → ...ices/Implementations/RestClientManager.cs b/MainCore/Services/RestClientManager.cs → ...ices/Implementations/RestClientManager.cs
@@ -1,4 +1,5 @@
 using MainCore.Models.Runtime;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using RestSharp;
 using System;
@@ -7,7 +8,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class RestClientManager : IRestClientManager
     {

diff --git a/MainCore/Services/TaskManager.cs → ...e/Services/Implementations/TaskManager.cs b/MainCore/Services/TaskManager.cs → ...e/Services/Implementations/TaskManager.cs
@@ -2,6 +2,7 @@
 using MainCore.Exceptions;
 using MainCore.Helper;
 using MainCore.Models.Database;
+using MainCore.Services.Interface;
 using MainCore.Tasks;
 using MainCore.Tasks.Misc;
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +11,7 @@
 using System.Linq;
 using System.Threading;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class TaskManager : ITaskManager
     {

diff --git a/MainCore/Services/TimerManager.cs → .../Services/Implementations/TimerManager.cs b/MainCore/Services/TimerManager.cs → .../Services/Implementations/TimerManager.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Timers;
+using MainCore.Services.Interface;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class TimerManager : ITimerManager
     {
@@ -23,7 +24,7 @@ public void Start(int index)
             if (!_dictTimer.ContainsKey(index))
             {
                 var timer = new Timer(100) { AutoReset = false };
-                timer.Elapsed += (object sender, ElapsedEventArgs e) =>
+                timer.Elapsed += (sender, e) =>
                 {
                     try
                     {

diff --git a/MainCore/Services/UseragentManager.cs → ...vices/Implementations/UseragentManager.cs b/MainCore/Services/UseragentManager.cs → ...vices/Implementations/UseragentManager.cs
@@ -1,11 +1,12 @@
-using RestSharp;
+using MainCore.Services.Interface;
+using RestSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class UseragentManager : IUseragentManager
     {

diff --git a/MainCore/Services/IChromeBrowser.cs → ...Core/Services/Interface/IChromeBrowser.cs b/MainCore/Services/IChromeBrowser.cs → ...Core/Services/Interface/IChromeBrowser.cs
@@ -3,7 +3,7 @@
 using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Support.UI;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IChromeBrowser
     {

diff --git a/MainCore/Services/IChromeManager.cs → ...Core/Services/Interface/IChromeManager.cs b/MainCore/Services/IChromeManager.cs → ...Core/Services/Interface/IChromeManager.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IChromeManager : IDisposable
     {

diff --git a/MainCore/Services/ILogManager.cs → MainCore/Services/Interface/ILogManager.cs b/MainCore/Services/ILogManager.cs → MainCore/Services/Interface/ILogManager.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface ILogManager : IDisposable
     {

diff --git a/MainCore/Services/IPlanManager.cs → MainCore/Services/Interface/IPlanManager.cs b/MainCore/Services/IPlanManager.cs → MainCore/Services/Interface/IPlanManager.cs
@@ -1,7 +1,7 @@
 using MainCore.Models.Runtime;
 using System.Collections.Generic;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IPlanManager
     {

diff --git a/MainCore/Services/IRestClientManager.cs → .../Services/Interface/IRestClientManager.cs b/MainCore/Services/IRestClientManager.cs → .../Services/Interface/IRestClientManager.cs
@@ -2,7 +2,7 @@
 using RestSharp;
 using System;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IRestClientManager : IDisposable
     {

diff --git a/MainCore/Services/ITaskManager.cs → MainCore/Services/Interface/ITaskManager.cs b/MainCore/Services/ITaskManager.cs → MainCore/Services/Interface/ITaskManager.cs
@@ -2,7 +2,7 @@
 using MainCore.Tasks;
 using System.Collections.Generic;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface ITaskManager
     {

diff --git a/MainCore/Services/ITimerManager.cs → MainCore/Services/Interface/ITimerManager.cs b/MainCore/Services/ITimerManager.cs → MainCore/Services/Interface/ITimerManager.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface ITimerManager : IDisposable
     {

diff --git a/MainCore/Services/IUseragentManager.cs → ...e/Services/Interface/IUseragentManager.cs b/MainCore/Services/IUseragentManager.cs → ...e/Services/Interface/IUseragentManager.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IUseragentManager
     {

diff --git a/MainCore/Tasks/Attack/StartFarmList.cs b/MainCore/Tasks/Attack/StartFarmList.cs
@@ -1,5 +1,6 @@
 using MainCore.Helper;
-using MainCore.Services;
+using MainCore.Services.Implementations;
+using MainCore.Services.Interface;
 using MainCore.Tasks.Update;
 using Microsoft.EntityFrameworkCore;
 using OpenQA.Selenium;

diff --git a/MainCore/Tasks/BotTask.cs b/MainCore/Tasks/BotTask.cs
@@ -1,5 +1,6 @@
 using MainCore.Enums;
-using MainCore.Services;
+using MainCore.Services.Implementations;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Threading;