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

Healer stuff #220

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Healer stuff #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0df138
Update GCD methods and abilities across multiple classes
LTS-FFXIV Sep 13, 2024
55f2db8
nuget
LTS-FFXIV Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BasicRotations/Healer/AST_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ protected override bool HealSingleGCD(out IAction? act)
act = null;
if (BubbleProtec && Player.HasStatus(true, StatusID.CollectiveUnconscious_848)) return false;
if (MicroPrio && Player.HasStatus(true, StatusID.Macrocosmos)) return false;
if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && AscendPvE.CanUse(out _)) return false;

if (AspectedBeneficPvE.CanUse(out act)
&& (IsMoving
Expand All @@ -221,7 +221,7 @@ protected override bool HealAreaGCD(out IAction? act)
act = null;
if (BubbleProtec && Player.HasStatus(true, StatusID.CollectiveUnconscious_848)) return false;
if (MicroPrio && Player.HasStatus(true, StatusID.Macrocosmos)) return false;
if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && AscendPvE.CanUse(out _)) return false;

if (AspectedHeliosPvE.CanUse(out act)) return true;
if (HeliosPvE.CanUse(out act)) return true;
Expand Down
8 changes: 4 additions & 4 deletions BasicRotations/Healer/SCH_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ protected override bool HealAreaGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && ResurrectionPvE.CanUse(out _)) return false;

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

Expand All @@ -174,7 +174,7 @@ protected override bool HealSingleGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && ResurrectionPvE.CanUse(out _)) return false;

if (AdloquiumPvE.CanUse(out act)) return true;
if (PhysickPvE.CanUse(out act)) return true;
Expand All @@ -187,7 +187,7 @@ protected override bool DefenseAreaGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && ResurrectionPvE.CanUse(out _)) return false;

if (SuccorPvE.CanUse(out act)) return true;
return base.DefenseAreaGCD(out act);
Expand All @@ -197,7 +197,7 @@ protected override bool GeneralGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && ResurrectionPvE.CanUse(out _)) return false;

// Summon Eos
if (SummonEosPvE.CanUse(out act)) return true;
Expand Down
14 changes: 6 additions & 8 deletions BasicRotations/Healer/SGE_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using RotationSolver.Basic.Helpers;

namespace DefaultRotations.Healer;

[Rotation("Default", CombatType.PvE, GameVersion = "7.05")]
Expand Down Expand Up @@ -225,7 +223,7 @@ protected override bool DefenseAreaGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && EgeiroPvE.CanUse(out _)) return false;

if (EukrasianPrognosisIiPvE.CanUse(out act))
{
Expand Down Expand Up @@ -263,7 +261,7 @@ protected override bool DefenseSingleGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && EgeiroPvE.CanUse(out _)) return false;

if (EukrasianDiagnosisPvE.CanUse(out act))
{
Expand All @@ -288,7 +286,7 @@ protected override bool HealAreaGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && EgeiroPvE.CanUse(out _)) return false;

if (PartyMembersAverHP < PneumaAOEPartyHeal || DyskrasiaPvE.CanUse(out _) && PartyMembers.GetJobCategory(JobRole.Tank).Any(t => t.GetHealthRatio() < PneumaAOETankHeal))
{
Expand Down Expand Up @@ -322,7 +320,7 @@ protected override bool HealSingleGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && EgeiroPvE.CanUse(out _)) return false;

if (DiagnosisPvE.CanUse(out _) && !EukrasianDiagnosisPvE.CanUse(out _, skipCastingCheck: true))
{
Expand All @@ -339,9 +337,9 @@ protected override bool GeneralGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && EgeiroPvE.CanUse(out _)) return false;

if (!InCombat & EukrasiaPvE.CanUse(out act)) return true;
if (!InCombat && !Player.HasStatus(true, StatusID.Eukrasia) && EukrasiaPvE.CanUse(out act)) return true;

if (HostileTarget?.IsBossFromTTK() ?? false)
{
Expand Down
11 changes: 3 additions & 8 deletions BasicRotations/Healer/WHM_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ protected override bool HealAreaGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && RaisePvE.CanUse(out _)) return false;

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

Expand All @@ -168,7 +168,7 @@ protected override bool HealSingleGCD(out IAction? act)
{
act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && RaisePvE.CanUse(out _)) return false;

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

