Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
Merge pull request #103 from FFXIV-CombatReborn/Bard-Shot-Proc-Option
Browse files Browse the repository at this point in the history
Fixed BRD option to use shot procs immediately
  • Loading branch information
Toshi authored May 30, 2024
2 parents 69019a2 + 47f13cb commit 6ea4aec
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions BasicRotations/Ranged/BRD_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ public sealed class BRD_Default : BardRotation
[RotationConfig(CombatType.PvE, Name = @"Use Raging Strikes on ""Wanderer's Minuet""")]
public bool BindWAND { get; set; } = false;

[RotationConfig(CombatType.PvE, Name = "Use Shot Procs Immediately (May result in dots dropping)")]
public bool ShotsReady { get; set; } = false;

[Range(1, 45, ConfigUnitType.Seconds, 1)]
[RotationConfig(CombatType.PvE, Name = "Wanderer's Minuet Uptime")]
public float WANDTime { get; set; } = 43;
Expand Down Expand Up @@ -143,15 +146,21 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
#region GCD Logic
protected override bool GeneralGCD(out IAction? act)
{
if (ShadowbitePvE.CanUse(out act)) return true;
if (StraightShotPvE.CanUse(out act)) return true;
if (ShotsReady)
{
if (StraightShotPvE.CanUse(out act)) return true;
if (ShadowbitePvE.CanUse(out act)) return true;
}
if (WindbitePvE.CanUse(out act)) return true;
if (VenomousBitePvE.CanUse(out act)) return true;

if (IronJawsPvE.CanUse(out act)) return true;
if (IronJawsPvE.CanUse(out act, skipStatusProvideCheck: true) && (IronJawsPvE.Target.Target?.WillStatusEnd(30, true, IronJawsPvE.Setting.TargetStatusProvide ?? []) ?? false))
{
if (Player.HasStatus(true, StatusID.RagingStrikes) && Player.WillStatusEndGCD(1, 0, true, StatusID.RagingStrikes)) return true;
}

if (StraightShotPvE.CanUse(out act)) return true;
if (CanUseApexArrow(out act)) return true;

if (BlastArrowPvE.CanUse(out act, skipAoeCheck: true))
Expand All @@ -160,11 +169,8 @@ protected override bool GeneralGCD(out IAction? act)
if (Player.HasStatus(true, StatusID.RagingStrikes) && BarragePvE.Cooldown.IsCoolingDown) return true;
}

if (ShadowbitePvE.CanUse(out act)) return true;
if (QuickNockPvE.CanUse(out act)) return true;

if (WindbitePvE.CanUse(out act)) return true;
if (VenomousBitePvE.CanUse(out act)) return true;

if (HeavyShotPvE.CanUse(out act)) return true;

return base.GeneralGCD(out act);
Expand Down

0 comments on commit 6ea4aec

Please sign in to comment.