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

Commit

Permalink
Merge pull request #221 from FFXIV-CombatReborn/SGE-buff
Browse files Browse the repository at this point in the history
SGE Eurkrasia out of combat fix
  • Loading branch information
LTS-FFXIV authored Sep 13, 2024
2 parents 7c00e01 + 9ebdc7b commit c3dda1f
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions BasicRotations/Healer/SGE_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ public sealed class SGE_Default : SageRotation
#region Config Options
[RotationConfig(CombatType.PvE, Name = "Use spells with cast times to heal. (Ignored if you are the only healer in party)")]
public bool GCDHeal { get; set; } = false;
#endregion

[RotationConfig(CombatType.PvE, Name = "Enable Swiftcast Restriction Logic to attempt to prevent actions other than Raise when you have swiftcast")]
public bool SwiftLogic { get; set; } = true;
Expand Down Expand Up @@ -61,6 +60,8 @@ public sealed class SGE_Default : SageRotation
[RotationConfig(CombatType.PvE, Name = "Health threshold tank party member needs to use Pneuma as an AOE heal")]
public float PneumaAOETankHeal { get; set; } = 0.6f;

#endregion

#region Countdown Logic
protected override IAction? CountDownAction(float remainTime)
{
Expand Down Expand Up @@ -322,7 +323,7 @@ protected override bool HealSingleGCD(out IAction? act)

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

if (DiagnosisPvE.CanUse(out _) && !EukrasianDiagnosisPvE.CanUse(out _, skipCastingCheck: true))
if (DiagnosisPvE.CanUse(out _) && !EukrasianDiagnosisPvE.CanUse(out _, skipCastingCheck: true) && InCombat)
{
StatusHelper.StatusOff(StatusID.Eukrasia);
if (DiagnosisPvE.CanUse(out act))
Expand Down Expand Up @@ -390,7 +391,7 @@ protected override bool GeneralGCD(out IAction? act)

if (DyskrasiaPvE.CanUse(out _))
{
if ((EukrasianDyskrasiaPvE.Target.Target?.WillStatusEnd(3, true, EukrasianDyskrasiaPvE.Setting.TargetStatusProvide ?? []) ?? false))
if ((EukrasianDyskrasiaPvE.Target.Target?.WillStatusEnd(3, true, EukrasianDyskrasiaPvE.Setting.TargetStatusProvide ?? []) ?? false) && InCombat)
{
StatusHelper.StatusOff(StatusID.Eukrasia);
}
Expand All @@ -414,7 +415,7 @@ protected override bool GeneralGCD(out IAction? act)

if (DosisPvE.CanUse(out _))
{
if ((EukrasianDosisPvE.Target.Target?.WillStatusEnd(3, true, EukrasianDosisPvE.Setting.TargetStatusProvide ?? []) ?? false))
if ((EukrasianDosisPvE.Target.Target?.WillStatusEnd(3, true, EukrasianDosisPvE.Setting.TargetStatusProvide ?? []) ?? false) && InCombat)
{
StatusHelper.StatusOff(StatusID.Eukrasia);
}
Expand Down

0 comments on commit c3dda1f

Please sign in to comment.