ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-01 05:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BOTD and Stardiver are mutually exclusive.

Browse source
This commit is contained in:
attickdoor 2019-12-21 04:32:49 -05:00
parent d6d2732191
commit cd238c910b
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Configuration/CustomComboPreset.cs
View file

@ -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,

14
Dalamud/Game/Internal/Gui/IconReplacer.cs
View file

@ -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<DRGGauge>().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) {