merge

.github/workflows/release.yml

@@ -21,50 +21,50 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Setup GO
       uses: actions/setup-go@v2
       with:
-        go-version: '~1.18.0'
+        go-version: '~1.23.0'
 
     - name: Build TBot win64
-      run: dotnet publish TBot -c Release -r win-x64 -o publish/win64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r win-x64 -o publish/win64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed win64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=windows GOARCH=amd64 go build -o ogamed.exe
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed.exe ${{ github.workspace }}/publish/win64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed.exe ${{ github.workspace }}/publish/win64/
         cp ${{ github.workspace }}/README.md ${{ github.workspace }}/publish/win64/
     - name: Package win64
       uses: montudor/action-zip@v1
       with:
         args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-win64.zip publish/win64/
 
     - name: Build TBot win32
-      run: dotnet publish TBot -c Release -r win-x86 -o publish/win32/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r win-x86 -o publish/win32/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed win32
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=windows GOARCH=386 go build -o ogamed.exe
         cd ${{ github.workspace }}/
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed.exe ${{ github.workspace }}/publish/win32/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed.exe ${{ github.workspace }}/publish/win32/
         cp ${{ github.workspace }}/README.md ${{ github.workspace }}/publish/win32/
     - name: Package win32
       uses: montudor/action-zip@v1
       with:
         args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-win32.zip publish/win32/
 
     - name: Build TBot TBot linux64
-      run: dotnet publish TBot -c Release -r linux-x64 -o publish/linux64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r linux-x64 -o publish/linux64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed linux64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=linux GOARCH=amd64 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/linux64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/linux64/
         chmod +x ${{ github.workspace }}/publish/linux64/TBot
         chmod +x ${{ github.workspace }}/publish/linux64/ogamed
         cp ${{ github.workspace }}/README.md ${{ github.workspace }}/publish/linux64/
@@ -74,13 +74,13 @@ jobs:
         args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linux64.zip publish/linux64/
 
     - name: Build TBot TBot linuxarm
-      run: dotnet publish TBot -c Release -r linux-arm -o publish/linuxarm/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r linux-arm -o publish/linuxarm/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed linuxarm
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=linux GOARCH=arm GOARM=7 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/linuxarm/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/linuxarm/
         chmod +x ${{ github.workspace }}/publish/linuxarm/TBot
         chmod +x ${{ github.workspace }}/publish/linuxarm/ogamed
         cp ${{ github.workspace }}/README.md ${{ github.workspace }}/publish/linuxarm/
@@ -90,13 +90,13 @@ jobs:
         args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linuxarm.zip publish/linuxarm/
 
     - name: Build TBot TBot linuxarm64
-      run: dotnet publish TBot -c Release -r linux-arm64 -o publish/linuxarm64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r linux-arm64 -o publish/linuxarm64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed linuxarm64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=linux GOARCH=arm64 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/linuxarm64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/linuxarm64/
         chmod +x ${{ github.workspace }}/publish/linuxarm64/TBot
         chmod +x ${{ github.workspace }}/publish/linuxarm64/ogamed
         cp ${{ github.workspace }}/README.md ${{ github.workspace }}/publish/linuxarm64/
@@ -106,13 +106,13 @@ jobs:
         args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linuxarm64.zip publish/linuxarm64/
 
     - name: Build TBot TBot osx64
-      run: dotnet publish TBot -c Release -r osx-x64 -o publish/osx64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r osx-x64 -o publish/osx64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed osx64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=darwin GOARCH=amd64 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/osx64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/osx64/
         chmod +x ${{ github.workspace }}/publish/osx64/TBot
         chmod +x ${{ github.workspace }}/publish/osx64/ogamed
         cp ${{ github.workspace }}/README.md ${{ github.workspace }}/publish/osx64/
@@ -122,13 +122,13 @@ jobs:
         args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-osx64.zip publish/osx64/
 
     - name: Build TBot TBot osx-arm64
-      run: dotnet publish TBot -c Release -r osx-arm64 -o publish/osx-arm64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r osx-arm64 -o publish/osx-arm64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed osx-arm64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
-        env GOOS=darwin GOARCH=amd64 go build -o ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
+        env GOOS=darwin GOARCH=arm64 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/osx-arm64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/osx-arm64/
         chmod +x ${{ github.workspace }}/publish/osx-arm64/TBot
         chmod +x ${{ github.workspace }}/publish/osx-arm64/ogamed
         cp ${{ github.workspace }}/README.md ${{ github.workspace }}/publish/osx-arm64/

