Merge pull request #837 from FFXIV-CombatReborn/VPRhotfix3

Update to VPR, DRG, and statuscap checks

Author: LTS-FFXIV

BasicRotations/Melee/DRG_Default.cs

@@ -52,7 +52,7 @@ protected sealed override bool DefenseAreaAbility(IAction nextGCD, out IAction?
     #region oGCD Logic
     protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
-        if (IsBurst && InCombat)
+        if (IsBurst && InCombat && HasHostilesInRange)
         {
             bool lifeSurgeReady =
                 ((Player.HasStatus(true, StatusID.BattleLitany) || Player.HasStatus(true, StatusID.LanceCharge) || LOTDEndAfter(1000))

BasicRotations/Melee/VPR_Default.cs

@@ -237,7 +237,6 @@ protected override bool GeneralGCD(out IAction? act)
             return false;
         }
 
-
         ////Reawaken Combo
         if (OuroborosPvE.CanUse(out act))
         {
@@ -376,17 +375,20 @@ protected override bool GeneralGCD(out IAction? act)
 
         if ((PreserveCombo && LiveComboTime > GCDTime(3)) || !PreserveCombo)
         {
-            if (VicepitPvE.Cooldown.CurrentCharges == 1 && VicepitPvE.Cooldown.RecastTimeRemainOneCharge < 10)
+            if (IsSwift)
             {
+                if (VicepitPvE.Cooldown.CurrentCharges == 1 && VicepitPvE.Cooldown.RecastTimeRemainOneCharge < 10)
+                {
+                    if (VicepitPvE.CanUse(out act, usedUp: true))
+                    {
+                        return true;
+                    }
+                }
                 if (VicepitPvE.CanUse(out act, usedUp: true))
                 {
                     return true;
                 }
             }
-            if (VicepitPvE.CanUse(out act, usedUp: true))
-            {
-                return true;
-            }
         }
 
         ////Single Target Dread Combo
@@ -483,18 +485,22 @@ protected override bool GeneralGCD(out IAction? act)
 
         if ((PreserveCombo && LiveComboTime > GCDTime(3)) || !PreserveCombo)
         {
-            if (VicewinderPvE.Cooldown.CurrentCharges == 1 && VicewinderPvE.Cooldown.RecastTimeRemainOneCharge < 10)
+            if (IsSwift)
             {
+                if (VicewinderPvE.Cooldown.CurrentCharges == 1 && VicewinderPvE.Cooldown.RecastTimeRemainOneCharge < 10)
+                {
+                    if (VicewinderPvE.CanUse(out act, usedUp: true))
+                    {
+                        return true;
+                    }
+                }
                 if (VicewinderPvE.CanUse(out act, usedUp: true))
                 {
                     return true;
                 }
             }
-            if (VicewinderPvE.CanUse(out act, usedUp: true))
-            {
-                return true;
-            }
         }
+
         //AOE Serpent Combo
         // aoe 3
         switch ((HasGrimHunter, HasGrimSkin))
@@ -554,33 +560,33 @@ protected override bool GeneralGCD(out IAction? act)
 
         //Single Target Serpent Combo
         // st 3
-        switch ((HasFlankstung, HasFlanksbane, HasHindstung, HasHindsbane))
+        switch ((HasHindstung, HasHindsbane, HasFlankstung, HasFlanksbane))
         {
             case (true, _, _, _):
-                if (HindsbaneFangPvE.CanUse(out act))
+                if (HindstingStrikePvE.CanUse(out act))
                     return true;
                 break;
             case (_, true, _, _):
-                if (HindstingStrikePvE.CanUse(out act))
+                if (HindsbaneFangPvE.CanUse(out act))
                     return true;
                 break;
             case (_, _, true, _):
-                if (FlanksbaneFangPvE.CanUse(out act))
+                if (FlankstingStrikePvE.CanUse(out act))
                     return true;
                 break;
             case (_, _, _, true):
-                if (FlankstingStrikePvE.CanUse(out act))
+                if (FlanksbaneFangPvE.CanUse(out act))
                     return true;
                 break;
             case (false, false, false, false):
-                if (HindsbaneFangPvE.CanUse(out act))
-                    return true;
                 if (HindstingStrikePvE.CanUse(out act))
                     return true;
-                if (FlanksbaneFangPvE.CanUse(out act))
+                if (HindsbaneFangPvE.CanUse(out act))
                     return true;
                 if (FlankstingStrikePvE.CanUse(out act))
                     return true;
+                if (FlanksbaneFangPvE.CanUse(out act))
+                    return true;
                 break;
         }
 
@@ -597,10 +603,10 @@ protected override bool GeneralGCD(out IAction? act)
                 break;
             case "Equal":
             case null:
-                if (HuntersStingPvE.CanUse(out act))
-                    return true;
                 if (SwiftskinsStingPvE.CanUse(out act))
                     return true;
+                if (HuntersStingPvE.CanUse(out act))
+                    return true;
                 break;
         }
 

RotationSolver.Basic/Actions/ActionTargetInfo.cs

@@ -251,7 +251,7 @@ private readonly bool CheckStatus(IBattleChara battleChara, bool skipStatusProvi
             return false;
         }
 
-        if (Service.Config.Statuscap && battleChara != Player.Object && StatusHelper.IsStatusCapped(battleChara))
+        if (Service.Config.Statuscap && battleChara.IsEnemy() && StatusHelper.IsStatusCapped(battleChara))
         {
             return false;
         }

RotationSolver.Basic/Helpers/StatusHelper.cs

@@ -216,12 +216,17 @@ public static bool IsStatusCapped(IBattleChara battleChara)
             return false;
         }
 
-        return battleChara switch
+        //if (battleChara.IsParty() && battleChara.StatusList.Length == 30)
+        //{
+        //    return true;
+        //}
+
+        if (battleChara.IsEnemy() && battleChara.StatusList.Length == 60)
         {
-            IPlayerCharacter player => player.StatusList.Length == 30,
-            IBattleNpc npc => npc.StatusList.Length == 60,
-            _ => false
-        };
+            return true;
+        }
+
+        return false;
     }
 
     /// <summary>