fix: some check fix for the ff16 duty.

Author: ArchiDog1998

RotationSolver.Basic/Actions/ActionTargetInfo.cs

@@ -72,9 +72,16 @@ private readonly IEnumerable<BattleChara> GetCanTargets(bool skipStatusProvideCh
             objs.Add(obj);
         }
 
+        var targetables = objs.Where(CanUseTo);
+
+        if (!targetables.Any() && action.Info.IsDutyAction)
+        {
+            targetables = [Player.Object];
+        }
+
         var isAuto = !DataCenter.IsManual || IsTargetFriendly;
-        return objs.Where(b => isAuto || b.ObjectId == Svc.Targets.Target?.ObjectId)
-            .Where(InViewTarget).Where(CanUseTo).Where(action.Setting.CanTarget);
+        return targetables.Where(b => isAuto || b.ObjectId == Svc.Targets.Target?.ObjectId)
+            .Where(InViewTarget).Where(action.Setting.CanTarget);
     }
 
     private readonly List<BattleChara> GetCanAffects(bool skipStatusProvideCheck, TargetType type)

RotationSolver.Basic/Actions/BaseAction.cs

@@ -143,7 +143,6 @@ public bool CanUse(out IAction act, bool skipStatusProvideCheck = false, bool sk
 
         if (!Cooldown.CooldownCheck(usedUp, onLastAbility, skipClippingCheck, gcdCountForAbility)) return false;
 
-
         if (Setting.SpecialType is SpecialActionType.MeleeRange
             && IActionHelper.IsLastAction(IActionHelper.MovingActions)) return false; //No range actions after moving.
 
@@ -187,7 +186,7 @@ public unsafe bool Use()
 
             var loc = (FFXIVClientStructs.FFXIV.Common.Math.Vector3)target.Position;
 
-            return ActionManager.Instance()->UseActionLocation(ActionType.Action, ID, Player.Object.ObjectId, &loc);
+            return ActionManager.Instance()->UseActionLocation(ActionType.Action, adjustId, Player.Object.ObjectId, &loc);
         }
         else if (Svc.Objects.SearchById(target.Target?.ObjectId 
             ?? Player.Object?.ObjectId ?? GameObject.InvalidGameObjectId) == null)

RotationSolver.Basic/Data/VfxNewData.cs

@@ -11,5 +11,5 @@ public readonly struct VfxNewData(uint objectId, string path)
 
     public readonly TimeSpan TimeDuration => DateTime.Now - Time;
 
-    public override string ToString() => $"Object Effect: {Svc.Objects.SearchById(ObjectId)?.Name ?? "Object"}: {Path}";
+    public override string ToString() => $"Object Effect: {Svc.Objects.SearchById(ObjectId)?.Name ?? "Object"}: {Path}, {TimeDuration.TotalSeconds}";
 }

RotationSolver.Basic/Helpers/ActionHelper.cs

@@ -1,4 +1,5 @@
-using Action = Lumina.Excel.GeneratedSheets.Action;
+using FFXIVClientStructs.FFXIV.Client.Game;
+using Action = Lumina.Excel.GeneratedSheets.Action;
 
 
 namespace RotationSolver.Basic.Helpers;
@@ -15,11 +16,21 @@ internal static class ActionHelper
 
     internal static byte GetCoolDownGroup(this Action action)
     {
-        var group = action.IsGeneralGCD() ? action.AdditionalCooldownGroup : action.CooldownGroup;
-        if (group == 0) group = GCDCooldownGroup;
+        var group = action.IsGeneralGCD() ? GetAdditionalCooldownGroup(action) : GetFirstCooldownGroup(action);
+        if (group < 0) group = GCDCooldownGroup;
         return group;
     }
 