.github/workflows/snapshot.yml

@@ -22,22 +22,22 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Setup GO
       uses: actions/setup-go@v2
       with:
-        go-version: '~1.18.0'
+        go-version: '~1.23.0'
 
     - name: Build TBot win64
-      run: dotnet publish TBot -c Release -r win-x64 -o publish/win64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r win-x64 -o publish/win64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed win64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=windows GOARCH=amd64 go build -o ogamed.exe
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed.exe ${{ github.workspace }}/publish/win64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed.exe ${{ github.workspace }}/publish/win64/
     - name: Package win64
       uses: montudor/action-zip@v1
       with:
@@ -49,13 +49,13 @@ jobs:
         path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-win64.zip
 
     - name: Build TBot win32
-      run: dotnet publish TBot -c Release -r win-x86 -o publish/win32/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r win-x86 -o publish/win32/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed win32
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=windows GOARCH=386 go build -o ogamed.exe
         cd ${{ github.workspace }}/
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed.exe ${{ github.workspace }}/publish/win32/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed.exe ${{ github.workspace }}/publish/win32/
     - name: Package win32
       uses: montudor/action-zip@v1
       with:
@@ -67,13 +67,13 @@ jobs:
         path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-win32.zip
 
     - name: Build TBot linux64
-      run: dotnet publish TBot -c Release -r linux-x64 -o publish/linux64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r linux-x64 -o publish/linux64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed linux64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=linux GOARCH=amd64 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/linux64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/linux64/
         chmod +x ${{ github.workspace }}/publish/linux64/TBot
         chmod +x ${{ github.workspace }}/publish/linux64/ogamed
     - name: Package linux64
@@ -87,13 +87,13 @@ jobs:
         path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linux64.zip
 
     - name: Build TBot linuxarm
-      run: dotnet publish TBot -c Release -r linux-arm -o publish/linuxarm/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r linux-arm -o publish/linuxarm/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed linuxarm
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=linux GOARCH=arm GOARM=7 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/linuxarm/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/linuxarm/
         chmod +x ${{ github.workspace }}/publish/linuxarm/TBot
         chmod +x ${{ github.workspace }}/publish/linuxarm/ogamed
     - name: Package linuxarm
@@ -107,13 +107,13 @@ jobs:
         path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linuxarm.zip
 
     - name: Build TBot linuxarm64
-      run: dotnet publish TBot -c Release -r linux-arm64 -o publish/linuxarm64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r linux-arm64 -o publish/linuxarm64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed linuxarm64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=linux GOARCH=arm64 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/linuxarm64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/linuxarm64/
         chmod +x ${{ github.workspace }}/publish/linuxarm64/TBot
         chmod +x ${{ github.workspace }}/publish/linuxarm64/ogamed
     - name: Package linuxarm64
@@ -127,13 +127,13 @@ jobs:
         path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linuxarm64.zip
 
     - name: Build TBot osx64
-      run: dotnet publish TBot -c Release -r osx-x64 -o publish/osx64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r osx-x64 -o publish/osx64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed osx64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=darwin GOARCH=amd64 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/osx64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/osx64/
         chmod +x ${{ github.workspace }}/publish/osx64/TBot
         chmod +x ${{ github.workspace }}/publish/osx64/ogamed
     - name: Package osx64
@@ -147,13 +147,13 @@ jobs:
         path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-osx64.zip
 
     - name: Build TBot osx-arm64
-      run: dotnet publish TBot -c Release -r osx-arm64 -o publish/osx-arm64/ -p:PublishSingleFile=true --self-contained false
+      run: dotnet publish TBot -c Release -r osx-arm64 -o publish/osx-arm64/ -p:PublishSingleFile=true --self-contained true
     - name: Build ogamed osx-arm64
       run: | 
-        cd ${{ github.workspace }}/ogame/cmd/ogamed
+        cd ${{ github.workspace }}/ogame/cmd/ogamed-tbot
         env GOOS=darwin GOARCH=arm64 go build -o ogamed
         cd ${{ github.workspace }}
