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

Commit b4289be

Browse files
authored
Merge pull request #127 from FFXIV-CombatReborn/Theres-A-Snake-In-My-Boot
Nuget bump, ranged viper GCD fix, and GND fix attempt
2 parents 2abcbe2 + f31a89b commit b4289be

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

BasicRotations/Melee/VPR_Default.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ protected override bool GeneralGCD(out IAction? act)
245245
if (UnCoilCoil.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true)) return true;
246246
}
247247

248+
if (WrithingSnapPvE.CanUse(out act)) return true;
248249

249250
return base.GeneralGCD(out act);
250251
}

BasicRotations/RebornRotations.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<None Remove="Duty\PVPRotations\**" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.19" />
12+
<PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.22" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<Reference Include="Dalamud">

BasicRotations/Tank/GNB_Default.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,11 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
9696
#region GCD Logic
9797
protected override bool GeneralGCD(out IAction? act)
9898
{
99-
bool IsReadyToReign = (Player.HasStatus(true, StatusID.ReadyToReign));
10099
bool areDDTargetsInRange = AllHostileTargets.Any(hostile => hostile.DistanceToPlayer() < 4.5f);
101100

102-
if (IsLastGCD(true, NobleBloodPvE) && LionHeartPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true)) return true;
103-
104-
if (IsLastGCD(true, ReignOfBeastsPvE) && NobleBloodPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true)) return true;
105-
106-
if (IsReadyToReign)
107-
{
108-
if (ReignOfBeastsPvE.CanUse(out act, skipAoeCheck: true)) return true;
109-
}
101+
if (LionHeartPvE.CanUse(out act)) return true;
102+
if (NobleBloodPvE.CanUse(out act)) return true;
103+
if (ReignOfBeastsPvE.CanUse(out act)) return true;
110104

111105
if (FatedCirclePvE.CanUse(out act)) return true;
112106

0 commit comments

Comments
 (0)