Merge pull request #250 from FFXIV-CombatReborn/lightspeed

Add checks to prevent redundant LightspeedPvE usage
FFXIV-CombatReborn · Sep 22, 2024 · ab84ff5 · ab84ff5
2 parents c76a64b + 21220e1
commit ab84ff5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/BasicRotations/Healer/AST_Default.cs b/BasicRotations/Healer/AST_Default.cs
@@ -179,18 +179,24 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         act = null;
         if (BubbleProtec && Player.HasStatus(true, StatusID.CollectiveUnconscious_848)) return false;
 
-        if (InCombat && DivinationPvE.Cooldown.ElapsedAfter(115) && LightspeedPvE.CanUse(out act, usedUp: true)) return true;
+        if (!Player.HasStatus(true, StatusID.Lightspeed) 
+            && InCombat 
+            && DivinationPvE.Cooldown.ElapsedAfter(115) 
+            && LightspeedPvE.CanUse(out act, usedUp: true)) return true;
 
         if (IsBurst && !IsMoving
             && DivinationPvE.CanUse(out act)) return true;
 
         if (AstralDrawPvE.CanUse(out act, usedUp: IsBurst)) return true;
 
-        if ((InBurstStatus || DivinationPvE.Cooldown.ElapsedAfter(115)) && InCombat && LightspeedPvE.CanUse(out act, usedUp: true)) return true;
+        if (!Player.HasStatus(true, StatusID.Lightspeed) 
+            && (InBurstStatus || DivinationPvE.Cooldown.ElapsedAfter(115)) 
+            && InCombat 
+            && LightspeedPvE.CanUse(out act, usedUp: true)) return true;
 
         if (InCombat)
         {
-            if (IsMoving && LightspeedPvE.CanUse(out act, usedUp: LightspeedMove)) return true;
+            if (!Player.HasStatus(true, StatusID.Lightspeed) && IsMoving && LightspeedPvE.CanUse(out act, usedUp: LightspeedMove)) return true;
 
             if (!IsMoving)
             {

diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
@@ -16,7 +16,7 @@
     <Compile Include="Duty\EmanationDefault" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.114" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.115" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">