Merge pull request #82 from Erol444/fix_constructing_bug

Fixed construction of military/resource buildings bug

Author: Erol444

TbsCore/Core/WebBrowserInfo.cs

@@ -107,6 +107,9 @@ private void SetupChromeDriver(Access.Access access, string username, string ser
             options.AddArguments("--disable-logging");
             options.AddArguments("--disable-infobars");
 
+            //options.AddAdditionalCapability("deviceOrientation", "landscape", true);
+            //options.AddAdditionalCapability("resolution", "1280x720", true);
+
             // Mute audio because of the Ads
             options.AddArguments("--mute-audio");
 

TbsCore/Helpers/BuildingHelper.cs

@@ -168,7 +168,7 @@ public static List<string> SetPrereqCombo(Account acc, Village vill)
 
         public static void ReStartBuilding(Account acc, Village vill)
         {
-            RemoveCompletedTasks(vill, acc);
+            RemoveCompletedTasks(vill);
             //remove ongoing building task for this village
             acc.Tasks.Remove(typeof(UpgradeBuilding), vill);
 
@@ -198,12 +198,12 @@ public static void ReStartDemolishing(Account acc, Village vill)
                 //check cranny/warehouse/grannary/trapper/GG/GW
                 switch (building)
                 {
-                    case BuildingEnum.Warehouse: return BuildingIsOnLevel(BuildingEnum.Warehouse, 20, vill);
-                    case BuildingEnum.Granary: return BuildingIsOnLevel(BuildingEnum.Granary, 20, vill);
-                    case BuildingEnum.GreatWarehouse: return BuildingIsOnLevel(BuildingEnum.GreatWarehouse, 20, vill);
-                    case BuildingEnum.GreatGranary: return BuildingIsOnLevel(BuildingEnum.GreatGranary, 20, vill);
-                    case BuildingEnum.Trapper: return BuildingIsOnLevel(BuildingEnum.Trapper, 20, vill);
-                    case BuildingEnum.Cranny: return BuildingIsOnLevel(BuildingEnum.Cranny, 10, vill);
+                    case BuildingEnum.Warehouse: return BuildingAboveLevel(BuildingEnum.Warehouse, 20, vill);
+                    case BuildingEnum.Granary: return BuildingAboveLevel(BuildingEnum.Granary, 20, vill);
+                    case BuildingEnum.GreatWarehouse: return BuildingAboveLevel(BuildingEnum.GreatWarehouse, 20, vill);
+                    case BuildingEnum.GreatGranary: return BuildingAboveLevel(BuildingEnum.GreatGranary, 20, vill);
+                    case BuildingEnum.Trapper: return BuildingAboveLevel(BuildingEnum.Trapper, 20, vill);
+                    case BuildingEnum.Cranny: return BuildingAboveLevel(BuildingEnum.Cranny, 10, vill);
                     default: return false;
                 }
             }
@@ -220,11 +220,13 @@ public static void ReStartDemolishing(Account acc, Village vill)
             return true;
         }
 
-        private static bool BuildingIsOnLevel(BuildingEnum building, int lvl, Village vill)
+        /// <summary>
+        /// Whether there's a building above specific level or there's a task for this building
+        /// </summary>
+        public static bool BuildingAboveLevel(BuildingEnum building, int lvl, Village vill)
         {
-            //if there already is a building on specific level or there is a task for this building
-            // TODO: change FristOrDefault to Any
-            return (vill.Build.Buildings.FirstOrDefault(x => x.Level == lvl && x.Type == building) != null || vill.Build.Tasks.FirstOrDefault(x => x.Level == lvl && x.Building == building) != null);
+            return (vill.Build.Buildings.Any(x => x.Type == building && lvl <= x.Level) ||
+                    vill.Build.Tasks.Any(x => x.Building == building && lvl <= x.Level));
         }
 
         /// <summary>
@@ -254,7 +256,7 @@ public static bool RemoveFinishedCB(Village vill)
         }
 
         /// <summary>
-        /// Used by building task to get the url for navigation
+        /// Used by building task to get the url for navigation (for TTWars only)
         /// </summary>
         /// <param name="vill">Village</param>
         /// <param name="task">BotTask</param>
