fix: Feint and Addle "Invalid Target"

ArchiDog1998 · Nov 22, 2023 · 6e86413 · 6e86413
1 parent 7dda987
commit 6e86413
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>3.5.41</Version>
+		<Version>3.5.6</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -27,9 +27,9 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction Addle { get; } = new RoleAction(ActionID.Addle, new JobRole[] { JobRole.RangedMagical }, ActionOption.Defense)
+    public static IBaseAction Addle { get; } = new RoleAction(ActionID.Addle, new JobRole[] { JobRole.RangedMagical }, ActionOption.None/* | ActionOption.Defense*/)
     {
-        ActionCheck = (b, m) => !b.HasStatus(false, StatusID.Addle),
+        ActionCheck = (b, m) => !b.HasStatus(false, StatusID.Addle) && CurrentTarget.IsTargetable,
     };
 
     /// <summary>
@@ -77,17 +77,15 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction LucidDreaming { get; } = new RoleAction(ActionID.LucidDreaming,
-        new JobRole[] { JobRole.Healer, JobRole.RangedMagical }, ActionOption.Buff)
+    public static IBaseAction LucidDreaming { get; } = new RoleAction(ActionID.LucidDreaming,new JobRole[] { JobRole.Healer, JobRole.RangedMagical }, ActionOption.Buff)
     {
         ActionCheck = (b, m) => Player.CurrentMp < 6000 && InCombat,
     };
 
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction SecondWind { get; } = new RoleAction(ActionID.SecondWind,
-        new JobRole[] { JobRole.RangedPhysical, JobRole.Melee }, ActionOption.Heal)
+    public static IBaseAction SecondWind { get; } = new RoleAction(ActionID.SecondWind,new JobRole[] { JobRole.RangedPhysical, JobRole.Melee }, ActionOption.Heal)
     {
         ActionCheck = (b, m) => Player?.GetHealthRatio() < Service.Config.GetValue(Configuration.JobConfigFloat.HealthSingleAbility) && InCombat,
     };
@@ -149,7 +147,7 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction Feint { get; } = new RoleAction(ActionID.Feint, new JobRole[] { JobRole.Melee }, ActionOption.Defense)
+    public static IBaseAction Feint { get; } = new RoleAction(ActionID.Feint, new JobRole[] { JobRole.Melee },  ActionOption.None /*| ActionOption.Defense*/)
     {
         ActionCheck = (b, m) => !b.HasStatus(false, StatusID.Feint),
     };
@@ -195,14 +193,12 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction SureCast { get; } = new RoleAction(ActionID.SureCast,
-        new JobRole[] { JobRole.RangedMagical, JobRole.Healer }, ActionOption.Heal);
+    public static IBaseAction SureCast { get; } = new RoleAction(ActionID.SureCast,new JobRole[] { JobRole.RangedMagical, JobRole.Healer }, ActionOption.Heal);
 
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction TrueNorth { get; } = new RoleAction(ActionID.TrueNorth,
-        new JobRole[] { JobRole.Melee }, ActionOption.Heal)
+    public static IBaseAction TrueNorth { get; } = new RoleAction(ActionID.TrueNorth,new JobRole[] { JobRole.Melee }, ActionOption.Heal)
     {
         StatusProvide = new StatusID[] { StatusID.TrueNorth, StatusID.RightEye },
     };