feat: multi thread for acceleration.

ArchiDog1998 · Feb 1, 2023 · 7950f91 · 7950f91
1 parent 5858428
commit 7950f91
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 23 deletions.
diff --git a/RotationSolver/Configuration/PluginConfiguration.cs b/RotationSolver/Configuration/PluginConfiguration.cs
@@ -114,6 +114,8 @@ public class PluginConfiguration : IPluginConfiguration
     public float InterruptDelayMin = 0.5f;
     public float InterruptDelayMax = 1;
 
+    public int WorkTaskDelay = 20;
+
     public string PositionalErrorText = string.Empty;
 
     public int MoveTargetAngle = 24;

diff --git a/RotationSolver/Helpers/ObjectHelper.cs b/RotationSolver/Helpers/ObjectHelper.cs
@@ -41,7 +41,7 @@ internal static bool CanInterrupt(this BattleChara b)
 
         //跳过扇形圆型
         if (act.CastType is 3 or 4) return false;
-        if (ActionManager.GetActionRange(b.CastActionId) < 8) return false;
+        if (ActionManager.GetActionRange(b.CastActionId) is > 0 and < 8) return false;
         return true;
     }
 

diff --git a/RotationSolver/Localization/Strings_Major.cs b/RotationSolver/Localization/Strings_Major.cs
@@ -114,6 +114,8 @@ internal partial class Strings
 
     public string Configwindow_Param_HealDelay { get; set; } = "Set the range of random delay for healing people in second.";
 
+    public string Configwindow_Param_WorkTaskDelay { get; set; } = "Set the work task delay in millisecond. Smaller, more precise, more resource-intensive";
+
     public string Configwindow_Param_Display { get; set; } = "Display";
     public string Configwindow_Param_PoslockCasting { get; set; } = "Lock the movement when casting";
     public string Configwindow_Param_PoslockModifier { get; set; } = "Set the modifier key to unlock the movement temporary";

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -1,5 +1,6 @@
 using Dalamud.Game;
 using RotationSolver.Commands;
+using System.Threading.Tasks;
 
 namespace RotationSolver.Updaters;
 
@@ -8,7 +9,7 @@ internal static class MajorUpdater
     //#if DEBUG
     //    private static readonly Dictionary<int, bool> _valus = new Dictionary<int, bool>();
     //#endif
-    private unsafe static void FrameworkUpdate(Framework framework)
+    private static void FrameworkUpdate(Framework framework)
     {
         if (!Service.Conditions.Any() || Service.ClientState.LocalPlayer == null) return;
 
@@ -30,31 +31,56 @@ private unsafe static void FrameworkUpdate(Framework framework)
         //            }
         //        }
         //#endif
-        //Update State.
-        PreviewUpdater.UpdatePreview();
-
-        ActionUpdater.UpdateActionInfo();
 
-        TargetUpdater.UpdateTarget();
-
-        MovingUpdater.UpdateLocation();
+        PreviewUpdater.UpdatePreview();
+        //ActionUpdater.UpdateActionInfo();
+        //TargetUpdater.UpdateTarget();
+        //MovingUpdater.UpdateLocation();
 
         ActionUpdater.DoAction();
 
-        RSCommands.UpdateRotationState();
-        TimeLineUpdater.UpdateTimelineAction();
-        ActionUpdater.UpdateNextAction();
+        //TimeLineUpdater.UpdateTimelineAction();
+        //ActionUpdater.UpdateNextAction();
+        //RSCommands.UpdateRotationState();
         MacroUpdater.UpdateMacro();
     }
 
+    static bool _quit = false;
     public static void Enable()
     {
         Service.Framework.Update += FrameworkUpdate;
+        Task.Run(() =>
+        {
+            while (true)
+            {
+                if(_quit) return;
+                if (!Service.Conditions.Any() || Service.ClientState.LocalPlayer == null)
+                {
+                    Task.Delay(200);
+                    continue;
+                }
+
+                //PreviewUpdater.UpdatePreview();
+                ActionUpdater.UpdateActionInfo();
+                TargetUpdater.UpdateTarget();
+                MovingUpdater.UpdateLocation();
+
+                //ActionUpdater.DoAction();
+
+                TimeLineUpdater.UpdateTimelineAction();
+                ActionUpdater.UpdateNextAction();
+                RSCommands.UpdateRotationState();
+                //MacroUpdater.UpdateMacro();
+
+                Task.Delay(Service.Configuration.WorkTaskDelay);
+            }
+        });
         MovingUpdater.Enable();
     }
 
     public static void Dispose()
     {
+        _quit = true;
         Service.Framework.Update -= FrameworkUpdate;
         PreviewUpdater.Dispose();
         MovingUpdater.Dispose();

diff --git a/RotationSolver/Updaters/MovingUpdater.cs b/RotationSolver/Updaters/MovingUpdater.cs
@@ -29,9 +29,6 @@ internal static void UpdateLocation()
 
         _moving = _lastPosition != p;
         _lastPosition = p;
-
-        if (Service.ClientState.LocalPlayer.HasStatus(true, StatusID.TenChiJin)) IsMoving = false;
-
     }
 
     private static bool MovingDetour(IntPtr ptr)

diff --git a/RotationSolver/Updaters/PreviewUpdater.cs b/RotationSolver/Updaters/PreviewUpdater.cs
@@ -56,15 +56,12 @@ private static unsafe void UpdateCastBar()
             && !Service.Conditions[Dalamud.Game.ClientState.Conditions.ConditionFlag.Casting];
 
         ByteColor c = canMove && Service.Configuration.CastingDisplay ? greenColor : redColor;
-        var isTarDead = false;
-        if (Service.ObjectTable.SearchById(Service.ClientState.LocalPlayer.CastTargetObjectId) is BattleChara b
-            && b.CurrentHp == 0)
-        {
-            isTarDead = true;
-        }
+        var isTarDead = Service.ObjectTable.SearchById(Service.ClientState.LocalPlayer.CastTargetObjectId) 
+            is BattleChara b && b.CurrentHp == 0;
 
-        var specialStatus = Service.ClientState.LocalPlayer.HasStatus(true, StatusID.PhantomFlurry);
-        MovingUpdater.IsMoving = specialStatus ? false : canMove || isTarDead;
+        //For lock
+        var specialStatus = Service.ClientState.LocalPlayer.HasStatus(true, StatusID.PhantomFlurry, StatusID.TenChiJin);
+        MovingUpdater.IsMoving = specialStatus ? false : (canMove || isTarDead);
 
         var castBar = Service.GameGui.GetAddonByName("_CastBar", 1);
         if (castBar == IntPtr.Zero) return;

diff --git a/RotationSolver/Windows/RotationConfigWindow_Param.cs b/RotationSolver/Windows/RotationConfigWindow_Param.cs
@@ -92,6 +92,9 @@ private void DrawParamDelay()
 
         DrawRangedFloat(LocalizationManager.RightLang.Configwindow_Param_HealDelay,
             ref Service.Configuration.HealDelayMin, ref Service.Configuration.HealDelayMax);
+
+        DrawIntNumber(LocalizationManager.RightLang.Configwindow_Param_WorkTaskDelay,
+            ref Service.Configuration.WorkTaskDelay, min: 0, max: 200);
     }
 
     private void DrawParamDisplay()