@@ -272,7 +274,7 @@ public static (string, bool) GetUrlForBuilding(Account acc, Village vill, Buildi
             return (null, true);
         }
 
-        public static bool IsTaskCompleted(Village vill, Account acc, BuildingTask task)
+        public static bool IsTaskCompleted(Village vill, BuildingTask task)
         {
             if (vill == null) return true;
             var building = vill.Build.Buildings.FirstOrDefault(x => x.Id == task.BuildingId);
@@ -336,7 +338,7 @@ private static (string, bool) GetUrlGeneralTask(Village vill, BuildingTask task)
                 }
                 else // there's already a building in this spot, construct a building elsewhere
                 {
-                    if (!BuildingHelper.FindBuildingId(vill, task))
+                    if (!FindBuildingId(vill, task))
                     {
                         return (null, false);
                     }
@@ -548,62 +550,38 @@ public static bool IsWall(BuildingEnum building)
         /// </summary>
         /// <param name="vill">Village</param>
         /// <param name="acc">Account</param>
-        public static void RemoveCompletedTasks(Village vill, Account acc) =>
-            vill.Build.Tasks.RemoveAll(task => IsTaskCompleted(vill, acc, task));
-
-        /// <summary>
-        /// When you already build one warehouse to lv 1, you want import template but its warehouse in another poistion
-        /// This will fix it to current
-        /// </summary>
-        /// <param name="vill"></param>
-        /// <param name="acc"></param>
-        public static void FixPositionBuilding(Village vill, Account acc)
-        {
-        }
+        public static void RemoveCompletedTasks(Village vill) =>
+            vill.Build.Tasks.RemoveAll(task => IsTaskCompleted(vill, task));
 
+        
         #region Functions for auto-building resource fields
 
         public static Building FindLowestLevelBuilding(List<Building> buildings)
         {
-            // TODO: test after implementation
-            //return buildings
-            //        .OrderBy(x => x.Level + (x.UnderConstruction ? 1 : 0))
-            //        .FirstOrDefault();
-
-            if (buildings.Count == 0) return null;
-            int lowestLvl = 100;
-            Building lowestBuilding = new Building();
-            for (int i = 0; i < buildings.Count; i++)
-            {
-                var buildingLevel = buildings[i].Level;
-                if (buildings[i].UnderConstruction) buildingLevel++;
-                if (lowestLvl > buildingLevel)
-                {
-                    lowestLvl = buildingLevel;
-                    lowestBuilding = buildings[i];
-                }
-            }
-            return lowestBuilding;
+            return buildings
+                .OrderBy(x => x.Level + (x.UnderConstruction ? 1 : 0))
+                .FirstOrDefault();
         }
 
-        private static Building GetLowestProduction(List<Building> buildings, Village vill)
+        public static Building GetLowestProduction(List<Building> buildings, Village vill)
         {
-            //get distinct field types
+            // Get distinct field types
             var distinct = buildings.Select(x => x.Type).Distinct().ToList();
-            long lowestProd = long.MaxValue;
-            BuildingEnum toUpgrade = BuildingEnum.Cropland;
 
-            foreach (var distinctType in distinct)
+            var prodArr = vill.Res.Production.ToArray();
+            var dict = new Dictionary<BuildingEnum, long>();
+            for(int i=0; i<4; i++)
             {
-                if (distinctType == BuildingEnum.Woodcutter && vill.Res.Production.Wood < lowestProd) { lowestProd = vill.Res.Production.Wood; toUpgrade = BuildingEnum.Woodcutter; }
-                if (distinctType == BuildingEnum.ClayPit && vill.Res.Production.Clay < lowestProd) { lowestProd = vill.Res.Production.Clay; toUpgrade = BuildingEnum.ClayPit; }
-                if (distinctType == BuildingEnum.IronMine && vill.Res.Production.Iron < lowestProd) { lowestProd = vill.Res.Production.Iron; toUpgrade = BuildingEnum.IronMine; }
-                if (distinctType == BuildingEnum.Cropland && vill.Res.Production.Crop < lowestProd) { lowestProd = vill.Res.Production.Crop; toUpgrade = BuildingEnum.Cropland; }
+                var resField = (BuildingEnum)i + 1;
+                if (!distinct.Any(x => x == resField)) continue;
+                dict.Add(resField, prodArr[i]);
             }
+
+            var toUpgrade = dict.First(x => x.Value == dict.Min(y => y.Value)).Key;
             return FindLowestLevelBuilding(buildings.Where(x => x.Type == toUpgrade).ToList());
         }
 
-        private static Building GetLowestRes(Account acc, Village vill, List<Building> buildings)
+        public static Building GetLowestRes(Account acc, Village vill, List<Building> buildings)
         {
             //get distinct field types
             var distinct = buildings.Select(x => x.Type).Distinct().ToList();

TbsCore/Helpers/Classificator.cs

@@ -508,9 +508,9 @@ public enum DifficultyEnum
 
         public enum BuildingCategoryEnum
         {
-            Infrastructure = 1,
-            Military = 2,
-            Resources = 3
+            Infrastructure = 0,
+            Military = 1,
+            Resources = 2,
         }
 
         public enum BuildingType

TbsCore/Helpers/IoHelperCore.cs

@@ -62,7 +62,7 @@ public static void AddBuildTasksFromFile(Account acc, Village vill, string locat
             {
                 BuildingHelper.AddBuildingTask(acc, vill, task);
             }
-            BuildingHelper.RemoveCompletedTasks(vill, acc);
+            BuildingHelper.RemoveCompletedTasks(vill);
         }
 
         private static List<BuildingTask> DecodeTrbc(TbRoot root)

TbsCore/Helpers/NavigationHelper.cs

@@ -5,6 +5,7 @@
 using TbsCore.Models.MapModels;
 using TbsCore.Models.VillageModels;
 using TbsCore.Parsers;
+using TbsCore.TravianData;
 using static TbsCore.Helpers.Classificator;
 
 namespace TbsCore.Helpers
@@ -78,7 +79,14 @@ function clickFirst(node)
             }
             await DriverHelper.WaitLoaded(acc);
         }
