From 5d9cc0eb80fd74f57392c31aaa10f089ee316ece Mon Sep 17 00:00:00 2001 From: Tykku Date: Wed, 8 May 2024 14:07:29 -0400 Subject: [PATCH] Rpr and Drg cleanup --- BasicRotations/Melee/DRG_Default.cs | 2 +- BasicRotations/Melee/RPR_Default.cs | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/BasicRotations/Melee/DRG_Default.cs b/BasicRotations/Melee/DRG_Default.cs index dd9d41e..c009524 100644 --- a/BasicRotations/Melee/DRG_Default.cs +++ b/BasicRotations/Melee/DRG_Default.cs @@ -86,7 +86,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act) #region GCD Logic protected override bool GeneralGCD(out IAction? act) { - var doomSpikeRightNow = DoomSpikeWhenever; + bool doomSpikeRightNow = DoomSpikeWhenever; if (CoerthanTormentPvE.CanUse(out act)) return true; if (SonicThrustPvE.CanUse(out act)) return true; diff --git a/BasicRotations/Melee/RPR_Default.cs b/BasicRotations/Melee/RPR_Default.cs index 7f36680..7a88557 100644 --- a/BasicRotations/Melee/RPR_Default.cs +++ b/BasicRotations/Melee/RPR_Default.cs @@ -6,7 +6,7 @@ public sealed class RPR_Default : ReaperRotation { #region Config Options - [RotationConfig(CombatType.PvE, Name = "[Beta Option] Wait until 50 stacks of Shroud to use Enshroud.")] + [RotationConfig(CombatType.PvE, Name = "[Beta Option] Pool Shroud for Arcane Circle.")] public bool EnshroudPooling { get; set; } = false; #endregion @@ -25,8 +25,10 @@ public sealed class RPR_Default : ReaperRotation #region oGCD Logic protected override bool AttackAbility(IAction nextGCD, out IAction? act) { - var IsTargetBoss = HostileTarget?.IsBossFromTTK() ?? false; - var IsTargetDying = HostileTarget?.IsDying() ?? false; + bool IsTargetBoss = HostileTarget?.IsBossFromTTK() ?? false; + bool IsTargetDying = HostileTarget?.IsDying() ?? false; + bool NoEnshroudPooling = !EnshroudPooling && Shroud >= 50; + bool YesEnshroudPooling = EnshroudPooling && Shroud >= 50 && (!PlentifulHarvestPvE.EnoughLevel || Player.HasStatus(true, StatusID.ArcaneCircle) || ArcaneCirclePvE.Cooldown.WillHaveOneCharge(8) || !Player.HasStatus(true, StatusID.ArcaneCircle) && ArcaneCirclePvE.Cooldown.WillHaveOneCharge(65) && !ArcaneCirclePvE.Cooldown.WillHaveOneCharge(50) || !Player.HasStatus(true, StatusID.ArcaneCircle) && Shroud >= 90); if (IsBurst) { @@ -45,8 +47,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act) && ArcaneCirclePvE.CanUse(out act, skipAoeCheck: true)) return true; } - if (IsTargetBoss && IsTargetDying || !EnshroudPooling && Shroud >= 50 || (EnshroudPooling && Shroud >= 50 && - (!PlentifulHarvestPvE.EnoughLevel || Player.HasStatus(true, StatusID.ArcaneCircle) || ArcaneCirclePvE.Cooldown.WillHaveOneCharge(8) || !Player.HasStatus(true, StatusID.ArcaneCircle) && ArcaneCirclePvE.Cooldown.WillHaveOneCharge(65) && !ArcaneCirclePvE.Cooldown.WillHaveOneCharge(50) || !Player.HasStatus(true, StatusID.ArcaneCircle) && Shroud >= 90))) + if (IsTargetBoss && IsTargetDying || NoEnshroudPooling || YesEnshroudPooling) { if (EnshroudPvE.CanUse(out act)) return true; } @@ -161,4 +162,4 @@ private bool Reaping(out IAction? act) return false; } #endregion -} +} \ No newline at end of file