From b4fad8cf01e5c9bba2b90f9f01471c16457e8c00 Mon Sep 17 00:00:00 2001 From: Emma <153868115+GayPotatoEmma@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:01:26 +0100 Subject: [PATCH 1/5] Add option to replace Emerald Ruin III with Ruin III --- WrathCombo/Combos/CustomComboPreset.cs | 8 ++++++-- WrathCombo/Combos/PvE/SMN/SMN.cs | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/WrathCombo/Combos/CustomComboPreset.cs b/WrathCombo/Combos/CustomComboPreset.cs index ed5ade952..8418a5f87 100644 --- a/WrathCombo/Combos/CustomComboPreset.cs +++ b/WrathCombo/Combos/CustomComboPreset.cs @@ -1,4 +1,4 @@ -using WrathCombo.Attributes; +using WrathCombo.Attributes; using WrathCombo.Combos.PvE; using WrathCombo.Combos.PvP; @@ -4619,7 +4619,11 @@ The three digets after RDM.JobID can be used to reorder items in the list [ParentCombo(SMN_Advanced_Combo_AoE)] [CustomComboInfo("Egi Summons Combo Option", "Adds Egi summons to the AoE combo.\nWill prioritise the Egi selected below.\nIf no option is selected, the feature will default to summoning Titan first.", SMN.JobID, 3)] SMN_DemiEgiMenu_EgiOrder_AoE = 17065, - + + [ParentCombo(SMN_Advanced_Combo)] + [CustomComboInfo("Use Ruin III instead of Emerald Ruin III", "Replaces Emerald Ruin III with Ruin III in the rotation. Only useful below level 72 when your Recast Time is below 2.5s.", SMN.JobID, 15)] + SMN_ST_Ruin3_Emerald_Ruin3 = 17067, + #endregion #region VIPER diff --git a/WrathCombo/Combos/PvE/SMN/SMN.cs b/WrathCombo/Combos/PvE/SMN/SMN.cs index 7d50177ec..06e1028b8 100644 --- a/WrathCombo/Combos/PvE/SMN/SMN.cs +++ b/WrathCombo/Combos/PvE/SMN/SMN.cs @@ -574,6 +574,15 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } } } + if (IsGarudaAttuned) + { + // Use Ruin III instead of Emerald Ruin III + if (IsEnabled(CustomComboPreset.SMN_ST_Ruin3_Emerald_Ruin3)) + { + if (OriginalHook(Gemshine) is EmeralRuin1 or EmeralRuin2) return OriginalHook(Gemshine); + return Ruin3; + } + } if (IsEnabled(CustomComboPreset.SMN_SearingFlash) && HasEffect(Buffs.RubysGlimmer) && LevelChecked(SearingFlash)) return SearingFlash; From 277d0ede0c541126c5bcf1644fafad15b6ae674d Mon Sep 17 00:00:00 2001 From: Emma <153868115+GayPotatoEmma@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:53:16 +0100 Subject: [PATCH 2/5] Fix Emerald Rite being overwritten by Ruin III --- WrathCombo/Combos/PvE/SMN/SMN.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WrathCombo/Combos/PvE/SMN/SMN.cs b/WrathCombo/Combos/PvE/SMN/SMN.cs index 06e1028b8..5f90cd536 100644 --- a/WrathCombo/Combos/PvE/SMN/SMN.cs +++ b/WrathCombo/Combos/PvE/SMN/SMN.cs @@ -579,7 +579,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim // Use Ruin III instead of Emerald Ruin III if (IsEnabled(CustomComboPreset.SMN_ST_Ruin3_Emerald_Ruin3)) { - if (OriginalHook(Gemshine) is EmeralRuin1 or EmeralRuin2) return OriginalHook(Gemshine); + if (OriginalHook(Gemshine) is EmeralRuin1 or EmeralRuin2 or EmeraldRite) return OriginalHook(Gemshine); return Ruin3; } } From 74185d375b93090fe9fdac6f3c7a55e684838cc3 Mon Sep 17 00:00:00 2001 From: Emma <153868115+GayPotatoEmma@users.noreply.github.com> Date: Tue, 26 Nov 2024 19:08:53 +0100 Subject: [PATCH 3/5] Remove redundant note --- WrathCombo/Combos/CustomComboPreset.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WrathCombo/Combos/CustomComboPreset.cs b/WrathCombo/Combos/CustomComboPreset.cs index 8418a5f87..8b9886df2 100644 --- a/WrathCombo/Combos/CustomComboPreset.cs +++ b/WrathCombo/Combos/CustomComboPreset.cs @@ -4621,7 +4621,7 @@ The three digets after RDM.JobID can be used to reorder items in the list SMN_DemiEgiMenu_EgiOrder_AoE = 17065, [ParentCombo(SMN_Advanced_Combo)] - [CustomComboInfo("Use Ruin III instead of Emerald Ruin III", "Replaces Emerald Ruin III with Ruin III in the rotation. Only useful below level 72 when your Recast Time is below 2.5s.", SMN.JobID, 15)] + [CustomComboInfo("Use Ruin III instead of Emerald Ruin III", "Replaces Emerald Ruin III with Ruin III in the rotation.", SMN.JobID, 15)] SMN_ST_Ruin3_Emerald_Ruin3 = 17067, #endregion From 9a34a24937ce4f6193321695e94049578c3a24d8 Mon Sep 17 00:00:00 2001 From: Genesis <12591123+Genesis-Nova@users.noreply.github.com> Date: Sat, 30 Nov 2024 06:02:07 -0600 Subject: [PATCH 4/5] Adjusted priority. Simply moved the code for this down in priority next to the normal gemshine code to ensure it doesn't take priority over more important things (ogcds, etc) --- WrathCombo/Combos/PvE/SMN/SMN.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/WrathCombo/Combos/PvE/SMN/SMN.cs b/WrathCombo/Combos/PvE/SMN/SMN.cs index 5f90cd536..43e60ceb5 100644 --- a/WrathCombo/Combos/PvE/SMN/SMN.cs +++ b/WrathCombo/Combos/PvE/SMN/SMN.cs @@ -574,15 +574,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } } } - if (IsGarudaAttuned) - { - // Use Ruin III instead of Emerald Ruin III - if (IsEnabled(CustomComboPreset.SMN_ST_Ruin3_Emerald_Ruin3)) - { - if (OriginalHook(Gemshine) is EmeralRuin1 or EmeralRuin2 or EmeraldRite) return OriginalHook(Gemshine); - return Ruin3; - } - } if (IsEnabled(CustomComboPreset.SMN_SearingFlash) && HasEffect(Buffs.RubysGlimmer) && LevelChecked(SearingFlash)) return SearingFlash; @@ -730,6 +721,16 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim (Config.SMN_ST_Egi_AstralFlow[1] && HasEffect(Buffs.IfritsFavor) && Config.SMN_ST_CrimsonCycloneMelee && InMeleeRange())) // Ifrit return OriginalHook(AstralFlow); + if (IsGarudaAttuned) + { + // Use Ruin III instead of Emerald Ruin III + if (IsEnabled(CustomComboPreset.SMN_ST_Ruin3_Emerald_Ruin3)) + { + if (OriginalHook(Gemshine) is EmeralRuin1 or EmeralRuin2 or EmeraldRite) return OriginalHook(Gemshine); + return Ruin3; + } + } + // Gemshine if (IsEnabled(CustomComboPreset.SMN_Advanced_Combo_EgiSummons_Attacks) && (IsGarudaAttuned || IsTitanAttuned || IsIfritAttuned)) return OriginalHook(Gemshine); From c288b2f3b51b8f625e4059d1531ba2c492e3e1da Mon Sep 17 00:00:00 2001 From: Emma <153868115+GayPotatoEmma@users.noreply.github.com> Date: Sun, 1 Dec 2024 00:12:34 +0100 Subject: [PATCH 5/5] update action check logic and description --- WrathCombo/Combos/CustomComboPreset.cs | 2 +- WrathCombo/Combos/PvE/SMN/SMN.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WrathCombo/Combos/CustomComboPreset.cs b/WrathCombo/Combos/CustomComboPreset.cs index 8b9886df2..919117afb 100644 --- a/WrathCombo/Combos/CustomComboPreset.cs +++ b/WrathCombo/Combos/CustomComboPreset.cs @@ -4621,7 +4621,7 @@ The three digets after RDM.JobID can be used to reorder items in the list SMN_DemiEgiMenu_EgiOrder_AoE = 17065, [ParentCombo(SMN_Advanced_Combo)] - [CustomComboInfo("Use Ruin III instead of Emerald Ruin III", "Replaces Emerald Ruin III with Ruin III in the rotation.", SMN.JobID, 15)] + [CustomComboInfo("Use Ruin III instead of Emerald Ruin III", "Replaces Emerald Ruin III with Ruin III in the rotation if Ruin Mastery III is not active.", SMN.JobID, 15)] SMN_ST_Ruin3_Emerald_Ruin3 = 17067, #endregion diff --git a/WrathCombo/Combos/PvE/SMN/SMN.cs b/WrathCombo/Combos/PvE/SMN/SMN.cs index 43e60ceb5..98d429985 100644 --- a/WrathCombo/Combos/PvE/SMN/SMN.cs +++ b/WrathCombo/Combos/PvE/SMN/SMN.cs @@ -723,14 +723,14 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsGarudaAttuned) { - // Use Ruin III instead of Emerald Ruin III - if (IsEnabled(CustomComboPreset.SMN_ST_Ruin3_Emerald_Ruin3)) + // Use Ruin III instead of Emerald Ruin III if enabled and Ruin Mastery III is not active + if (IsEnabled(CustomComboPreset.SMN_ST_Ruin3_Emerald_Ruin3) && !TraitLevelChecked(Traits.RuinMastery3)) { - if (OriginalHook(Gemshine) is EmeralRuin1 or EmeralRuin2 or EmeraldRite) return OriginalHook(Gemshine); + if (gauge.Attunement == 0) return OriginalHook(Gemshine); return Ruin3; } } - + // Gemshine if (IsEnabled(CustomComboPreset.SMN_Advanced_Combo_EgiSummons_Attacks) && (IsGarudaAttuned || IsTitanAttuned || IsIfritAttuned)) return OriginalHook(Gemshine);