From 47f13cb830dac956b083bd2544863865d568baae Mon Sep 17 00:00:00 2001 From: Tykku Date: Thu, 30 May 2024 02:53:09 -0400 Subject: [PATCH] Fixed BRD option to use shot procs immediately --- BasicRotations/Ranged/BRD_Default.cs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/BasicRotations/Ranged/BRD_Default.cs b/BasicRotations/Ranged/BRD_Default.cs index f90a7c5..a89eb4d 100644 --- a/BasicRotations/Ranged/BRD_Default.cs +++ b/BasicRotations/Ranged/BRD_Default.cs @@ -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; @@ -143,8 +146,13 @@ 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)) @@ -152,6 +160,7 @@ protected override bool GeneralGCD(out IAction? act) 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)) @@ -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);