From e737edace299780491271ad8f9d2b7f63ada3f5e Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Thu, 11 Jul 2024 08:51:19 -0600 Subject: [PATCH 1/3] Support Action Change disabling on Salted Earth --- XIVSlothCombo/Combos/PvE/DRK.cs | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/XIVSlothCombo/Combos/PvE/DRK.cs b/XIVSlothCombo/Combos/PvE/DRK.cs index 0f940c0b7..53d873226 100644 --- a/XIVSlothCombo/Combos/PvE/DRK.cs +++ b/XIVSlothCombo/Combos/PvE/DRK.cs @@ -191,15 +191,17 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsEnabled(CustomComboPreset.DRK_ST_CDs)) { // Salted Earth - if (IsEnabled(CustomComboPreset.DRK_ST_CDs_SaltedEarth) - && (ActionReady(SaltedEarth) || ActionReady(SaltAndDarkness))) + if (IsEnabled(CustomComboPreset.DRK_ST_CDs_SaltedEarth)) { + // Cast Salted Earth if (!HasEffect(Buffs.SaltedEarth) - && ActionReady(SaltedEarth) // Cast Salted Earth - || (HasEffect(Buffs.SaltedEarth) - && GetBuffRemainingTime(Buffs.SaltedEarth) < 9 - && ActionReady(SaltAndDarkness))) //Cast Salt and Darkness - return OriginalHook(SaltedEarth); + && ActionReady(SaltedEarth)) + return SaltedEarth; + //Cast Salt and Darkness + if (HasEffect(Buffs.SaltedEarth) + && GetBuffRemainingTime(Buffs.SaltedEarth) < 9 + && ActionReady(SaltAndDarkness)) + return OriginalHook(SaltAndDarkness); } // Shadowbringer @@ -338,15 +340,17 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (gauge.DarksideTimeRemaining > 1) { // Salted Earth - if (IsEnabled(CustomComboPreset.DRK_AoE_CDs_SaltedEarth) - && (ActionReady(SaltedEarth) || ActionReady(SaltAndDarkness))) + if (IsEnabled(CustomComboPreset.DRK_AoE_CDs_SaltedEarth)) { + // Cast Salted Earth if (!HasEffect(Buffs.SaltedEarth) - && ActionReady(SaltedEarth) // Cast Salted Earth - || (HasEffect(Buffs.SaltedEarth) - && GetBuffRemainingTime(Buffs.SaltedEarth) < 9 - && ActionReady(SaltAndDarkness))) //Cast Salt and Darkness - return OriginalHook(SaltedEarth); + && ActionReady(SaltedEarth)) + return SaltedEarth; + //Cast Salt and Darkness + if (HasEffect(Buffs.SaltedEarth) + && GetBuffRemainingTime(Buffs.SaltedEarth) < 9 + && ActionReady(SaltAndDarkness)) + return OriginalHook(SaltAndDarkness); } // Shadowbringer From 2cb0c338a0e87d39e952ff0818186c44bc9ef5af Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Thu, 11 Jul 2024 09:11:02 -0600 Subject: [PATCH 2/3] Support Blood Weapon casting at lower levels --- XIVSlothCombo/Combos/PvE/DRK.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/XIVSlothCombo/Combos/PvE/DRK.cs b/XIVSlothCombo/Combos/PvE/DRK.cs index 53d873226..59b919654 100644 --- a/XIVSlothCombo/Combos/PvE/DRK.cs +++ b/XIVSlothCombo/Combos/PvE/DRK.cs @@ -43,6 +43,7 @@ public const uint Impalement = 36931, // Under Delirium // Buffing oGCDs + BloodWeapon = 3625, Delirium = 7390, // Burst Window @@ -184,9 +185,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim // Delirium if (IsEnabled(CustomComboPreset.DRK_ST_Delirium) - && IsOffCooldown(Delirium) - && LevelChecked(Delirium)) - return Delirium; + && IsOffCooldown(BloodWeapon) + && LevelChecked(BloodWeapon)) + return OriginalHook(Delirium); if (IsEnabled(CustomComboPreset.DRK_ST_CDs)) { @@ -333,9 +334,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim // Delirium if (IsEnabled(CustomComboPreset.DRK_AoE_Delirium) - && IsOffCooldown(Delirium) - && LevelChecked(Delirium)) - return Delirium; + && IsOffCooldown(BloodWeapon) + && LevelChecked(BloodWeapon)) + return OriginalHook(Delirium); if (gauge.DarksideTimeRemaining > 1) { From 58df150cb403b0bf6960dea0589c0cdcee39bc85 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Thu, 11 Jul 2024 09:12:21 -0600 Subject: [PATCH 3/3] Clarify what option controls lower level DRK Blood Weapon usage --- XIVSlothCombo/Combos/CustomComboPreset.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs index 3ea89a231..26fef0395 100644 --- a/XIVSlothCombo/Combos/CustomComboPreset.cs +++ b/XIVSlothCombo/Combos/CustomComboPreset.cs @@ -1014,7 +1014,7 @@ public enum CustomComboPreset #region Buff Options [ParentCombo(DRK_ST_Combo)] - [CustomComboInfo("Delirium on Cooldown", "Adds Delirium to main combo on cooldown and when Darkside is up. Will also spend 50 blood gauge if Delirium is nearly ready to protect from overcap.", DRK.JobID)] + [CustomComboInfo("Delirium on Cooldown", "Adds Delirium (or Blood Weapon at lower levels) to main combo on cooldown and when Darkside is up. Will also spend 50 blood gauge if Delirium is nearly ready to protect from overcap.", DRK.JobID)] DRK_ST_Delirium = 5002, [ParentCombo(DRK_ST_Delirium)] @@ -1105,7 +1105,7 @@ public enum CustomComboPreset #region Buff Options [ParentCombo(DRK_AoE_Combo)] - [CustomComboInfo("Delirium Option", "Adds Delirium to AoE combo on cooldown and when Darkside is up.", DRK.JobID)] + [CustomComboInfo("Delirium Option", "Adds Delirium (or Blood Weapon at lower levels) to AoE combo on cooldown and when Darkside is up.", DRK.JobID)] DRK_AoE_Delirium = 5017, [ParentCombo(DRK_AoE_Delirium)]