From 1e1c16115d4f3c62839cd145b89fc079aa98d00c Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Mon, 13 May 2024 07:07:33 -0500 Subject: [PATCH] nuget bump and emanationdefault --- BasicRotations/DefaultRotations.csproj | 8 +------- BasicRotations/Duty/EmanationDefault.cs | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/BasicRotations/DefaultRotations.csproj b/BasicRotations/DefaultRotations.csproj index a434584..9c7b070 100644 --- a/BasicRotations/DefaultRotations.csproj +++ b/BasicRotations/DefaultRotations.csproj @@ -8,13 +8,7 @@ - - - - - - - + diff --git a/BasicRotations/Duty/EmanationDefault.cs b/BasicRotations/Duty/EmanationDefault.cs index a464ad4..8401d1b 100644 --- a/BasicRotations/Duty/EmanationDefault.cs +++ b/BasicRotations/Duty/EmanationDefault.cs @@ -1,15 +1,17 @@ -namespace DefaultRotations.Duty; +using RotationSolver.Basic.Rotations.Duties; + +namespace DefaultRotations.Duty; [Rotation("Emanation Default", CombatType.PvE)] -[DutyTerritory(263, 264)] -internal class EmanationDefault : DutyRotation + +internal class EmanationDefault : EmanationRotation { - protected override bool EmergencyAbility(IAction nextGCD, out IAction? act) + public override bool EmergencyAbility(IAction nextGCD, out IAction? act) { // 8521 8522 8523 - bool Lol1 = HostileTarget?.CastActionId == 8521 - bool Lol2 = HostileTarget?.CastActionId == 8522 - bool Lol3 = HostileTarget?.CastActionId == 8523 + bool Lol1 = HostileTarget?.CastActionId == 8521; + bool Lol2 = HostileTarget?.CastActionId == 8522; + bool Lol3 = HostileTarget?.CastActionId == 8523; if (Lol1 || Lol2 || Lol3) { @@ -17,5 +19,8 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act) if (VrilPvE_9345.CanUse(out act)) return true; // Extreme return base.EmergencyAbility(nextGCD, out act); } + + act = null; + return base.EmergencyAbility(nextGCD, out act); } } \ No newline at end of file