3.0.19.5 -> 无脑模式_伶俐防止溢出

44451516 · Mar 13, 2024 · 115e44b · 115e44b
1 parent c485f29
commit 115e44b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/XIVSlothComboX/Combos/CustomComboPreset.cs b/XIVSlothComboX/Combos/CustomComboPreset.cs
@@ -794,6 +794,10 @@ public enum CustomComboPreset
         [CustomComboInfo("无脑模式_进攻之探戈", "Includes Flourish in the rotation.", DNC.JobID, 2, "", "")]
         DNC_DT_Simple_Devilment = 4090,
 
+
+        [ParentCombo(DNC_DT_Simple_SaberDance)]
+        [CustomComboInfo("无脑模式_伶俐防止溢出[测试中]", "大舞快好的时候并且伶俐>=70的时候放剑舞。", DNC.JobID, 2, "", "")]
+        DNC_DT_Simple_SaberDance_1 = 4082,
         #endregion
 
         #region Single Target Multibutton

diff --git a/XIVSlothComboX/Combos/PvE/DNC.cs b/XIVSlothComboX/Combos/PvE/DNC.cs
@@ -686,10 +686,20 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
                     // Simple DT Tech (activates dance with no target, or when target is over HP% threshold)
                     if (IsEnabled(CustomComboPreset.DNC_DT_Simple_TS) && technicalStepReady && !HasEffect(Buffs.标准舞步StandardStep))
+                    {
                         return 技巧舞步TechnicalStep;
+                    }
 
                     if (LevelChecked(剑舞SaberDance) && IsEnabled(CustomComboPreset.DNC_DT_Simple_SaberDance))
                     {
+                        if (IsEnabled(CustomComboPreset.DNC_DT_Simple_SaberDance_1))
+                        {
+                            if (gauge.Esprit >= 70 && 剑舞SaberDance.GCDActionPreReady(技巧舞步TechnicalStep))
+                            {
+                                return 剑舞SaberDance;
+                            }
+                        }
+
                         if ((gauge.Esprit >= 85 || (techBurst && gauge.Esprit >= 50)))
                         {
                             return 剑舞SaberDance;

diff --git a/XIVSlothComboX/XIVSlothComboX.csproj b/XIVSlothComboX/XIVSlothComboX.csproj
@@ -4,7 +4,7 @@
 	<PropertyGroup>
 		<Authors>Aki, k-kz, ele-starshade, damolitionn, Taurenkey, Augporto, grimgal, Genesis-Nova, Tartarga</Authors>
 		<Company>-</Company>
-		<Version>3.0.19.4</Version>
+		<Version>3.0.19.5</Version>
 		<!-- This is the version that will be used when pushing to the repo.-->
 		<Description>XIVCombo for lazy players</Description>
 		<Copyright>Copyleft attick 2021 thanks attick UwU</Copyright>

diff --git a/release/XIVSlothComboX/latest.zip b/release/XIVSlothComboX/latest.zip
diff --git a/release/pluginmaster.json b/release/pluginmaster.json
@@ -5,8 +5,8 @@
     "Punchline": "Condenses combos and mutually exclusive abilities onto a single button - and then some.",
     "Description": "Condenses combos and mutually exclusive abilities onto a single button - and then some.",
     "InternalName": "XIVSlothComboX",
-    "AssemblyVersion": "3.0.19.4",
-    "Changelog": "FIX MCH GCD BUG",
+    "AssemblyVersion": "3.0.19.5",
+    "Changelog": "Update DNC 无脑模式_伶俐防止溢出",
     "RepoUrl": "https://github.com/44451516/XIVSlothCombo/",
     "ApplicableVersion": "any",
     "DalamudApiLevel": 9,