+    private static unsafe byte GetFirstCooldownGroup(Action action)
+    {
+        return (byte)ActionManager.Instance()->GetRecastGroup((int)ActionType.Action, action.RowId);
+    }
+
+    private static unsafe byte GetAdditionalCooldownGroup(Action action)
+    {
+        return (byte)ActionManager.Instance()->GetAdditionalRecastGroup(ActionType.Action, action.RowId);
+    }
+
     internal static bool IsInJob(this Action i)
     {
         var cate = i.ClassJobCategory.Value;

RotationSolver.Basic/Helpers/ActionIdHelper.cs

@@ -35,7 +35,7 @@ public unsafe static bool IsCoolingDown(byte cdGroup)
     /// </summary>
     /// <param name="cdGroup"></param>
     /// <returns></returns>
-    public static unsafe RecastDetail* GetCoolDownDetail(byte cdGroup) => ActionManager.Instance()->GetRecastGroupDetail(cdGroup - 1);
+    public static unsafe RecastDetail* GetCoolDownDetail(byte cdGroup) => ActionManager.Instance()->GetRecastGroupDetail(cdGroup);
 
 
     private static Action GetAction(this ActionID actionID)

RotationSolver.Basic/RotationSolver.Basic.csproj

@@ -62,17 +62,17 @@
 	  <Using Include="Dalamud.Interface" />
 	  <Using Include="ImGuiNET" />
 	  <Using Include="Newtonsoft.Json" />
-	  <ProjectReference Include="..\ECommons\ECommons\ECommons.csproj">
-		  <PrivateAssets>all</PrivateAssets>
-	  </ProjectReference>
+	  <ProjectReference Include="..\ECommons\ECommons\ECommons.csproj"/>
 
 	  <ProjectReference Include="..\RotationSolver.SourceGenerators\RotationSolver.SourceGenerators.csproj" OutputItemType="Analyzer" ExcludeAssets="All" ReferenceOutputAssembly="false" />
 
 	  <ProjectReference Include="..\XIVConfigUI\XIVConfigUI\XIVConfigUI.csproj" />
 
 	  <ProjectReference Include="..\XIVDrawer\XIVDrawer\XIVDrawer.csproj" />
 
-	  <PackageReference Include="Svg" Version="3.4.7" />
+	  <PackageReference Include="Svg" Version="3.4.7" >
+		  <PrivateAssets>all</PrivateAssets>
+	  </PackageReference>
 
       <None Include="..\Images\Logo.png">
 		<Pack>True</Pack>

RotationSolver.Basic/Rotations/Duties/FF16Rotation.cs

@@ -8,22 +8,12 @@ namespace RotationSolver.Basic.Rotations.Duties;
 [DutyTerritory(1166)]
 public abstract class FF16Rotation : DutyRotation
 {
-    public override bool AttackAbility(out IAction? act)
-    {
-        if (RisingFlamesPvE.CanUse(out act, skipAoeCheck: true)) return true;
-        return base.AttackAbility(out act);
-    }
 }
 
 partial class DutyRotation
 {
-    static partial void ModifyDodgePvE(ref ActionSetting setting)
-    {
-        setting.StatusProvide = [StatusID.Precision];
-    }
-
-    static partial void ModifyPrecisionStrikePvE(ref ActionSetting setting)
-    {
-        setting.StatusNeed = [StatusID.Precision];
-    }
+    //static partial void ModifyPrecisionStrikePvE(ref ActionSetting setting)
+    //{
+    //    setting.StatusNeed = [StatusID.Precision];
+    //}
 }

RotationSolver/Localization/Localization.json

@@ -504,5 +504,7 @@
   "RotationSolver.Basic.Configuration.ConfigsDescription.RotationSolver.Basic.Configuration.ConditionBoolean MoveAreaActionFarthest": "Moves to the furthest possible position that can be targeted with movement actions.",
   "RotationSolver.Basic.Configuration.ConfigsDescription.Single MoveTargetAngle": "If the selection mode is based on character facing, i.e., targets within the character's viewpoint are moveable targets. \nIf the selection mode is screen-centered, i.e., targets within a sector drawn upward from the character's point are movable targets.",
   "XIVConfigUI.ConfigUnitType.Degree": "Angle Unit, in degrees.",
-  "RotationSolver.Basic.Configuration.ConfigsName.RotationSolver.Basic.Configuration.ConditionBoolean InDebug": "Debug Mode."
+  "RotationSolver.Basic.Configuration.ConfigsName.RotationSolver.Basic.Configuration.ConditionBoolean InDebug": "Debug Mode.",
+  "XIVConfigUI.ConfigUnitType.Seconds": "Time Unit, in seconds.",
+  "XIVConfigUI.ConfigUnitType.Percent": "Ratio Unit, as percentage."
 }

