Merge pull request #84 from Erol444/develop

New version out

Author: Erol444

.github/workflows/pre-release.yml

@@ -99,11 +99,10 @@ jobs:
           path: TravBotSharp/bin/Release
 
       - name: Archive pre release
-        uses: papeloto/action-zip@v1
+        uses: montudor/action-zip@v1
         with:
-            files: TravBotSharp/bin/Release
-            dest: TBS-${{needs.version.outputs.version}}.zip
-      
+            args: zip -qq -r TBS-${{needs.version.outputs.version}}.zip TravBotSharp/bin/Release
+
       - name: Create pre release
         uses: ncipollo/release-action@v1
         with:

.github/workflows/release.yml

@@ -100,13 +100,13 @@ jobs:
         with:
           name: TBS-release
           path: TravBotSharp/bin/Release
-      
+
       - name: Archive Release
-        uses: papeloto/action-zip@v1
+        uses: montudor/action-zip@v1
         with:
-            files: TravBotSharp/bin/Release
-            dest: TBS-${{needs.version.outputs.version}}.zip
-            
+            args: zip -qq -r TBS-${{needs.version.outputs.version}}.zip TravBotSharp/bin/Release
+
+
       - name: Create release
         uses: ncipollo/release-action@v1
         with:

README.md

@@ -3,7 +3,7 @@
 <a href="https://discord.gg/mBa4f2K"><img src="https://discordapp.com/api/guilds/740829801446637601/widget.png?style=banner2" width="30%"></a>
 
 ### About
-I have worked on this bot for over 2 years, ~15k LoC. It has been since completely ported to the newest version of Travian T4.5. Bot is under active development (at least until summer 2021). Instructions are on the Discord channel. If you have any question/recommendation, feel free to contact me (on Discord).
+I have worked on this bot for over 3 years, ~15k LoC. It has been since completely ported to the newest version of Travian T4.5. Bot is under active development. Instructions are on the Discord channel. If you have any question/recommendation, feel free to contact me (on Discord).
 
 ## Features
 #### - Auto-Change proxy

TbsCore/Core/TaskExecutor.cs

@@ -232,19 +232,8 @@ private static void UpdateCurrentlyBuilding(Account acc, Village vill)
             var cb = InfrastructureParser.CurrentlyBuilding(acc.Wb.Html, acc);
             if (cb == null) return; // Nothing is currently building
 
-            var bldJson = DriverHelper.GetJsObj<string>(acc, "JSON.stringify(bld);");
-            if (string.IsNullOrEmpty(bldJson)) return;
-            var bldJs = JsonConvert.DeserializeObject<List<Bld>>(bldJson);
-
-            // Combine data from two sources about currently building (JS object and HTML table)
-            // We get time duration and level from HTML
-            // and build location, level and building (type) from JSON
             for (int i = 0; i < cb.Count; i++)
             {
-                cb[i].Building = bldJs[i].Building;
-                cb[i].Location = bldJs[i].Location;
-                cb[i].Level = (byte)bldJs[i].Level;
-
                 vill.Build.CurrentlyBuilding.Add(cb[i]);
             }
         }

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>
@@ -243,18 +245,18 @@ public static bool RemoveFinishedCB(Village vill)
 
             foreach (var taskDone in tasksDone)
             {
-                var building = vill.Build.Buildings.FirstOrDefault(x => x.Id == taskDone.Location);
-                if (building == null) building = vill.Build.Buildings.FirstOrDefault(x => x.Type == taskDone.Building);
-                if (building == null || building.Type != taskDone.Building) continue;
+                //var building = vill.Build.Buildings.FirstOrDefault(x => x.Id == taskDone.Location);
+                //if (building == null) building = vill.Build.Buildings.FirstOrDefault(x => x.Type == taskDone.Building);
+                //if (building == null || building.Type != taskDone.Building) continue;
 
-                if (building.Level < taskDone.Level) building.Level = taskDone.Level;
+                //if (building.Level < taskDone.Level) building.Level = taskDone.Level;
                 vill.Build.CurrentlyBuilding.Remove(taskDone);
             }
             return true;
         }
 
         /// <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);
@@ -294,11 +296,11 @@ public static bool IsTaskCompleted(Village vill, Account acc, BuildingTask task)
                     if (task.Level <= building.Level) return true;
 
                     // If the building is being upgraded to the desired level, task is complete
-                    var cb = vill.Build
-                        .CurrentlyBuilding
-                        .OrderByDescending(x => x.Level)
-                        .FirstOrDefault(x => x.Location == task.BuildingId);
-                    if (cb != null && task.Level <= cb.Level) return true;
+                    //var cb = vill.Build
+                    //    .CurrentlyBuilding
+                    //    .OrderByDescending(x => x.Level)
+                    //    .FirstOrDefault(x => x.Location == task.BuildingId);
+                    //if (cb != null && task.Level <= cb.Level) return true;
                     break;
 
                 case BuildingType.AutoUpgradeResFields:
@@ -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);
                     }
@@ -440,10 +442,14 @@ internal static bool UpgradeBuildingForOneLvl(Account acc, Village vill, Buildin
                 }, bottom);
             }
 
+            // Current lvl in bot's data
             var currentLvl = (int)upgrade.Level;
 
             RemoveFinishedCB(vill);
-            currentLvl += vill.Build.CurrentlyBuilding.Count(x => x.Building == building);
+
+            // Current lvl in current building list
+            var currentBuilding = vill.Build.CurrentlyBuilding.FirstOrDefault(x => x.Building == building);
+            if (currentBuilding != null) currentLvl = currentBuilding.Level;
 
             if (BuildingsData.MaxBuildingLevel(acc, building) == currentLvl)
             {
@@ -544,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
@@ -51,12 +52,41 @@ private static async Task ToBuildingId(Account acc, int index)
             {
                 if (!acc.Wb.CurrentUrl.Contains("dorf2.php") || acc.Wb.CurrentUrl.Contains("id="))
                     await MainNavigate(acc, MainNavigationButton.Buildings);
-                
-                await DriverHelper.ExecuteScript(acc, $"document.getElementsByClassName(\"aid{index}\")[0].children[0].click();");
+
+                string script = @"
+                function clickFirst(node)
+                {
+                    if (node.hasAttribute('href') && node.getAttribute('href'))
+                    {
+                        node.click();
+                        return true;
+                    }
+                    if (node.hasAttribute('onclick') && node.getAttribute('onclick'))
+                    {";
+                script += "url = node.getAttribute('onclick').split(\"'\")[1];";
+                script += @"
+                        window.location.href = url
+                    return true;
+                    }
+                    // node doesn't contain href/onlick. Check child nodes
+                    for (child of node.children)
+                    {
+                        if (clickFirst(child)) return true;
+                    }
+                }";
+                script += $"node = document.querySelectorAll('[data-aid=\"{index}\"]')[0]; clickFirst(node);";
+                await DriverHelper.ExecuteScript(acc, script);
             }
             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);