From cd238c910baea5893daac742217f407b000a38b5 Mon Sep 17 00:00:00 2001 From: attickdoor Date: Sat, 21 Dec 2019 04:32:49 -0500 Subject: [PATCH] BOTD and Stardiver are mutually exclusive. --- Dalamud/Configuration/CustomComboPreset.cs | 5 ++++- Dalamud/Game/Internal/Gui/IconReplacer.cs | 14 +++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Dalamud/Configuration/CustomComboPreset.cs b/Dalamud/Configuration/CustomComboPreset.cs index b73ef6277..027343230 100644 --- a/Dalamud/Configuration/CustomComboPreset.cs +++ b/Dalamud/Configuration/CustomComboPreset.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace XIVLauncher.Dalamud { - //CURRENT HIGHEST FLAG IS 45 + //CURRENT HIGHEST FLAG IS 46 [Flags] public enum CustomComboPreset : long { @@ -17,6 +17,9 @@ namespace XIVLauncher.Dalamud [CustomComboInfo("Jump + Mirage Dive", "Replace Jump with Mirage Dive when Dive Ready", 22)] DragoonJumpFeature = 1L << 44, + [CustomComboInfo("BOTD Into Stardiver", "Replace Blood of the Dragon with Stardiver when in Life of the Dragon", 22)] + DragoonBOTDFeature = 1L << 46, + [CustomComboInfo("Coerthan Torment Combo", "Replace Coerthan Torment with its combo chain", 22)] DragoonCoerthanTormentCombo = 1L << 0, diff --git a/Dalamud/Game/Internal/Gui/IconReplacer.cs b/Dalamud/Game/Internal/Gui/IconReplacer.cs index abd26bdfb..40f482d26 100644 --- a/Dalamud/Game/Internal/Gui/IconReplacer.cs +++ b/Dalamud/Game/Internal/Gui/IconReplacer.cs @@ -110,7 +110,7 @@ namespace Dalamud.Game.Internal.Gui { // Change Jump/High Jump into Mirage Dive when Dive Ready if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DragoonJumpFeature)) { - if(actionID == 92) { + if (actionID == 92) { if (SearchBuffArray(1243)) { return 7399; } @@ -119,6 +119,18 @@ namespace Dalamud.Game.Internal.Gui { } } + // Change Blood of the Dragon into Stardiver when in Life of the Dragon + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DragoonBOTDFeature)) { + if (actionID == 3553) { + if (level >= 80) { + if (this.dalamud.ClientState.JobGauges.Get().BOTDState == BOTDState.LOTD) { + return 16480; + } + } + return 3553; + } + } + // Replace Coerthan Torment with Coerthan Torment combo chain if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DragoonCoerthanTormentCombo)) { if (actionID == 16477) {