Expand All @@ -186,7 +186,7 @@ protected override bool GeneralGCD(out IAction? act)

act = null;

if (HasSwift && SwiftLogic) return false;
if (HasSwift && SwiftLogic && RaisePvE.CanUse(out _)) return false;

//if (NotInCombatDelay && RegenDefense.CanUse(out act)) return true;

Expand Down Expand Up @@ -233,10 +233,5 @@ private bool UseLily(out IAction? act)
if (AfflatusSolacePvE.CanUse(out act)) return true;
return false;
}

/*public override void DisplayStatus()
{
ImGui.Text(LilyTime.ToString());
}*/
#endregion
}
9 changes: 0 additions & 9 deletions BasicRotations/Melee/NIN_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,14 +437,5 @@ protected override bool GeneralGCD(out IAction? act)

// Checks if no ninjutsu action is currently selected or if the Rabbit Medium has been invoked.
private static bool NoNinjutsu => AdjustId(ActionID.NinjutsuPvE) is ActionID.NinjutsuPvE or ActionID.RabbitMediumPvE;

// Displays the current status of the rotation, including the aimed ninjutsu action, if any.
public override void DisplayStatus()
{

ImGui.Text(Ninki.ToString());

base.DisplayStatus();
}
#endregion
}
2 changes: 1 addition & 1 deletion BasicRotations/Ranged/BRD_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
{
if (((!RadiantFinalePvE.EnoughLevel && !RagingStrikesPvE.Cooldown.IsCoolingDown)
|| (RadiantFinalePvE.EnoughLevel && !RadiantFinalePvE.Cooldown.IsCoolingDown && RagingStrikesPvE.EnoughLevel && (!RagingStrikesPvE.Cooldown.IsCoolingDown || RagingStrikesPvE.Cooldown.WillHaveOneCharge(BuffAlignment))))
&& BattleVoicePvE.CanUse(out act, isLastAbility: false)) return true;
&& (HostileTarget?.HasStatus(true, StatusID.Windbite, StatusID.Stormbite) == true) && (HostileTarget?.HasStatus(true, StatusID.VenomousBite, StatusID.CausticBite) == true) && BattleVoicePvE.CanUse(out act, isLastAbility: false)) return true;

if (!Player.WillStatusEnd(0, true, StatusID.BattleVoice) && RadiantFinalePvE.CanUse(out act)) return true;

Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/RebornRotations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Compile Include="Duty\EmanationDefault" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.62" />
<PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.63" />
</ItemGroup>
<ItemGroup>
<Reference Include="Dalamud">
Expand Down
23 changes: 11 additions & 12 deletions BasicRotations/Tank/zPLD_Alpha.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,6 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
return base.EmergencyAbility(nextGCD, out act);
}

[RotationDesc(ActionID.ReprisalPvE, ActionID.DivineVeilPvE)]
protected override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
{

if (DivineVeilPvE.CanUse(out act)) return true;
if (!Player.HasStatus(true, StatusID.Bulwark) && ReprisalPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (PassageOfArmsPvE.CanUse(out act)) return true;
return base.DefenseAreaAbility(nextGCD, out act);
}

[RotationDesc(ActionID.SentinelPvE, ActionID.RampartPvE, ActionID.BulwarkPvE, ActionID.SheltronPvE, ActionID.ReprisalPvE)]
protected override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
{
Expand All @@ -124,13 +114,22 @@ protected override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
if ((SentinelPvE.EnoughLevel && SentinelPvE.Cooldown.IsCoolingDown && SentinelPvE.Cooldown.ElapsedAfter(60) || !SentinelPvE.EnoughLevel) && RampartPvE.CanUse(out act)) return true;

// If Reprisal can be used, use it and return true.
if (ReprisalPvE.CanUse(out act)) return true;
if (ReprisalPvE.CanUse(out act, skipAoeCheck: true)) return true;

}

return base.DefenseSingleAbility(nextGCD, out act);
}

[RotationDesc(ActionID.DivineVeilPvE, ActionID.PassageOfArmsPvE)]
protected override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
{
if (DivineVeilPvE.CanUse(out act)) return true;

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

return base.DefenseAreaAbility(nextGCD, out act);
}

protected override bool AttackAbility(IAction nextGCD, out IAction? act)
{
if (WeaponRemain > 0.42f)
Expand Down