Merge pull request #956 from FFXIV-CombatReborn/AnimationLockHitfix

Moved animationlock tweaks to Extra, clamped timer to minimum of 26 in calculations

Author: LTS-FFXIV

RotationSolver.Basic/Configuration/Configs.cs

@@ -693,8 +693,8 @@ public const string
     /// Do NOT use with XivAlexander or NoClippy - this should automatically disable itself if they are detected, but double check first!
     /// </summary>
     [ConditionBool, UI("Remove extra lag-induced animation lock delay from instant casts (read tooltip!)", 
-    Description = "Do NOT use with XivAlexander or NoClippy - this should automatically disable itself if they are detected, but double check first!",
-    Filter = BasicTimer)]
+    Description = "Do NOT use with XivAlexander, BMR tweaks enabled, or NoClippy - this should automatically disable itself if they are detected, but double check first!",
+    Filter = Extra)]
     private static readonly bool _removeAnimationLockDelay = false;
 
     /// <summary>
@@ -705,7 +705,7 @@ public const string
     /// </summary>
     [UI("Animation lock max. simulated delay (read tooltip!)", 
     Description = "Configures the maximum simulated delay in milliseconds when using animation lock removal - this is required and cannot be reduced to zero. Setting this to 20ms will enable triple-weaving when using autorotation. The minimum setting to remove triple-weaving is 26ms. The minimum of 20ms has been accepted by FFLogs and should not cause issues with your logs.",
-    Parent = nameof(RemoveAnimationLockDelay), Filter = BasicTimer)]
+    Parent = nameof(RemoveAnimationLockDelay), Filter = Extra)]
     [Range(26, 50, ConfigUnitType.None, 1f)]
     public int AnimationLockDelayMax2 { get; set; } = 26;
 
@@ -715,7 +715,7 @@ public const string
     /// </summary>
     [ConditionBool, UI("Remove extra framerate-induced cooldown delay", 
     Description = "Dynamically adjusts cooldown and animation locks to ensure queued actions resolve immediately regardless of framerate limitations",
-    Filter = BasicTimer)]
+    Filter = Extra)]
     private static readonly bool _removeCooldownDelay = false;
 
     [JobConfig, UI("The HP for using Guard.",

RotationSolver.Basic/Tweaks/AnimationLockTweak.cs

@@ -20,8 +20,8 @@ public sealed unsafe class AnimationLockTweak
 {
     private float _lastReqInitialAnimLock;
     private uint _lastReqSequence = uint.MaxValue;
-    
-    private static float DelayMax => Service.Config.AnimationLockDelayMax2 * 0.001f;
+
+    private static float DelayMax => Math.Max(Service.Config.AnimationLockDelayMax2, 26) * 0.001f;
     private static readonly float DelaySmoothing = 0.8f; // Exponential smoothing factor
 
     /// <summary>