Merge pull request #166 from FFXIV-CombatReborn/ASTVPR

AST and VPR hotfix
FFXIV-CombatReborn · Jul 30, 2024 · 1ff8d09 · 1ff8d09
2 parents 83c3aa2 + 3743446
commit 1ff8d09
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/BasicRotations/Healer/AST_Default.cs b/BasicRotations/Healer/AST_Default.cs
@@ -38,16 +38,24 @@ public sealed class AST_Default : AstrologianRotation
     #endregion
 
     #region Defensive Logic
-    [RotationDesc(ActionID.CelestialIntersectionPvE, ActionID.ExaltationPvE, ActionID.TheArrowPvE, ActionID.TheSpirePvE, ActionID.TheBolePvE, ActionID.TheEwerPvE)]
-    protected override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
+
+    [RotationDesc(ActionID.CelestialIntersectionPvE, ActionID.TheArrowPvE, ActionID.TheEwerPvE)]
+    protected override bool HealSingleAbility(IAction nextGCD, out IAction? act)
     {
+        if (InCombat && TheArrowPvE.CanUse(out act)) return true;
+        if (InCombat && TheEwerPvE.CanUse(out act)) return true;
+
         if (CelestialIntersectionPvE.CanUse(out act, usedUp: true)) return true;
-        if (ExaltationPvE.CanUse(out act)) return true;
+        return base.HealSingleAbility(nextGCD, out act);
+    }
 
-        if (InCombat && TheArrowPvE.CanUse(out act)) return true;
+    [RotationDesc(ActionID.ExaltationPvE, ActionID.TheArrowPvE, ActionID.TheSpirePvE, ActionID.TheBolePvE, ActionID.TheEwerPvE)]
+    protected override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
+    {
         if (InCombat && TheSpirePvE.CanUse(out act)) return true;
         if (InCombat && TheBolePvE.CanUse(out act)) return true;
-        if (InCombat && TheEwerPvE.CanUse(out act)) return true;
+
+        if (ExaltationPvE.CanUse(out act)) return true;
         return base.DefenseSingleAbility(nextGCD, out act);
     }
 
@@ -62,7 +70,7 @@ protected override bool DefenseAreaGCD(out IAction? act)
         return base.DefenseAreaGCD(out act);
     }
 
-    [RotationDesc(ActionID.CollectiveUnconsciousPvE)]
+    [RotationDesc(ActionID.CollectiveUnconsciousPvE, ActionID.SunSignPvE)]
     protected override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
     {
         act = null;

diff --git a/BasicRotations/Melee/VPR_Default.cs b/BasicRotations/Melee/VPR_Default.cs
@@ -83,8 +83,8 @@ protected override bool GeneralGCD(out IAction? act)
         }
 
         ////AOE Dread Combo
-        if (SwiftskinsDenPvE.CanUse(out act)) return true;
-        if (HuntersDenPvE.CanUse(out act)) return true;
+        if (SwiftskinsDenPvE.CanUse(out act, skipComboCheck: true)) return true;
+        if (HuntersDenPvE.CanUse(out act, skipComboCheck: true)) return true;
 
         if (VicepitPvE.Cooldown.CurrentCharges == 1 && VicepitPvE.Cooldown.RecastTimeRemainOneCharge < 10)
         {

diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
@@ -9,7 +9,7 @@
     <None Remove="Duty\PVPRotations\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.1" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">