From 1858f35cc3e4f775066a9fbf4315bac98e1b8d95 Mon Sep 17 00:00:00 2001 From: Khayle Date: Tue, 2 Jul 2024 02:13:33 +0200 Subject: [PATCH] [PUSH] 1.5.0.1 - BLM & DNC updates -removed broken BLM combos -fix DNC Last Dance -version bump --- XIVComboExpanded/Combos/BLM.cs | 22 ++-------------------- XIVComboExpanded/Combos/DNC.cs | 2 +- XIVComboExpanded/CustomComboPreset.cs | 15 --------------- XIVComboExpanded/XIVComboExpanded.csproj | 2 +- 4 files changed, 4 insertions(+), 37 deletions(-) diff --git a/XIVComboExpanded/Combos/BLM.cs b/XIVComboExpanded/Combos/BLM.cs index eca37cf83..d08491cf3 100644 --- a/XIVComboExpanded/Combos/BLM.cs +++ b/XIVComboExpanded/Combos/BLM.cs @@ -240,7 +240,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim { if (level >= BLM.Levels.Paradox && gauge.IsParadoxActive) { - if (gauge.InUmbralIce || (!IsEnabled(CustomComboPreset.BlackBlizzardParadoxOption) && LocalPlayer?.CurrentMp >= 1600)) + if (gauge.InUmbralIce || LocalPlayer?.CurrentMp >= 1600) return BLM.Paradox; } @@ -308,25 +308,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (level >= BLM.Levels.Flare && gauge.InAstralFire) { - // Lv 50 rotation without Umbral Hearts - if (LocalPlayer?.CurrentMp < BLM.MpCosts.Fire2 + BLM.MpCosts.Flare) - return BLM.Flare; - - // Standard AoE rotation Fire2 until 1 Umbral Heart, followed by 2 Flare - if (gauge.UmbralHearts == 1 || (gauge.UmbralHearts == 0 && HasEffect(BLM.Buffs.EnhancedFlare))) - return BLM.Flare; - - if (IsEnabled(CustomComboPreset.BlackFire2TriplecastOption)) - { - int triplecasts = FindEffect(BLM.Buffs.Triplecast)?.StackCount ?? 0; - - // (Umbral Ice) Fire2 -> Triplecast -> Fire2 -> Swiftcast -> Flare -> Flare -> Manafont -> Flare - if (gauge.UmbralHearts > 0 && triplecasts == 2) - return BLM.Flare; - - if (triplecasts == 1) - return BLM.Flare; - } + return BLM.Flare; } } diff --git a/XIVComboExpanded/Combos/DNC.cs b/XIVComboExpanded/Combos/DNC.cs index bd7f1ae8e..60869b09e 100644 --- a/XIVComboExpanded/Combos/DNC.cs +++ b/XIVComboExpanded/Combos/DNC.cs @@ -320,7 +320,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim { if (actionID == DNC.StandardStep) { - if (level >= DNC.Levels.LastDance) + if (level >= DNC.Levels.LastDance && HasEffect(DNC.Buffs.LastDanceReady)) { if (IsEnabled(CustomComboPreset.DancerFinishingMovePriorityFeature) && HasEffect(DNC.Buffs.FinishingMoveReady) && level >= DNC.Levels.FinishingMove) { diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs index d472c5c5d..7959e558d 100644 --- a/XIVComboExpanded/CustomComboPreset.cs +++ b/XIVComboExpanded/CustomComboPreset.cs @@ -168,20 +168,12 @@ public enum CustomComboPreset [CustomComboInfo("Blizzard 1/3 Feature", "Replace Blizzard 1 with Blizzard 3 when unlocked and becomes Paradox when available.", BLM.JobID)] BlackBlizzardFeature = 2505, - [ParentCombo(BlackBlizzardFeature)] - [CustomComboInfo("Paradox only during Umbral Ice", "Only replace Blizzard with Paradox during Umbral Ice.", BLM.JobID)] - BlackBlizzardParadoxOption = 2521, - [CustomComboInfo("Freeze/Flare Feature", "Freeze and Flare become whichever action you can currently use.", BLM.JobID)] BlackFreezeFlareFeature = 2506, [CustomComboInfo("Fire 2 Feature", "(High) Fire 2 becomes Flare in Astral Fire when only 1 Umbral Heart is active, less than 3000 mp, or during Enhanced Flare.", BLM.JobID)] BlackFire2Feature = 2508, - [ParentCombo(BlackFire2Feature)] - [CustomComboInfo("Fire 2 Triplecast Option", "Shorten rotation when Triplecast is active to make both Flare casts instant.", BLM.JobID)] - BlackFire2TriplecastOption = 2523, - [CustomComboInfo("Ice 2 Feature", "(High) Blizzard 2 becomes Freeze in Umbral Ice.", BLM.JobID)] BlackBlizzard2Feature = 2509, @@ -194,13 +186,6 @@ public enum CustomComboPreset [CustomComboInfo("Scathe/Xenoglossy Feature", "Scathe becomes Xenoglossy when available.", BLM.JobID)] BlackScatheFeature = 2507, - //[CustomComboInfo("Thunder 3/4 to Sharpcast", "Thunder 3 and Thunder 4 become Sharpcast when available.", BLM.JobID)] - //BlackThunderFeature = 2519, - - //[ParentCombo(BlackThunderFeature)] - //[CustomComboInfo("Delay replacement after casting Thunder", "Delay changing Thunder into Sharpcast immediately after casting Thunder.", BLM.JobID)] - //BlackThunderDelayOption = 2520, - #endregion // ==================================================================================== #region BARD diff --git a/XIVComboExpanded/XIVComboExpanded.csproj b/XIVComboExpanded/XIVComboExpanded.csproj index a5bc6cb41..d50483227 100644 --- a/XIVComboExpanded/XIVComboExpanded.csproj +++ b/XIVComboExpanded/XIVComboExpanded.csproj @@ -3,7 +3,7 @@ attick, daemitus - - 1.5.0.0 + 1.5.0.1 This plugin condenses combos and mutually exclusive abilities onto a single button. Copyleft attick 2020 baybeeee https://github.com/daemitus/XIVComboPlugin