-            
+
+        internal static async Task ToConstructionTab(Account acc, BuildingEnum building)
+        {
+            BuildingCategoryEnum tab = BuildingsData.GetBuildingsCategory(building);
+            if ((int)tab == 0) return;
+            await DriverHelper.ClickByClassName(acc, "tabItem", (int)tab);
+        }
+
 
         /// <summary>
         /// TTWars convert tab into url query

TbsCore/Helpers/UpgradeBuildingHelper.cs

@@ -50,7 +50,7 @@ public static (BuildingTask, DateTime) NextBuildingTask(Account acc, Village vil
             task = vill.Build.Tasks.First();
 
             //If this task is already complete, remove it and repeat the finding process
-            if (BuildingHelper.IsTaskCompleted(vill, acc, task))
+            if (BuildingHelper.IsTaskCompleted(vill, task))
             {
                 vill.Build.Tasks.Remove(task); //task has been completed
                 return NextBuildingTask(acc, vill);

TbsCore/Models/ResourceModels/Resources.cs

@@ -10,6 +10,13 @@ public Resources(long[] res)
             Iron = res[2];
             Crop = res[3];
         }
+        public Resources(long wood, long clay, long iron, long crop)
+        {
+            Wood = wood;
+            Clay = clay;
+            Iron = iron;
+            Crop = crop;
+        }
 
         public long Wood { get; set; }
         public long Clay { get; set; }

TbsCore/Tasks/LowLevel/UpgradeBuilding.cs

@@ -60,6 +60,7 @@ await TTWarsTryFastUpgrade(acc, $"{acc.AccInfo.ServerUrl}/build.php?id={urlId}")
             }
 
             await NavigationHelper.EnterBuilding(acc, Vill, (int)Task.BuildingId);
+            await NavigationHelper.ToConstructionTab(acc, Task.Building);
 
             var constructContract = acc.Wb.Html.GetElementbyId($"contract_building{(int)Task.Building}");
             var upgradeContract = acc.Wb.Html.GetElementbyId("build");
