Merge pull request #973 from FFXIV-CombatReborn/bigboss

Adjusted VPR rotation to account for bosses without positionals, added additional VFX path tracking for tankbusters

Author: LTS-FFXIV

RotationSolver.Basic/DataCenter.cs

@@ -1182,8 +1182,21 @@ public static bool IsCastingTankVfx()
     {
         return IsCastingVfx(VfxDataQueue, s =>
         {
-            return Player.AvailableThreadSafe && (!Player.Object.IsJobCategory(JobRole.Tank) || s.ObjectId == Player.Object.GameObjectId) && (s.Path.StartsWith("vfx/lockon/eff/tank_lockon")
-            || s.Path.StartsWith("vfx/lockon/eff/tank_laser"));
+            if (!Player.AvailableThreadSafe)
+            {
+                return false;
+            }
+
+            // For x6fe, ignore target and player role checks.
+            if (s.Path.StartsWith("vfx/lockon/eff/x6fe"))
+            {
+                return true;
+            }
+
+            // Preserve original checks for other tank lock-on effects.
+            return (!Player.Object.IsJobCategory(JobRole.Tank) || s.ObjectId == Player.Object.GameObjectId)
+                   && (s.Path.StartsWith("vfx/lockon/eff/tank_lockon")
+                       || s.Path.StartsWith("vfx/lockon/eff/tank_laser"));
         });
     }
 

RotationSolver/RebornRotations/Melee/VPR_Reborn.cs

@@ -574,17 +574,27 @@ protected override bool GeneralGCD(out IAction? act)
                     {
                         return true;
                     }
+
+                    if (HuntersCoilPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                    {
+                        return true;
+                    }
+
+                    if (SwiftskinsCoilPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                    {
+                        return true;
+                    }
                 }
 
                 if (!IsSwift)
                 {
-                    if (SwiftskinsCoilPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true))
+                    if (SwiftskinsCoilPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
                         return true;
                 }
 
                 if (!IsHunter)
                 {
-                    if (HuntersCoilPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true))
+                    if (HuntersCoilPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
                         return true;
                 }
             }

RotationSolver/UI/RotationConfigWindow.cs

@@ -3258,6 +3258,7 @@ private static unsafe void DrawStatus()
         ImGui.Text($"Combo Time: {DataCenter.ComboTime}");
         ImGui.Text($"TargetingType: {DataCenter.TargetingType}");
         ImGui.Spacing();
+        ImGui.Text($"IsHostileCastingToTank: {DataCenter.IsHostileCastingToTank}");
         ImGui.Text($"AttackedTargets: {DataCenter.AttackedTargets?.Count ?? 0}");
         if (DataCenter.AttackedTargets != null)
         {
@@ -3342,7 +3343,6 @@ private static unsafe void DrawStatus()
         }
 
         ImGui.Text($"DPSTaken: {DataCenter.DPSTaken}");
-        //ImGui.Text($"IsHostileCastingToTank: {DataCenter.IsHostileCastingToTank}");
         ImGui.Text($"CurrentRotation: {DataCenter.CurrentRotation}");
         ImGui.Text($"Job: {DataCenter.Job}");
         ImGui.Text($"JobRange: {DataCenter.JobRange}");