fix: default target.

ArchiDog1998 · Mar 21, 2024 · 4f6824e · 4f6824e
1 parent 3f0d7e7
commit 4f6824e
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 24 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net8.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>4.2.1.1</Version>
+		<Version>4.2.1.2</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 		<LangVersion>latest</LangVersion>

diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,5 +1,5 @@
 {
-  "ClickingCount": 107756,
+  "ClickingCount": 107940,
   "SayingHelloCount": 176,
   "SaidUsers": []
 }
diff --git a/RotationSolver.Basic/Actions/BaseAction.cs b/RotationSolver.Basic/Actions/BaseAction.cs
@@ -11,7 +11,7 @@ namespace RotationSolver.Basic.Actions;
 public class BaseAction : IBaseAction
 {
     /// <inheritdoc/>
-    public TargetResult? Target { get; set; } = null;
+    public TargetResult Target { get; set; } = new(Player.Object, [], null);
 
     /// <inheritdoc/>
     public TargetResult? PreviewTarget { get; private set; } = null;
@@ -152,7 +152,7 @@ public bool CanUse(out IAction act, bool skipStatusProvideCheck = false, bool sk
         if (PreviewTarget == null) return false;
         if (!IBaseAction.ActionPreview)
         {
-            Target = PreviewTarget;
+            Target = PreviewTarget.Value;
         }
 
         return true;
@@ -175,9 +175,7 @@ public bool CanUse(out IAction act, CanUseOption option, byte gcdCountForAbility
     /// <inheritdoc/>
     public unsafe bool Use()
     {
-        if (!Target.HasValue) return false;
-
-        var target = Target.Value;
+        var target = Target;
 
         var adjustId = AdjustedID;
         if (TargetInfo.IsTargetArea)

diff --git a/RotationSolver.Basic/Actions/IBaseAction.cs b/RotationSolver.Basic/Actions/IBaseAction.cs
@@ -23,7 +23,7 @@ public interface IBaseAction : IAction
     /// <summary>
     /// The target to use on.
     /// </summary>
-    TargetResult? Target { get; set; }
+    TargetResult Target { get; set; }
 
     /// <summary>
     /// The target for preview.

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs b/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs
@@ -32,7 +32,7 @@ partial class CustomRotation
         if (DataCenter.MergedStatus.HasFlag(AutoStatus.MoveForward)
             && MoveForwardGCD(out act))
         {
-            if (act is IBaseAction b && ObjectHelper.DistanceToPlayer(b.Target?.Target) > 5) return act;
+            if (act is IBaseAction b && ObjectHelper.DistanceToPlayer(b.Target.Target) > 5) return act;
         }
 
         IBaseAction.TargetOverride = TargetType.Heal;

diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -60,7 +60,7 @@ public static void DoAction()
 
         if (nextAction is BaseAction act1 && act1.Info.IsPvP && !act1.Setting.IsFriendly
             && act1.TargetInfo.IsSingleTarget
-            && act1.Target?.Target is PlayerCharacter p && p != Player.Object)
+            && act1.Target.Target is PlayerCharacter p && p != Player.Object)
         {
             var hash = p.EncryptString();
 
@@ -109,8 +109,8 @@ public static void DoAction()
                 //}
 #endif
                 //Change Target
-                var tar = (act.Target == null || act.Target?.Target == Player.Object)
-                    ? act.Target?.AffectedTargets.FirstOrDefault() : act.Target?.Target;
+                var tar = act.Target.Target == Player.Object
+                    ? act.Target.AffectedTargets.FirstOrDefault() : act.Target.Target;
 
                 if (tar != null && tar != Player.Object && tar.IsEnemy())
                 {
@@ -123,6 +123,11 @@ public static void DoAction()
                     }
                 }
             }
+
+        }
+        else
+        {
+            Svc.Log.Error($"Failed to use the action {nextAction} ({nextAction.AdjustedID})");
         }
     }
 

diff --git a/RotationSolver/UI/PainterManager.cs b/RotationSolver/UI/PainterManager.cs
@@ -193,15 +193,13 @@ private static void UpdateTarget()
 
         if (ActionUpdater.NextAction is not BaseAction act) return;
 
-        if (act.Target == null) return;
-
         var d = DateTime.Now.Millisecond / 1000f;
         var ratio = (float)DrawingExtensions.EaseFuncRemap(EaseFuncType.None, EaseFuncType.Cubic)(d);
 
         if (Service.Config.TargetIconSize > 0)
         {
             _targetImage.Enable = true;
-            _targetImage.Position = act.Target?.Position ?? Player.Object.Position;
+            _targetImage.Position = act.Target.Position ?? Player.Object.Position;
             if (act.GetTexture(out var texture, true))
             {
                 _targetImage.Image = texture;
@@ -212,7 +210,7 @@ private static void UpdateTarget()
         {
             _target.Enable = true;
             _target.Color = ImGui.GetColorU32(Service.Config.TargetColor);
-            _target.Center = act.Target?.Position ?? Player.Object.Position;
+            _target.Center = act.Target.Position ?? Player.Object.Position;
             _target.Radius = targetRadius * ratio;
         }
     }

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -1550,10 +1550,7 @@ static void DrawActionDebug()
 
                     ImGui.Text($"Can Use: {action.CanUse(out _, skipClippingCheck: true)} ");
                     ImGui.Text("IgnoreCastCheck:" + action.CanUse(out _, skipClippingCheck: true, skipCastingCheck: true).ToString());
-                    if (action.Target != null)
-                    {
-                        ImGui.Text("Target Name: " + action.Target.Value.Target?.Name ?? string.Empty);
-                    }
+                    ImGui.Text("Target Name: " + action.Target.Target?.Name ?? string.Empty);
                 }
                 catch
                 {

diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
@@ -42,7 +42,7 @@ internal static IBaseAction? NextGCDAction
             circle.Owner = sector.Owner = rectangle.Owner = player;
 
             if (value == null) return;
-            var target = value.Target?.Target ?? player;
+            var target = value.Target.Target ?? player;
 
             var range = value.Action.EffectRange;
             var size = new Vector3(range, gcdHeight, range);

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -53,6 +53,7 @@ private unsafe static void FrameworkUpdate(IFramework framework)
         {
             SocialUpdater.UpdateSocial();
             PreviewUpdater.UpdatePreview();
+            TargetUpdater.UpdateTarget();
 
             if (Service.Config.TeachingMode && ActionUpdater.NextAction != null)
             {
@@ -171,7 +172,6 @@ private static void UpdateWork()
 
         try
         {
-            TargetUpdater.UpdateTarget();
             StateUpdater.UpdateState();
 
             if (Service.Config.AutoLoadCustomRotations)

diff --git a/RotationSolver/Updaters/StateUpdater.cs b/RotationSolver/Updaters/StateUpdater.cs
@@ -44,8 +44,8 @@ private static AutoStatus StatusFromAutomatic()
         {
             var id = ActionUpdater.NextGCDAction.ID;
             if (ConfigurationHelper.ActionPositional.TryGetValue((ActionID)id, out var positional)
-                && positional != ActionUpdater.NextGCDAction.Target?.Target?.FindEnemyPositional()
-                && (ActionUpdater.NextGCDAction.Target?.Target?.HasPositional() ?? false))
+                && positional != ActionUpdater.NextGCDAction.Target.Target?.FindEnemyPositional()
+                && (ActionUpdater.NextGCDAction.Target.Target?.HasPositional() ?? false))
             {
                 status |= AutoStatus.Positional;
             }