From 3a276972e18653abbf6b7d4990b14f627c5cc274 Mon Sep 17 00:00:00 2001 From: Trallallero Date: Tue, 10 Oct 2023 15:24:10 +0200 Subject: [PATCH] Revert "add forced fleetsave speed setting" This reverts commit a55f8dee180efa674dc1b2507e5afd9def60827a. --- TBot/Workers/FleetScheduler.cs | 10 ---------- TBot/instance_settings.json | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/TBot/Workers/FleetScheduler.cs b/TBot/Workers/FleetScheduler.cs index c9e871d..02776d3 100644 --- a/TBot/Workers/FleetScheduler.cs +++ b/TBot/Workers/FleetScheduler.cs @@ -215,16 +215,6 @@ public async Task AutoFleetSave(Celestial celestial, bool isSleepTimeFleetSave = List fleetHypotesis = await GetFleetSaveDestination(_tbotInstance.UserData.celestials, celestial, departureTime, minDuration, mission, maxDeuterium, forceUnsafe); if (fleetHypotesis.Count() > 0) { - if ((bool) _tbotInstance.InstanceSettings.SleepMode.AutoFleetSave.ForceSpeed.Active) { - var speed = (decimal) _tbotInstance.InstanceSettings.SleepMode.AutoFleetSave.ForceSpeed.Speed / 10; - var validSpeeds = _tbotInstance.UserData.userInfo.Class == CharacterClass.General ? Speeds.GetGeneralSpeedsList() : Speeds.GetNonGeneralSpeedsList(); - if (validSpeeds.Contains(speed)) { - fleetHypotesis = fleetHypotesis.Where(x => x.Speed == speed).ToList(); - } else { - _tbotInstance.log(LogLevel.Warning, LogSender.FleetScheduler, $"Error: Could not parse 'ForceSpeed' from settings, value set to 10%."); - } - fleetHypotesis = fleetHypotesis.Where(x => x.Speed == Speeds.TenPercent).ToList(); - } 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)) { diff --git a/TBot/instance_settings.json b/TBot/instance_settings.json index c55ecc8..eb54c97 100644 --- a/TBot/instance_settings.json +++ b/TBot/instance_settings.json @@ -53,11 +53,7 @@ "ForceUnsafe": true, "DeutToLeave": 200000, "Recall": true, - "DefaultMission": "Deploy", - "ForceSpeed": { - "Active": false, - "Speed": 10 - } + "DefaultMission": "Deploy" } }, "Defender": {