diff --git a/TBot/Workers/FleetScheduler.cs b/TBot/Workers/FleetScheduler.cs index 860ade9f..1a1e8cf5 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 /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)) { _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 }