Merge pull request #802 from FFXIV-CombatReborn/raisecancel

Refactor combat checks and enhance casting logic

Author: LTS-FFXIV

BasicRotations/Duty/PhantomDefault.cs

@@ -604,12 +604,12 @@ public override bool GeneralGCD(out IAction? act)
             return true;
         }
 
-        if (HolyCannonPvE.CanUse(out act))
+        if (SilverCannonPvE.CanUse(out act))
         {
             return true;
         }
 
-        if (SilverCannonPvE.CanUse(out act))
+        if (HolyCannonPvE.CanUse(out act))
         {
             return true;
         }

RotationSolver/Updaters/MiscUpdater.cs

@@ -124,6 +124,13 @@ private static unsafe void UpdateCancelCast()
             && Svc.Objects.SearchById(Player.Object.CastTargetObjectId) is IBattleChara b
             && b.IsEnemy() && b.CurrentHp == 0;
 
+        // Cancel raise cast if target already has Raise status
+        bool tarHasRaise = false;
+        if (Svc.Objects.SearchById(Player.Object.CastTargetObjectId) is IBattleChara battleChara)
+        {
+            tarHasRaise = battleChara.HasStatus(false, StatusID.Raise);
+        }
+
         float[] statusTimes = GetStatusTimes();
 
         float minStatusTime = float.MaxValue;
@@ -137,7 +144,7 @@ private static unsafe void UpdateCancelCast()
 
         bool stopDueStatus = statusTimes.Length > 0 && minStatusTime > Player.Object.TotalCastTime - Player.Object.CurrentCastTime && minStatusTime < 5;
 
-        if (_tarStopCastDelay.Delay(tarDead) || stopDueStatus)
+        if (_tarStopCastDelay.Delay(tarDead) || stopDueStatus || tarHasRaise)
         {
             UIState* uiState = UIState.Instance();
             if (uiState != null)