fix for #36

Jaksuhn · Sep 4, 2024 · 949a7c0 · 949a7c0
1 parent 27a9291
commit 949a7c0
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/Automaton/Features/ARTurnIn.cs b/Automaton/Features/ARTurnIn.cs
@@ -1,4 +1,5 @@
 using Automaton.IPC;
+using ECommons.Automation.NeoTaskManager;
 using ECommons.ImGuiMethods;
 using ImGuiNET;
 
@@ -66,9 +67,6 @@ public override void DrawConfig()
         if (ImGui.Button($"GoHome"))
             TaskManager.Enqueue(GoHome);
 
-        if (ImGui.Button($"MoveForwards"))
-            TaskManager.Enqueue(MoveForwards);
-
         if (TaskManager.Tasks.Count > 0)
         {
             ImGuiX.DrawSection("Tasks");
@@ -99,30 +97,20 @@ private void CheckCharacter()
 
     private void TurnIn()
     {
-        TaskManager.Enqueue(GoToGC, configuration: new(timeLimitMS: 2 * 60 * 1000));
-        TaskManager.EnqueueDelay(1000);
-        TaskManager.Enqueue(Deliveroo, configuration: new(timeLimitMS: 10 * 60 * 1000, abortOnTimeout: false));
+        TaskManager.Enqueue(GoToGC, configuration: LSConfig);
         TaskManager.EnqueueDelay(1000);
-        TaskManager.Enqueue(GoHome, configuration: new(timeLimitMS: 1 * 60 * 1000));
+        TaskManager.Enqueue(Deliveroo, configuration: DConfig);
         TaskManager.EnqueueDelay(1000);
-        TaskManager.Enqueue(MoveForwards);
+        TaskManager.Enqueue(GoHome, configuration: LSConfig);
         TaskManager.EnqueueDelay(1000);
         TaskManager.Enqueue(P.AutoRetainerAPI.FinishCharacterPostProcess);
     }
 
     // bless lifestream for doing literally all the annoying work for me already
-    private void GoToGC() => TaskManager.InsertMulti([new(() => P.Lifestream.ExecuteCommand("gc")), new(() => P.Lifestream.IsBusy()), new(() => !P.Lifestream.IsBusy())]);
-    private void Deliveroo() => TaskManager.InsertMulti([new(() => Svc.Commands.ProcessCommand("/deliveroo enable")), new(() => P.Deliveroo.IsTurnInRunning()), new(() => !P.Deliveroo.IsTurnInRunning())]);
-    private void GoHome() => TaskManager.InsertMulti([new(P.Lifestream.TeleportToFC), new(() => P.Lifestream.IsBusy()), new(() => !P.Lifestream.IsBusy())]);
+    private void GoToGC() => TaskManager.InsertMulti([new(() => P.Lifestream.ExecuteCommand("gc")), new(() => P.Lifestream.IsBusy()), new(() => !P.Lifestream.IsBusy(), LSConfig)]);
+    private void Deliveroo() => TaskManager.InsertMulti([new(() => Svc.Commands.ProcessCommand("/deliveroo enable")), new(() => P.Deliveroo.IsTurnInRunning()), new(() => !P.Deliveroo.IsTurnInRunning(), DConfig)]);
+    private void GoHome() => TaskManager.InsertMulti([new(P.Lifestream.TeleportToFC), new(() => P.Lifestream.IsBusy()), new(() => !P.Lifestream.IsBusy(), LSConfig)]);
 
-    private unsafe void MoveForwards()
-    {
-        TaskManager.InsertMulti(
-        [
-            new(P.Navmesh.IsReady),
-            new(() => P.Navmesh.PathfindAndMoveTo(P.Navmesh.NearestPoint(Utils.RotatePoint(Player.Object.Position.X, Player.Object.Position.Z, MathF.PI - Player.CameraEx->DirH, Player.Object.Position + new Vector3(0, 0, 5)), 1, 5) ?? Player.Position, false)),
-            new(() => P.Navmesh.IsRunning()),
-            new(() => !P.Navmesh.IsRunning())
-        ]);
-    }
+    private TaskManagerConfiguration LSConfig => new(timeLimitMS: 2 * 60 * 1000);
+    private TaskManagerConfiguration DConfig => new(timeLimitMS: 10 * 60 * 1000, abortOnTimeout: false);
 }