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

Added new Positional Feature to RPR #258

Merged
merged 4 commits into from
Sep 25, 2024
Merged

Added new Positional Feature to RPR #258

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7245964
Added new Positional Feature to RPR
Four-amer Sep 25, 2024
b89a679
Merge branch 'FFXIV-CombatReborn:main' into main
Four-amer Sep 25, 2024
a6a7e84
Clarity Fix
Four-amer Sep 25, 2024
0041d76
Merge branch 'main' of https://github.com/Four-amer/RebornRotations
Four-amer Sep 25, 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
32 changes: 32 additions & 0 deletions BasicRotations/Melee/RPR_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,28 @@ protected override bool GeneralGCD(out IAction? act)
if (HasSoulReaver)
{
if (GuillotinePvE.CanUse(out act)) return true;

if (Player.HasStatus(true, StatusID.EnhancedGallows))
{
if (GallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
}
else if (Player.HasStatus(true, StatusID.EnhancedGibbet))
{
if (GibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
}

// Try using Gallows/Gibbet that player is in position for when without Enchanced status
else if (CanHitPositional(EnemyPositional.Rear, GallowsPvE.Target.Target))
{
if (GallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
}
else if (CanHitPositional(EnemyPositional.Flank, GibbetPvE.Target.Target))
{
if (GibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
}
else
{
if (GallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
if (GibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
}
}
Expand Down Expand Up @@ -186,12 +202,28 @@ private bool ItsGluttonyTime(out IAction? act)
if (ExecutionerReady)
{
if (ExecutionersGuillotinePvE.CanUse(out act)) return true;

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

// Try using Executioners Gallows/Gibbet that player is in position for when without Enchanced status
else if (CanHitPositional(EnemyPositional.Rear, ExecutionersGallowsPvE.Target.Target))
{
if (ExecutionersGallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
}
else if (CanHitPositional(EnemyPositional.Flank, ExecutionersGibbetPvE.Target.Target))
{
if (ExecutionersGibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
}
else
{
if (ExecutionersGallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
if (ExecutionersGibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
}
}
Expand Down