Merge pull request #841 from FFXIV-CombatReborn/PhantomJeuno

Enhance ability checks and cleanup code

Author: LTS-FFXIV

BasicRotations/Duty/PhantomDefault.cs

@@ -674,11 +674,11 @@ public override bool GeneralGCD(out IAction? act)
 
         if (OccultCometPvE.CanUse(out act)) // Adding this to general swiftcast check is slightly more expensive for the many operations it will never be valid in
         {
-            if (!IsRDM && !IsPLD)
+            if (!IsRDM && !IsPLD && !IsBLM)
             {
                 return true;
             }
-            if ((IsRDM && HasSwift) || (IsPLD && Player.HasStatus(true, StatusID.Requiescat)))
+            if (((IsRDM || IsBLM) && HasSwift) || (IsPLD && Player.HasStatus(true, StatusID.Requiescat)))
             {
                 return true;
             }

RotationSolver.Basic/Helpers/ObjectHelper.cs

@@ -2,24 +2,20 @@
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using ECommons;
-using ECommons.Automation.UIInput;
 using ECommons.DalamudServices;
 using ECommons.ExcelServices;
 using ECommons.GameFunctions;
 using ECommons.GameHelpers;
 using ECommons.Logging;
 using ExCSS;
-using FFXIVClientStructs;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Event;
-using FFXIVClientStructs.FFXIV.Client.Graphics;
 using FFXIVClientStructs.FFXIV.Common.Component.BGCollision;
 using Lumina.Excel.Sheets;
 using RotationSolver.Basic.Configuration;
 using System.Collections.Concurrent;
 using System.Text;
 using System.Text.RegularExpressions;
-using static FFXIVClientStructs.FFXIV.Client.UI.Agent.AgentTryon.Delegates;
 
 namespace RotationSolver.Basic.Helpers;
 
@@ -1017,8 +1013,8 @@ public static bool IsJeunoBossImmune(this IBattleChara battleChara)
             var VauntedVillain = battleChara.HasStatus(false, StatusID.VauntedVillain);
             var EpicVillain = battleChara.HasStatus(false, StatusID.EpicVillain);
 
-            var FatedHero = Player.Object.HasStatus(false, StatusID.VauntedHero);
-            var VauntedHero = Player.Object.HasStatus(false, StatusID.FatedHero);
+            var VauntedHero = Player.Object.HasStatus(false, StatusID.VauntedHero);
+            var FatedHero = Player.Object.HasStatus(false, StatusID.FatedHero);
             var EpicHero = Player.Object.HasStatus(false, StatusID.EpicHero);
 
             if (EpicVillain && (VauntedHero || FatedHero))

RotationSolver.Basic/Rotations/Duties/DutyRotation.cs

@@ -175,6 +175,7 @@ public void Dispose()
 
     public static bool IsRDM => DataCenter.Job == Job.RDM;
     public static bool IsPLD => DataCenter.Job == Job.PLD;
+    public static bool IsBLM => DataCenter.Job == Job.BLM;
 
     public static float PartyMembersAverHP => DataCenter.PartyMembersAverHP;
 

RotationSolver.Basic/Rotations/Duties/PhantomRotation.cs

@@ -367,6 +367,7 @@ static partial void ModifyOccultDispelPvE(ref ActionSetting setting)
     static partial void ModifyOccultQuickPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => TimeMageLevel >= 5;
+        setting.TargetType = TargetType.Self;
         setting.StatusProvide = [StatusID.OccultQuick, StatusID.OccultSwift];
     }
     #endregion