Merge pull request #161 from FFXIV-CombatReborn/trickattackwindowfix

InTrickAttack window now includes Kunai's Bane logic
FFXIV-CombatReborn · Jul 29, 2024 · cc8736c · cc8736c
2 parents 3c15694 + 959689c
commit cc8736c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/BasicRotations/Melee/NIN_Default.cs b/BasicRotations/Melee/NIN_Default.cs
@@ -438,7 +438,7 @@ protected override bool GeneralGCD(out IAction? act)
     private IBaseAction? _ninActionAim = null;
 
     // Determines if Trick Attack is in its effective period.
-    private bool InTrickAttack => TrickAttackPvE.Cooldown.IsCoolingDown && !TrickAttackPvE.Cooldown.ElapsedAfter(17);
+    private bool InTrickAttack => (KunaisBanePvE.Cooldown.IsCoolingDown || TrickAttackPvE.Cooldown.IsCoolingDown) && (!KunaisBanePvE.Cooldown.ElapsedAfter(17) || !TrickAttackPvE.Cooldown.ElapsedAfter(17));
 
     // Determines if Mug is in its effective period.
     private bool InMug => MugPvE.Cooldown.IsCoolingDown && !MugPvE.Cooldown.ElapsedAfter(19);

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.1.39" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.40" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">