From 5d50d4d01c7a035e4b72ecabb2887bba58a2b63f Mon Sep 17 00:00:00 2001 From: plidev Date: Sat, 6 Jul 2024 05:01:42 +0200 Subject: [PATCH 1/2] [FEATURE] RDM - Grand Impact deprioritize for verprocs --- XIVComboExpanded/Combos/RDM.cs | 4 ++-- XIVComboExpanded/CustomComboPreset.cs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/XIVComboExpanded/Combos/RDM.cs b/XIVComboExpanded/Combos/RDM.cs index 46b54e6f..ede77398 100644 --- a/XIVComboExpanded/Combos/RDM.cs +++ b/XIVComboExpanded/Combos/RDM.cs @@ -303,7 +303,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsEnabled(CustomComboPreset.RedMageVerprocFeature)) { - if (HasEffect(RDM.Buffs.GrandImpactReady)) + if (!IsEnabled(CustomComboPreset.RedMageVerprocGrandImpactDeprioritize) && HasEffect(RDM.Buffs.GrandImpactReady)) return RDM.GrandImpact; if (HasEffect(RDM.Buffs.VerstoneReady)) @@ -355,7 +355,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsEnabled(CustomComboPreset.RedMageVerprocFeature)) { - if (HasEffect(RDM.Buffs.GrandImpactReady)) + if (!IsEnabled(CustomComboPreset.RedMageVerprocGrandImpactDeprioritize) && HasEffect(RDM.Buffs.GrandImpactReady)) return RDM.GrandImpact; if (HasEffect(RDM.Buffs.VerfireReady)) diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs index 2b09c093..0df2a105 100644 --- a/XIVComboExpanded/CustomComboPreset.cs +++ b/XIVComboExpanded/CustomComboPreset.cs @@ -831,6 +831,10 @@ public enum CustomComboPreset [CustomComboInfo("Verstone/Verfire Feature", "Replace Verstone/Verfire with Jolt when no proc is available.", RDM.JobID)] RedMageVerprocFeature = 3504, + [ParentCombo(RedMageVerprocFeature)] + [CustomComboInfo("Deprioritize Grand Impact", "After using Acceleration, prioritize using Verstone/Verfire over Grand Impact if both buffs are active.", RDM.JobID)] + RedMageVerprocGrandImpactDeprioritize = 3519, + [CustomComboInfo("Verstone/Verfire Plus Feature", "Replace Verstone/Verfire with Veraero/Verthunder when various instant-cast effects are active.", RDM.JobID)] RedMageVerprocPlusFeature = 3505, From ecab61ef031d5ddaddcb7729ce8b75331b8717ac Mon Sep 17 00:00:00 2001 From: plidev Date: Sat, 6 Jul 2024 05:31:35 +0200 Subject: [PATCH 2/2] RDM: Fix acceleration to grand impact when swiftcast feature is disabled --- XIVComboExpanded/Combos/RDM.cs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/XIVComboExpanded/Combos/RDM.cs b/XIVComboExpanded/Combos/RDM.cs index ede77398..aa0f2578 100644 --- a/XIVComboExpanded/Combos/RDM.cs +++ b/XIVComboExpanded/Combos/RDM.cs @@ -372,7 +372,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim internal class RedMageAcceleration : CustomCombo { - protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.RedMageAccelerationSwiftcastFeature; + protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.RdmAny; protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) { @@ -383,17 +383,20 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsEnabled(CustomComboPreset.RedMageAccelerationGrandImpactFeature) && HasEffect(RDM.Buffs.GrandImpactReady)) return RDM.GrandImpact; - if (IsEnabled(CustomComboPreset.RedMageAccelerationSwiftcastOption)) + if (IsEnabled(CustomComboPreset.RedMageAccelerationSwiftcastFeature)) { - if (IsOffCooldown(RDM.Acceleration) && IsOffCooldown(ADV.Swiftcast)) - return ADV.Swiftcast; - } + if (IsEnabled(CustomComboPreset.RedMageAccelerationSwiftcastOption)) + { + if (IsOffCooldown(RDM.Acceleration) && IsOffCooldown(ADV.Swiftcast)) + return ADV.Swiftcast; + } - if (IsOffCooldown(RDM.Acceleration)) - return RDM.Acceleration; + if (IsOffCooldown(RDM.Acceleration)) + return RDM.Acceleration; - if (IsOffCooldown(ADV.Swiftcast)) - return ADV.Swiftcast; + if (IsOffCooldown(ADV.Swiftcast)) + return ADV.Swiftcast; + } return RDM.Acceleration; }