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

DT FIXES AGAIN #23

Merged
merged 1 commit into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 29 additions & 15 deletions BasicRotations/Melee/RPR_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ public sealed class RPR_Default : ReaperRotation
#region Config Options
[RotationConfig(CombatType.PvE, Name = "[Beta Option] Pool Shroud for Arcane Circle.")]
public bool EnshroudPooling { get; set; } = false;

public static bool HasExecutioner => Player.HasStatus(true, StatusID.Executioner);
#endregion

#region Countdown Logic
Expand Down Expand Up @@ -45,7 +47,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
}
}
if ((HostileTarget?.HasStatus(true, StatusID.DeathsDesign) ?? false)
&& ArcaneCirclePvE.CanUse(out act, skipAoeCheck: true)) return true;
&& !CombatElapsedLess(3.5f) && ArcaneCirclePvE.CanUse(out act, skipAoeCheck: true)) return true;
}

if (IsTargetBoss && IsTargetDying || NoEnshroudPooling || YesEnshroudPooling || IsIdealHost)
Expand All @@ -61,7 +63,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
if (LemuresSlicePvE.CanUse(out act, usedUp: true)) return true;
}

if (PlentifulHarvestPvE.EnoughLevel && !Player.HasStatus(true, StatusID.ImmortalSacrifice) && !Player.HasStatus(true, StatusID.BloodsownCircle_2972) || !PlentifulHarvestPvE.EnoughLevel)
if (PlentifulHarvestPvE.EnoughLevel && !Player.HasStatus(true, StatusID.ImmortalSacrifice) /*&& !Player.HasStatus(true, StatusID.BloodsownCircle_2972) */|| !PlentifulHarvestPvE.EnoughLevel)
{
if (GluttonyPvE.CanUse(out act, skipAoeCheck: true)) return true;
}
Expand All @@ -79,9 +81,14 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
#region GCD Logic
protected override bool GeneralGCD(out IAction? act)
{
if (IsLastAction(true, GluttonyPvE) || Player.HasStatus(true, StatusID.Executioner))
{
return ItsGluttonyTime(out act);
}

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

if (!HasExecutioner && !HasSoulReaver)
if (!HasExecutioner && !HasSoulReaver )
{
if (PerfectioPvE.CanUse(out act, skipAoeCheck: true)) return true;
}
Expand Down Expand Up @@ -123,18 +130,7 @@ protected override bool GeneralGCD(out IAction? act)
}
}

if (HasExecutioner)
{
if (ExecutionersGuillotinePvE.CanUse(out act)) return true;
if (Player.HasStatus(true, StatusID.EnhancedGallows))
{
if (ExecutionersGallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
}
else
{
if (ExecutionersGibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
}
}


if (HasSoulReaver)
{
Expand Down Expand Up @@ -182,5 +178,23 @@ private bool Reaping(out IAction? act)
}
return false;
}

private bool ItsGluttonyTime(out IAction? act)
{
if (HasExecutioner)
{
if (ExecutionersGuillotinePvE.CanUse(out act)) return true;
if (Player.HasStatus(true, StatusID.EnhancedGallows))
{
if (ExecutionersGallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
}
else
{
if (ExecutionersGibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
}
}
act = null;
return false;
}
#endregion
}
2 changes: 1 addition & 1 deletion BasicRotations/RebornRotations.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<None Remove="Duty\PVPRotations\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="RotationSolverReborn.Basic" Version="7.0.0.11" />
<PackageReference Include="RotationSolverReborn.Basic" Version="7.0.0.13" />
</ItemGroup>
<ItemGroup>
<Reference Include="Dalamud">
Expand Down