From 7245964c4694be51e6a4d791ea287f30ea1a4514 Mon Sep 17 00:00:00 2001 From: Four-amer Date: Wed, 25 Sep 2024 13:09:04 +0200 Subject: [PATCH 1/2] Added new Positional Feature to RPR --- BasicRotations/Melee/RPR_Default.cs | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/BasicRotations/Melee/RPR_Default.cs b/BasicRotations/Melee/RPR_Default.cs index afc579f..4c50a35 100644 --- a/BasicRotations/Melee/RPR_Default.cs +++ b/BasicRotations/Melee/RPR_Default.cs @@ -137,12 +137,29 @@ 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; } } @@ -186,12 +203,29 @@ 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; } } From a6a7e84b22d1e26fdf798475471418ec9a3f946f Mon Sep 17 00:00:00 2001 From: Four-amer Date: Wed, 25 Sep 2024 13:12:19 +0200 Subject: [PATCH 2/2] Clarity Fix --- BasicRotations/Melee/RPR_Default.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/BasicRotations/Melee/RPR_Default.cs b/BasicRotations/Melee/RPR_Default.cs index 4c50a35..30bb4f3 100644 --- a/BasicRotations/Melee/RPR_Default.cs +++ b/BasicRotations/Melee/RPR_Default.cs @@ -148,7 +148,6 @@ protected override bool GeneralGCD(out IAction? act) } // 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; @@ -214,7 +213,6 @@ private bool ItsGluttonyTime(out IAction? act) } // 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;