@@ -161,7 +162,7 @@ private async Task<TaskRes> Upgrade(Account acc, HtmlNode node)
             {
                 acc.Logger.Warning($"{this.Task.Building} is on level {lvl}, on/above desired {Task.Level}. Removing it from queue.");
                 RemoveCurrentTask();
-                RemoveCompletedTasks(this.Vill, acc);
+                RemoveCompletedTasks(this.Vill);
                 return TaskRes.Executed;
             }
 
@@ -196,7 +197,7 @@ private async Task<TaskRes> Upgrade(Account acc, HtmlNode node)
 
             var buildDuration = InfrastructureParser.GetBuildDuration(container, acc.AccInfo.ServerVersion);
 
-            if (IsTaskCompleted(Vill, acc, this.Task))
+            if (IsTaskCompleted(Vill, this.Task))
             {
                 acc.Logger.Warning($"Building {this.Task.Building} in village {this.Vill.Name} is already on desired level. Will be removed from the queue.");
                 RemoveCurrentTask();

TravBotSharp/Views/GeneralUc.cs

@@ -112,7 +112,7 @@ private void button16_Click(object sender, EventArgs e) //all villages farm task
             foreach (var vill in acc.Villages)
             {
                 DefaultConfigurations.FarmVillagePlan(acc, vill);
-                BuildingHelper.RemoveCompletedTasks(vill, acc);
+                BuildingHelper.RemoveCompletedTasks(vill);
             }
         }
 
@@ -122,7 +122,7 @@ private void button17_Click(object sender, EventArgs e) //all villages support t
             foreach (var vill in acc.Villages)
             {
                 DefaultConfigurations.SupplyVillagePlan(acc, vill);
-                BuildingHelper.RemoveCompletedTasks(vill, acc);
+                BuildingHelper.RemoveCompletedTasks(vill);
             }
         }
 
@@ -132,7 +132,7 @@ private void button14_Click(object sender, EventArgs e) //all villages deff task
             foreach (var vill in acc.Villages)
             {
                 DefaultConfigurations.DeffVillagePlan(acc, vill);
-                BuildingHelper.RemoveCompletedTasks(vill, acc);
+                BuildingHelper.RemoveCompletedTasks(vill);
             }
         }
 
@@ -142,7 +142,7 @@ private void button4_Click(object sender, EventArgs e) //all villages off tasks
             foreach (var vill in acc.Villages)
             {
                 DefaultConfigurations.OffVillagePlan(acc, vill);
-                BuildingHelper.RemoveCompletedTasks(vill, acc);
+                BuildingHelper.RemoveCompletedTasks(vill);
             }
         }
 

TravBotSharp/Views/VillageViews/BuildUc.cs

@@ -347,7 +347,7 @@ private void button20_Click(object sender, EventArgs e) //support vill button
             var acc = GetSelectedAcc();
             var vill = GetSelectedVillage();
             DefaultConfigurations.SupplyVillagePlan(acc, vill);
-            BuildingHelper.RemoveCompletedTasks(vill, acc);
+            BuildingHelper.RemoveCompletedTasks(vill);
             UpdateUc();
         }
 
@@ -356,7 +356,7 @@ private void button19_Click(object sender, EventArgs e) //off vill button
             var acc = GetSelectedAcc();
             var vill = GetSelectedVillage();
             DefaultConfigurations.OffVillagePlan(acc, vill);
-            BuildingHelper.RemoveCompletedTasks(vill, acc);
+            BuildingHelper.RemoveCompletedTasks(vill);
             UpdateUc();
         }
 
@@ -365,7 +365,7 @@ private void button6_Click(object sender, EventArgs e) //deff vill button
             var acc = GetSelectedAcc();
             var vill = GetSelectedVillage();
             DefaultConfigurations.DeffVillagePlan(acc, vill);
-            BuildingHelper.RemoveCompletedTasks(vill, acc);
+            BuildingHelper.RemoveCompletedTasks(vill);
             UpdateUc();
         }