fix: fixed move ability can't be used issue.

ArchiDog1998 · Jul 27, 2023 · 7a93be0 · 7a93be0
1 parent 4f10e3e
commit 7a93be0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -415,6 +415,7 @@
   "20258": 0.1,
   "20304": 0.6,
   "20542": 2.1,
+  "20543": 2.1,
   "20640": 2.1,
   "20710": 0.1,
   "20715": 0.6,
@@ -527,6 +528,7 @@
   "25784": 0.6,
   "25785": 0.6,
   "25788": 0.6,
+  "25790": 0.6,
   "25793": 0.1,
   "25796": 0.6,
   "25797": 0.6,

diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -305,5 +305,14 @@
   6091,
   6229,
   6453,
-  6178
+  6178,
+  3254,
+  25273,
+  25268,
+  16030,
+  16106,
+  16071,
+  9408,
+  9411,
+  25272
 ]
diff --git a/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs
@@ -2,7 +2,6 @@
 using ECommons.DalamudServices;
 using ECommons.ExcelServices;
 using RotationSolver.Basic.Traits;
-using static System.Net.WebRequestMethods;
 
 namespace RotationSolver.Basic.Rotations.Basic;
 

diff --git a/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs b/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs
@@ -384,7 +384,7 @@ protected static bool ExecuteStepGCD(out IAction act)
     [RotationDesc(ActionID.EnAvant)]
     protected sealed override bool MoveForwardAbility(out IAction act)
     {
-        if (EnAvant.CanUse(out act, CanUseOption.MustUseEmpty)) return true;
+        if (EnAvant.CanUse(out act, CanUseOption.MustUseEmpty | CanUseOption.IgnoreClippingCheck)) return true;
         return false;
     }
 

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
@@ -236,7 +236,7 @@ private bool MovingAbility(SpecialCommandType specialType, out IAction act)
         act = null;
         if (specialType == SpecialCommandType.MoveForward && MoveForwardAbility(out act))
         {
-            if (act is BaseAction b && ObjectHelper.DistanceToPlayer(b.Target) > 5) return true;
+            if (act is BaseAction b && (b.Target == Player || ObjectHelper.DistanceToPlayer(b.Target) > 5)) return true;
         }
         else if (specialType == SpecialCommandType.MoveBack)
         {

diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
@@ -79,9 +79,6 @@ private static void ActionFromEnemy(ActionEffectSet set)
                 {
                     DataCenter.KnockbackStart = DateTime.Now;
                     DataCenter.KnockbackFinished = DateTime.Now + TimeSpan.FromSeconds(knock.Distance / (float)knock.Speed);
-#if DEBUG
-                    Svc.Chat.Print($"Knock back: {DataCenter.KnockbackStart} - {DataCenter.KnockbackFinished}");
-#endif
                 }
                 break;
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -305,5 +305,14 @@ @@
 ,
 ,
 ,
+,
+,
+,
+,
+,
+,
+,
+,
+,
     ]