Skip to content

Commit 57d60e3

Browse files
authored
Merge pull request #818 from FFXIV-CombatReborn/venomthrowitback
Hotfix for Viper rework and SGE
2 parents 7601ca5 + d4a4f61 commit 57d60e3

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

BasicRotations/Healer/SGE_Default.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -447,23 +447,23 @@ private bool ChoiceEukrasia(out IAction? act)
447447

448448
// Checks for Eukrasia status.
449449
// Attempts to set correct Eurkrasia action based on availability and MergedStatus.
450-
if (EukrasianPrognosisIiPvE.CanUse(out _)
451-
&& EukrasianPrognosisIiPvE.EnoughLevel && MergedStatus.HasFlag(AutoStatus.DefenseArea) && EukrasianPrognosisIiPvE.IsEnabled)
450+
if (EukrasianPrognosisIiPvE.EnoughLevel && EukrasianPrognosisIiPvE.IsEnabled && MergedStatus.HasFlag(AutoStatus.DefenseArea)
451+
&& EukrasianPrognosisIiPvE.CanUse(out _))
452452
{
453453
SetEukrasia(EukrasianPrognosisIiPvE);
454454
}
455-
else if (EukrasianPrognosisPvE.CanUse(out _)
456-
&& EukrasianPrognosisPvE.EnoughLevel && MergedStatus.HasFlag(AutoStatus.DefenseArea) && EukrasianPrognosisPvE.IsEnabled)
455+
else if (!EukrasianPrognosisIiPvE.EnoughLevel && EukrasianPrognosisPvE.EnoughLevel && EukrasianPrognosisPvE.IsEnabled && MergedStatus.HasFlag(AutoStatus.DefenseArea)
456+
&& EukrasianPrognosisPvE.CanUse(out _))
457457
{
458458
SetEukrasia(EukrasianPrognosisPvE);
459459
}
460-
else if (EukrasianDiagnosisPvE.CanUse(out _)
461-
&& EukrasianDiagnosisPvE.EnoughLevel && MergedStatus.HasFlag(AutoStatus.DefenseSingle) && EukrasianDiagnosisPvE.IsEnabled)
460+
else if (EukrasianDiagnosisPvE.EnoughLevel && EukrasianDiagnosisPvE.IsEnabled && MergedStatus.HasFlag(AutoStatus.DefenseSingle)
461+
&& EukrasianDiagnosisPvE.CanUse(out _))
462462
{
463463
SetEukrasia(EukrasianDiagnosisPvE);
464464
}
465-
else if (EukrasianDyskrasiaPvE.CanUse(out _)
466-
&& EukrasianDyskrasiaPvE.EnoughLevel && (!MergedStatus.HasFlag(AutoStatus.DefenseSingle) || !MergedStatus.HasFlag(AutoStatus.DefenseArea)) && EukrasianDyskrasiaPvE.IsEnabled)
465+
else if (EukrasianDyskrasiaPvE.EnoughLevel && EukrasianDyskrasiaPvE.IsEnabled && (!MergedStatus.HasFlag(AutoStatus.DefenseSingle) || !MergedStatus.HasFlag(AutoStatus.DefenseArea))
466+
&& EukrasianDyskrasiaPvE.CanUse(out _))
467467
{
468468
SetEukrasia(EukrasianDyskrasiaPvE);
469469
}

BasicRotations/Melee/VPR_Default.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,15 @@ protected override bool GeneralGCD(out IAction? act)
392392
return true;
393393
}
394394

395-
if (HuntersCoilPvE.Target.Target != null && CanHitPositional(EnemyPositional.Flank, HuntersCoilPvE.Target.Target) &&
395+
var Htarget = HuntersCoilPvE.Target.Target;
396+
if (Htarget != null && CanHitPositional(EnemyPositional.Flank, HuntersCoilPvE.Target.Target) &&
396397
HuntersCoilPvE.CanUse(out act, skipComboCheck: true))
397398
{
398399
return true;
399400
}
400401

401-
if (SwiftskinsCoilPvE.Target.Target != null && CanHitPositional(EnemyPositional.Rear, SwiftskinsCoilPvE.Target.Target) &&
402+
var Starget = SwiftskinsCoilPvE.Target.Target;
403+
if (Starget != null && CanHitPositional(EnemyPositional.Rear, SwiftskinsCoilPvE.Target.Target) &&
402404
SwiftskinsCoilPvE.CanUse(out act, skipComboCheck: true))
403405
{
404406
return true;

RotationSolver.Basic/Helpers/ObjectHelper.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ internal static bool HasPositional(this IBattleChara battleChara)
8181
return false;
8282
}
8383

84+
if (battleChara.StatusList == null)
85+
{
86+
return false;
87+
}
88+
8489
if (battleChara.HasStatus(false, StatusID.DirectionalDisregard))
8590
{
8691
return false;

0 commit comments

Comments
 (0)