Minor fix for DNC alt-dance combos

The dance step combo now also becomes Tillana on both buttons if Standard Step's cooldown has at least two seconds, so it won't clip and drift. If the Alternate Dance: Technical Step combo is not enabled, Tech Step will become Tillana as normal. Even with neither alt-dance combo active, Standard Step will become Tillana when it has at least two seconds of cooldown left. If the Alternate Dance: Technical Step combo IS enabled, Tillana will ONLY be accessible when Standard Step has at least two seconds of cooldown remaining.
PrincessRTFM · Mar 30, 2024 · 372fa0c · 372fa0c
1 parent c72d5d7
commit 372fa0c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/XIVComboVX/Combos/DNC.cs b/XIVComboVX/Combos/DNC.cs
@@ -146,10 +146,13 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
 		if (level >= DNC.Levels.TechnicalStep) {
 
+			if (SelfHasEffect(DNC.Buffs.FlourishingFinish) && GetCooldown(DNC.StandardStep).CooldownRemaining >= 2)
+				return DNC.Tillana;
+
 			if (IsEnabled(CustomComboPreset.DancerDanceStepComboSmartStandard) && CanUse(DNC.TechnicalStep) && GetCooldown(DNC.StandardStep).CooldownRemaining > 3)
 				return DNC.TechnicalStep;
 
-			if (IsEnabled(CustomComboPreset.DancerDanceStepComboSmartTechnical) && !CanUse(DNC.TechnicalStep))
+			if (IsEnabled(CustomComboPreset.DancerDanceStepComboSmartTechnical) && !CanUse(DNC.TechnicalStep) && CanUse(DNC.StandardStep))
 				return DNC.StandardStep;
 
 		}

diff --git a/XIVComboVX/CustomComboPreset.cs b/XIVComboVX/CustomComboPreset.cs
@@ -265,11 +265,11 @@ public enum CustomComboPreset {
 	DancerDanceStepCombo = 3805,
 
 	[ParentPreset(DancerDanceStepCombo)]
-	[CustomComboInfo("Smart Dance: Standard Step", "Also change Standard Step into Technical Step when ready and Standard Step's cooldown has more than 3 seconds left.", DNC.JobID)]
+	[CustomComboInfo("Alternative Dance: Standard Step", "Also change Standard Step into Technical Step when ready and Standard Step's cooldown has more than 3 seconds left.", DNC.JobID)]
 	DancerDanceStepComboSmartStandard = 3824,
 
 	[ParentPreset(DancerDanceStepCombo)]
-	[CustomComboInfo("Smart Dance: Technical Step", "Also change Technical Step into Standard Step when Technical Step is unavailable or on cooldown.", DNC.JobID)]
+	[CustomComboInfo("Alternative Dance: Technical Step", "Also change Technical Step into Standard Step when Technical Step is unavailable or on cooldown.", DNC.JobID)]
 	DancerDanceStepComboSmartTechnical = 3825,
 
 	[ParentPreset(DancerDanceStepCombo)]

diff --git a/XIVComboVX/XIVComboVX.csproj b/XIVComboVX/XIVComboVX.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Product>XIVComboVX</Product>
 		<Authors>attick, daemitus, VariableVixen</Authors>
-		<Version>9.19.0</Version>
+		<Version>9.19.1</Version>
 		<Description>This plugin condenses various abilities onto single buttons.</Description>
 		<PackageProjectUrl>https://github.com/PrincessRTFM/XIVComboPlugin</PackageProjectUrl>
 		<Copyright>Copyleft attick 2020 baybeeee</Copyright>