revert some changes

fix autominer
ogame-tbot · Apr 2, 2021 · 5cfaf23 · 5cfaf23
1 parent 5bef897
commit 5cfaf23
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/TBot/Model/Enums.cs b/TBot/Model/Enums.cs
@@ -108,25 +108,29 @@ public enum Missions
 
 	public enum Speeds
 	{
-		FivePercent = 5,
+		TenPercent = 1,
+		TwentyPercent = 2,
+		ThirtyPercent = 3,
+		FourtyPercent = 4,
+		FiftyPercent = 5,
+		SixtyPercent = 6,
+		SeventyPercent = 7,
+		EightyPercent = 8,
+		NinetyPercent = 9,
+		HundredPercent = 10
+	}
+
+	public enum Percents
+	{
 		TenPercent = 10,
-		FifteenPercent = 15,
 		TwentyPercent = 20,
-		TwentyfivePercent = 25,
 		ThirtyPercent = 30,
-		ThirtyfivePercent = 35,
 		FourtyPercent = 40,
-		FourtyfivePercent = 45,
 		FiftyPercent = 50,
-		FiftyfivePercent = 55,
 		SixtyPercent = 60,
-		SixtyfivePercent = 65,
 		SeventyPercent = 70,
-		SeventyfivePercent = 75,
 		EightyPercent = 80,
-		EightyfivePercent = 85,
 		NinetyPercent = 90,
-		NinetyfivePercent = 95,
 		HundredPercent = 100
 	}
 

diff --git a/TBot/Model/Types.cs b/TBot/Model/Types.cs
@@ -229,6 +229,14 @@ public class UserInfo
 
     public class Resources
     {
+        public Resources(long metal = 0, long crystal = 0, long deuterium = 0, long energy = 0, long darkmatter = 0)
+        {
+            Metal = metal;
+            Crystal = crystal;
+            Deuterium = deuterium;
+            Energy = energy;
+            Darkmatter = darkmatter;
+        }
         public long Metal { get; set; }
         public long Crystal { get; set; }
         public long Deuterium { get; set; }

diff --git a/TBot/Program.cs b/TBot/Program.cs
@@ -471,6 +471,7 @@ private static void AutoMine(object state)
                 xaSem[(int)Feature.BrainAutoMine].WaitOne();
                 Helpers.WriteLog(LogType.Info, LogSender.Brain, "Checking mines and resources..");
                 celestials = UpdatePlanets(UpdateType.Techs);
+                celestials = UpdatePlanets(UpdateType.Resources);
                 celestials = UpdatePlanets(UpdateType.Constructions);
 
                 Buildables xBuildable = Buildables.Null;
@@ -877,6 +878,7 @@ private static int SendFleet(Celestial origin, Ships ships, Coordinate destinati
         {
             Helpers.WriteLog(LogType.Info, LogSender.Tbot, "Sending fleet from " + origin.Coordinate.ToString() + " to " + destination.ToString() + ". Mission: " + mission.ToString() + ". Speed: " + speed.ToString() + ". Ships: " + ships.ToString());
 
+            /*
             if (
                 playerClass != Classes.General && (
                     speed == Speeds.FivePercent ||
@@ -895,6 +897,7 @@ private static int SendFleet(Celestial origin, Ships ships, Coordinate destinati
                 Helpers.WriteLog(LogType.Warning, LogSender.Tbot, "Unable to send fleet, speed not available for your class");
                 return 0;
             }
+            */
 
             slots = UpdateSlots();
             if (slots.Free > 1 || force)

diff --git a/TBot/Services/OgamedService.cs b/TBot/Services/OgamedService.cs
@@ -124,7 +124,7 @@ internal void CreateOgamedExecutable()
                 tempExeName = Path.Combine(Directory.GetCurrentDirectory(), "ogamed.exe");
             else
                 tempExeName = Path.Combine(Directory.GetCurrentDirectory(), "ogamed");
-            using FileStream fsDst = new FileStream(tempExeName, FileMode.OpenOrCreate, FileAccess.Write);
+            using FileStream fsDst = new(tempExeName, FileMode.OpenOrCreate, FileAccess.Write);
             byte[] bytes = GetOgamedExecutable();
             fsDst.Write(bytes, 0, bytes.Length);
         }
@@ -448,7 +448,7 @@ public List<Celestial> GetCelestials()
         {
             var planets = this.GetPlanets();
             var moons = this.GetMoons();
-            List<Celestial> celestials = new List<Celestial>();
+            List<Celestial> celestials = new();
             celestials.AddRange(planets);
             celestials.AddRange(moons);
             return celestials;
@@ -831,7 +831,7 @@ public GalaxyInfo GetGalaxyInfo(Coordinate coordinate)
 
         public GalaxyInfo GetGalaxyInfo(int galaxy, int system)
         {
-            Coordinate coordinate = new Coordinate { Galaxy = galaxy, System = system };
+            Coordinate coordinate = new() { Galaxy = galaxy, System = system };
             return this.GetGalaxyInfo(coordinate);
         }
 

diff --git a/TBot/settings.json b/TBot/settings.json
@@ -6,7 +6,7 @@
     "Language": ""
   },
   "General": {
-    "UserAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36",
+    "UserAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36",
     "Host": "localhost",
     "Port": "8080",
     "CaptchaAPIKey": ""