From f39f02936d3382ecc71d59585a142534668161e4 Mon Sep 17 00:00:00 2001 From: LTS <127939494+LTS-FFXIV@users.noreply.github.com> Date: Sat, 27 Jul 2024 02:55:10 -0500 Subject: [PATCH] Sub 100 compatibility, adjustments for 50 to 52 --- BasicRotations/Melee/DRG_Default.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BasicRotations/Melee/DRG_Default.cs b/BasicRotations/Melee/DRG_Default.cs index 3325387..72da0b9 100644 --- a/BasicRotations/Melee/DRG_Default.cs +++ b/BasicRotations/Melee/DRG_Default.cs @@ -67,12 +67,13 @@ protected override bool GeneralAbility(IAction nextGCD, out IAction? act) protected override bool AttackAbility(IAction nextGCD, out IAction? act) { - if (Player.HasStatus(true, StatusID.LanceCharge) && LanceChargePvE.Cooldown.ElapsedOneChargeAfterGCD(3)) + if (Player.HasStatus(true, StatusID.LanceCharge)) { if (GeirskogulPvE.CanUse(out act)) return true; } - if (Player.HasStatus(true, StatusID.LanceCharge) && LanceChargePvE.Cooldown.ElapsedOneChargeAfterGCD(3)) + if (BattleLitanyPvE.EnoughLevel && Player.HasStatus(true, StatusID.BattleLitany) && Player.HasStatus(true, StatusID.LanceCharge) + || !BattleLitanyPvE.EnoughLevel && Player.HasStatus(true, StatusID.LanceCharge)) { if (DragonfireDivePvE.CanUse(out act)) return true; } @@ -83,15 +84,14 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act) if (WyrmwindThrustPvE.CanUse(out act, usedUp: true)) return true; } + if (JumpPvE.CanUse(out act)) return true; if (HighJumpPvE.CanUse(out act)) return true; - if (StardiverPvE.CanUse(out act)) return true; - + if (StardiverPvE.CanUse(out act)) return true; if (MirageDivePvE.CanUse(out act)) return true; if (NastrondPvE.CanUse(out act)) return true; if (StarcrossPvE.CanUse(out act)) return true; if (RiseOfTheDragonPvE.CanUse(out act)) return true; - if (HighJumpPvE.CanUse(out act)) return true; return base.AttackAbility(nextGCD, out act); } @@ -116,11 +116,11 @@ protected override bool GeneralGCD(out IAction? act) if (FangAndClawPvE.CanUse(out act)) return true; if (WheelingThrustPvE.CanUse(out act)) return true; - if (HeavensThrustPvE.CanUse(out act)) return true; - if (ChaoticSpringPvE.CanUse(out act)) return true; + if (FullThrustPvE.CanUse(out act)) return true; + if (ChaosThrustPvE.CanUse(out act)) return true; - if (LanceBarragePvE.CanUse(out act)) return true; - if (SpiralBlowPvE.CanUse(out act)) return true; + if (VorpalThrustPvE.CanUse(out act)) return true; + if (DisembowelPvE.CanUse(out act)) return true; if (RaidenThrustPvE.CanUse(out act)) return true; if (TrueThrustPvE.CanUse(out act)) return true;