fix: add animationLockTime property for IAction.

ArchiDog1998 · Apr 19, 2023 · 8a9e8fc · 8a9e8fc
1 parent 121c98b
commit 8a9e8fc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
@@ -90,6 +90,8 @@ public virtual unsafe uint MPNeed
 
     public uint SortKey => CoolDownGroup;
 
+    public float AnimationLockTime => IActionHelper.AnimationLockTime.TryGetValue(AdjustedID, out var time) ? time : 0.6f;
+
     public BaseAction(ActionID actionID, ActionOption option = ActionOption.None)
     {
         _action = Service.GetSheet<Action>().GetRow((uint)actionID);

diff --git a/RotationSolver.Basic/Actions/BaseItem.cs b/RotationSolver.Basic/Actions/BaseItem.cs
@@ -65,6 +65,8 @@ public bool IsInCooldown
 
     public uint SortKey { get; }
 
+    public float AnimationLockTime => IActionHelper.AnimationLockTime.TryGetValue(AdjustedID, out var time) ? time : 1.1f;
+
     public unsafe BaseItem(uint row, uint a4 = 65535)
     {
         _item = Service.GetSheet<Item>().GetRow(row);

diff --git a/RotationSolver.Basic/Actions/IAction.cs b/RotationSolver.Basic/Actions/IAction.cs
@@ -6,6 +6,7 @@ public interface IAction : ITexture
     uint ID { get; }
     uint AdjustedID { get; }
     float RecastTimeOneCharge { get; }
+    float AnimationLockTime { get; }
     uint SortKey { get; }
 
     /// <summary>

diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
@@ -38,7 +38,7 @@ private static unsafe void ReceiveAbilityEffect(uint sourceId, IntPtr sourceChar
         {
             var set = new ActionEffectSet(sourceId, effectHeader, effectArray, effectTargets);
 
-            ActionFromSelf(sourceId, set);
+            ActionFromSelf(sourceId, set, effectHeader->actionId);
             ActionFromEnemy(sourceId, set);
         }
         catch(Exception ex) 
@@ -71,13 +71,15 @@ private static void ActionFromEnemy(uint sourceId, ActionEffectSet set)
         ShowStrEnemy = $"Damage Ratio: {damageRatio}\n{set}";
     }
 
-    private static void ActionFromSelf(uint sourceId, ActionEffectSet set)
+    private static void ActionFromSelf(uint sourceId, ActionEffectSet set, uint id)
     {
         if (sourceId != Service.Player.ObjectId) return;
-        if (set.Type != ActionType.Spell) return;
+        if (set.Type != ActionType.Spell && set.Type != ActionType.Item) return;
         if ((ActionCate)set.Action?.ActionCategory.Value.RowId == ActionCate.AutoAttack) return;
 
-        if(!set.TargetEffects.Any()) return;
+        IActionHelper.AnimationLockTime[id] = set.AnimationLock;
+
+        if (!set.TargetEffects.Any()) return;
         var flag = set.TargetEffects.FirstOrDefault()[0].Param2;
 
         var action = set.Action;
@@ -88,7 +90,6 @@ private static void ActionFromSelf(uint sourceId, ActionEffectSet set)
         //Record
         DataCenter.AddActionRec(set.Action);
         DataCenter.NextActionMinTime = DateTime.Now.AddSeconds(set.AnimationLock);
-        IActionHelper.AnimationLockTime[set.Action.RowId] = set.AnimationLock;
         ShowStrSelf = set.ToString();
 
         //Macro