From 9187da0cf4e782e4ce404082de0f6950aa2c26b0 Mon Sep 17 00:00:00 2001 From: Cheeeh Date: Thu, 1 Jan 2026 16:17:22 +0100 Subject: [PATCH 1/2] can force speed for FleetSave --- TBot/Workers/FleetScheduler.cs | 11 ++++++----- TBot/instance_settings.json | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/TBot/Workers/FleetScheduler.cs b/TBot/Workers/FleetScheduler.cs index 860ade9f..f9d35eba 100644 --- a/TBot/Workers/FleetScheduler.cs +++ b/TBot/Workers/FleetScheduler.cs @@ -216,12 +216,13 @@ public async Task AutoFleetSave(Celestial celestial, bool isSleepTimeFleetSave = if (TelegramMission != Missions.None) mission = TelegramMission; + decimal forceSpeed = (decimal) _tbotInstance.InstanceSettings.Defender.Autofleet.ForceSpeed; List fleetHypotesis = await GetFleetSaveDestination(_tbotInstance.UserData.celestials, celestial, departureTime, minDuration, mission, maxDeuterium); if (fleetHypotesis.Count() > 0) { foreach (FleetHypotesis fleet in fleetHypotesis.OrderBy(pf => pf.Fuel).ThenBy(pf => pf.Duration <= minDuration)) { _tbotInstance.log(LogLevel.Warning, LogSender.FleetScheduler, $"checking {mission} fleet to: {fleet.Destination}"); if (CheckFuel(fleet, celestial)) { - fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, fleet.Speed, payload, _tbotInstance.UserData.userInfo.Class, true); + fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, (forceSpeed > 0 ? forceSpeed : fleet.Speed), payload, _tbotInstance.UserData.userInfo.Class, true); if (fleetId != (int) SendFleetCode.GenericError || fleetId != (int) SendFleetCode.AfterSleepTime || @@ -253,7 +254,7 @@ public async Task AutoFleetSave(Celestial celestial, bool isSleepTimeFleetSave = foreach (FleetHypotesis fleet in fleetHypotesis.OrderBy(pf => pf.Fuel).ThenBy(pf => pf.Duration <= minDuration)) { _tbotInstance.log(LogLevel.Warning, LogSender.FleetScheduler, $"checking {mission} fleet to: {fleet.Destination}"); if (CheckFuel(fleet, celestial)) { - fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, fleet.Speed, payload, _tbotInstance.UserData.userInfo.Class, true); + fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, (forceSpeed > 0 ? forceSpeed : fleet.Speed), payload, _tbotInstance.UserData.userInfo.Class, true); if (fleetId != (int) SendFleetCode.GenericError || fleetId != (int) SendFleetCode.AfterSleepTime || @@ -276,7 +277,7 @@ public async Task AutoFleetSave(Celestial celestial, bool isSleepTimeFleetSave = foreach (FleetHypotesis fleet in fleetHypotesis.OrderBy(pf => pf.Fuel).ThenBy(pf => pf.Duration <= minDuration)) { _tbotInstance.log(LogLevel.Warning, LogSender.FleetScheduler, $"checking {mission} fleet to: {fleet.Destination}"); if (CheckFuel(fleet, celestial)) { - fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, fleet.Speed, payload, _tbotInstance.UserData.userInfo.Class, true); + fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, (forceSpeed > 0 ? forceSpeed : fleet.Speed), payload, _tbotInstance.UserData.userInfo.Class, true); if (fleetId != (int) SendFleetCode.GenericError || fleetId != (int) SendFleetCode.AfterSleepTime || @@ -299,7 +300,7 @@ public async Task AutoFleetSave(Celestial celestial, bool isSleepTimeFleetSave = foreach (FleetHypotesis fleet in fleetHypotesis.OrderBy(pf => pf.Fuel).ThenBy(pf => pf.Duration <= minDuration)) { _tbotInstance.log(LogLevel.Warning, LogSender.FleetScheduler, $"checking {mission} fleet to: {fleet.Destination}"); if (CheckFuel(fleet, celestial)) { - fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, fleet.Speed, payload, _tbotInstance.UserData.userInfo.Class, true); + fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, (forceSpeed > 0 ? forceSpeed : fleet.Speed), payload, _tbotInstance.UserData.userInfo.Class, true); if (fleetId != (int) SendFleetCode.GenericError || fleetId != (int) SendFleetCode.AfterSleepTime || @@ -322,7 +323,7 @@ public async Task AutoFleetSave(Celestial celestial, bool isSleepTimeFleetSave = foreach (FleetHypotesis fleet in fleetHypotesis.OrderBy(pf => pf.Fuel).ThenBy(pf => pf.Duration <= minDuration)) { _tbotInstance.log(LogLevel.Warning, LogSender.FleetScheduler, $"checking {mission} fleet to: {fleet.Destination}"); if (CheckFuel(fleet, celestial)) { - fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, fleet.Speed, payload, _tbotInstance.UserData.userInfo.Class, true); + fleetId = await SendFleet(fleet.Origin, fleet.Ships, fleet.Destination, fleet.Mission, (forceSpeed > 0 ? forceSpeed : fleet.Speed), payload, _tbotInstance.UserData.userInfo.Class, true); if (fleetId != (int) SendFleetCode.GenericError || fleetId != (int) SendFleetCode.AfterSleepTime || diff --git a/TBot/instance_settings.json b/TBot/instance_settings.json index 6f77812b..32ab7a33 100644 --- a/TBot/instance_settings.json +++ b/TBot/instance_settings.json @@ -84,6 +84,7 @@ }, "Autofleet": { "Active": true, + "ForceSpeed": 0, "TelegramMessenger": { "Active": false } From 3c6bb9508f1bb6038124f4087a42b3f8c5c69d07 Mon Sep 17 00:00:00 2001 From: Cheeeh Date: Mon, 5 Jan 2026 18:42:46 +0100 Subject: [PATCH 2/2] fix decimal speed - oups --- TBot/Workers/FleetScheduler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TBot/Workers/FleetScheduler.cs b/TBot/Workers/FleetScheduler.cs index f9d35eba..1a1e8cf5 100644 --- a/TBot/Workers/FleetScheduler.cs +++ b/TBot/Workers/FleetScheduler.cs @@ -216,7 +216,7 @@ public async Task AutoFleetSave(Celestial celestial, bool isSleepTimeFleetSave = if (TelegramMission != Missions.None) mission = TelegramMission; - decimal forceSpeed = (decimal) _tbotInstance.InstanceSettings.Defender.Autofleet.ForceSpeed; + decimal forceSpeed = (decimal) _tbotInstance.InstanceSettings.Defender.Autofleet.ForceSpeed /10; List fleetHypotesis = await GetFleetSaveDestination(_tbotInstance.UserData.celestials, celestial, departureTime, minDuration, mission, maxDeuterium); if (fleetHypotesis.Count() > 0) { foreach (FleetHypotesis fleet in fleetHypotesis.OrderBy(pf => pf.Fuel).ThenBy(pf => pf.Duration <= minDuration)) {