Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SMN] Add option to replace Emerald Ruin III with Ruin III #121

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[SMN] Add option to replace Emerald Ruin III with Ruin III #121

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4fad8c
Add option to replace Emerald Ruin III with Ruin III
GayPotatoEmma Nov 25, 2024
277d0ed
Fix Emerald Rite being overwritten by Ruin III
GayPotatoEmma Nov 25, 2024
74185d3
Remove redundant note
GayPotatoEmma Nov 26, 2024
9a34a24
Adjusted priority.
Genesis-Nova Nov 30, 2024
824972e
Merge branch 'PunishXIV:main' into main
GayPotatoEmma Nov 30, 2024
c288b2f
update action check logic and description
GayPotatoEmma Nov 30, 2024
2c543fe
Merge branch 'main' of https://github.com/GayPotatoEmma/WrathCombo
GayPotatoEmma Nov 30, 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
8 changes: 6 additions & 2 deletions WrathCombo/Combos/CustomComboPreset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using WrathCombo.Attributes;
using WrathCombo.Attributes;
using WrathCombo.Combos.PvE;
using WrathCombo.Combos.PvP;

Expand Down Expand Up @@ -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.", SMN.JobID, 15)]
SMN_ST_Ruin3_Emerald_Ruin3 = 17067,

#endregion

#region VIPER
Expand Down
10 changes: 10 additions & 0 deletions WrathCombo/Combos/PvE/SMN/SMN.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,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);
Expand Down