RotationSolver/RotationSolverPlugin.cs

@@ -17,7 +17,6 @@
 using RotationSolver.UI.SearchableConfigs;
 using RotationSolver.Updaters;
 using XIVConfigUI;
-using XIVDrawer.Vfx;
 
 namespace RotationSolver;
 
@@ -100,7 +99,6 @@ public RotationSolverPlugin(DalamudPluginInterface pluginInterface)
 #if DEBUG
         if (Player.Available)
         {
-            new ActorVfx("vfx/common/eff/kaihi_stlp_c2v.avfx", Player.Object, Player.Object);
             //_ = XIVPainterMain.ShowOff();
         }
 #endif

RotationSolver/UI/RotationConfigWindow.cs

@@ -21,7 +21,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using XIVConfigUI;
-using XIVConfigUI.Attributes;
 using XIVConfigUI.SearchableConfigs;
 using XIVDrawer;
 using GAction = Lumina.Excel.GeneratedSheets.Action;
@@ -1293,6 +1292,7 @@ static void DrawActionDebug()
                         ImGui.Text("Cast Time: " + action.Info.CastTime.ToString());
                         ImGui.Text("MP: " + action.Info.MPNeed.ToString());
 #endif
+                        ImGui.Text("AnimationLock: " + action.Info.AnimationLockTime.ToString());
                         ImGui.Text("AttackType: " + action.Info.AttackType.ToString());
                         ImGui.Text("Aspect: " + action.Info.Aspect.ToString());
                         ImGui.Text("Has One:" + action.Cooldown.HasOneCharge.ToString());

RotationSolver/Watcher.cs

@@ -2,6 +2,7 @@
 using Dalamud.Hooking;
 using Dalamud.Plugin.Ipc;
 using ECommons.DalamudServices;
+using ECommons.ExcelServices;
 using ECommons.GameHelpers;
 using ECommons.Hooks;
 using ECommons.Hooks.ActionEffectTypes;
@@ -84,8 +85,7 @@ private static IntPtr ActorVfxNewHandler(string path, IntPtr a2, IntPtr a3, floa
         {
             var obj = Svc.Objects.CreateObjectReference(a2);
 
-            if (obj is not PlayerCharacter 
-                || !path.StartsWith("vfx/common/eff/", StringComparison.OrdinalIgnoreCase))
+            if (NotFrom(path))
             {
                 if (DataCenter.VfxNewData.Count >= 64)
                 {
@@ -94,21 +94,30 @@ private static IntPtr ActorVfxNewHandler(string path, IntPtr a2, IntPtr a3, floa
 
                 var effect = new VfxNewData(obj?.ObjectId ?? Dalamud.Game.ClientState.Objects.Types.GameObject.InvalidGameObjectId, path);
                 DataCenter.VfxNewData.Enqueue(effect);
-            }
 
 #if DEBUG
-            if(obj is PlayerCharacter)
-            {
-                Svc.Log.Debug("Object: " + path);
-            }
+                Svc.Log.Debug(effect.ToString());
 #endif
+            }
+
+
         }
         catch (Exception e)
         {
             Svc.Log.Warning(e, "Failed to load the vfx value!");
         }
 
         return _actorVfxCreateHook!.Original(path, a2, a3, a4, a5, a6, a7);
+
+        static bool NotFrom(string path)
+        {
+            return NotName(path, "dk") && NotName(path, "cmpp") && Enum.GetNames(typeof(Job)).All(s => NotName(path, s.ToLower()));
+
+            static bool NotName(string path, string trail)
+            {
+                return !path.StartsWith("vfx/common/eff/" + trail, StringComparison.OrdinalIgnoreCase);
+            }
+        }
     }
 
     private static unsafe long ProcessObjectEffectDetour(GameObject* a1, ushort a2, ushort a3, long a4)