-        mv ${{ github.workspace }}/ogame/cmd/ogamed/ogamed ${{ github.workspace }}/publish/osx-arm64/
+        mv ${{ github.workspace }}/ogame/cmd/ogamed-tbot/ogamed ${{ github.workspace }}/publish/osx-arm64/
         chmod +x ${{ github.workspace }}/publish/osx-arm64/TBot
         chmod +x ${{ github.workspace }}/publish/osx-arm64/ogamed
     - name: Package osx-arm64

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "ogame"]
 	path = ogame
-	url = https://github.com/ogame-tbot-net/ogame.git
-	branch = develop_v11.9
+	url = https://github.com/0xE232FE/ogame.mod.git
+	branch = develop-ogamed-tbot

TBot.Common/Logging/LogSender.cs

@@ -13,6 +13,7 @@ public enum LogSender {
 		Brain,
 		//Brain Features
 		AutoCargo,
+		AutoDefence,
 		AutoMine,
 		AutoRepatriate,
 		AutoResearch,

TBot.Common/Logging/Sinks/TBotColoredConsoleSink.cs

@@ -37,6 +37,7 @@ public void Emit(LogEvent logEvent) {
 			ConsoleColor consoleColor = sender switch {
 				LogSender.Brain => ConsoleColor.Blue,
 				LogSender.AutoCargo => ConsoleColor.Blue,
+				LogSender.AutoDefence => ConsoleColor.Blue,
 				LogSender.AutoMine => ConsoleColor.Blue,
 				LogSender.AutoRepatriate => ConsoleColor.Blue,
 				LogSender.AutoResearch => ConsoleColor.Blue,

TBot.Common/TBot.Common.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.10.48" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.14.15" />
+    <PackageReference Include="Serilog" Version="4.3.0" />
     <PackageReference Include="Serilog.Sinks.AspNetCore.SignalR" Version="0.4.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Serilog.Sinks.Telegram.Alternative" Version="1.3.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+    <PackageReference Include="Serilog.Sinks.Telegram.Alternative" Version="1.5.0" />
   </ItemGroup>
 
 </Project>

TBot.Ogame.Infrastructure/Enums/Feature.cs

@@ -21,6 +21,7 @@ public enum Feature {
 		BrainLifeformAutoMine = 12,
 		BrainLifeformAutoResearch = 13,
 		AutoDiscovery = 14,
+		BrainAutobuildDefence = 15,
 
 		BrainCelestialAutoMine = 101,
 		BrainCelestialLifeformAutoMine = 102,

TBot.Ogame.Infrastructure/Enums/Features.cs

@@ -9,6 +9,7 @@ public static class Features {
 		public static readonly List<Feature> AllFeatures = new List<Feature>() {
 			Feature.Defender,
 			Feature.BrainAutobuildCargo,
+			Feature.BrainAutobuildDefence,
 			Feature.BrainAutoRepatriate,
 			Feature.BrainAutoMine,
 			Feature.BrainLifeformAutoMine,

TBot.Ogame.Infrastructure/Enums/SendFleetCode.cs

@@ -9,6 +9,7 @@ public enum SendFleetCode : int {
 		GenericError = 0,
 		AfterSleepTime = -1,
 		NotEnoughSlots = -2,
-		QuickerToWaitForProduction = -3
+		QuickerToWaitForProduction = -3,
+		NotEnoughRessources = -4
 	}
 }

TBot.Ogame.Infrastructure/IOgameService.cs

@@ -95,6 +95,8 @@ void Initialize(Credentials credentials,
 		Task SendMessage(int playerID, string message);
 		Task SetUserAgent(string userAgent);
 		Task SolveCaptcha(string challengeID, int answer);
-		Task<bool> AbandonCelestial(Celestial celestial);
+		        Task<bool> AbandonCelestial(Celestial celestial);
+                Task<List<Coordinate>> GetPositionsAvailableForDiscoveryFleet(Celestial celestial, Coordinate coordinate);
+        Task<int> GetAvailableDiscoveries(Celestial celestial);
 	}
 }

TBot.Ogame.Infrastructure/Models/AuctionResourcesValue.cs

@@ -15,7 +15,7 @@ public class AuctionResourcesValue {
 		[JsonProperty("name")]
 		public string Name { get; set; }
 
-		public int otherPlanetId { get; set; } = 0;
+		public int? otherPlanetId { get; set; } = 0;
 
 		public override string ToString() {
 			string outStr = "[";