Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions TBot/Workers/FleetScheduler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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> 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 ||
Expand Down Expand Up @@ -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 ||
Expand All @@ -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 ||
Expand All @@ -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 ||
Expand All @@ -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 ||
Expand Down
1 change: 1 addition & 0 deletions TBot/instance_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
},
"Autofleet": {
"Active": true,
"ForceSpeed": 0,
"TelegramMessenger": {
"Active": false
}
Expand Down