update

44451516 · Aug 4, 2024 · 3f14922 · 3f14922
1 parent 9f29a8c
commit 3f14922
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/XIVSlothComboX/Combos/PvE/MCH.cs b/XIVSlothComboX/Combos/PvE/MCH.cs
@@ -375,6 +375,7 @@ private static bool ReassembledTools(ref uint actionID, MCHGauge gauge)
                 else
                 {
                     钻头是否可以使用 = GetCooldownRemainingTime(钻头Drill) - GetCooldownRemainingTime(SplitShot) <= 0;
+
                 }
 
 

diff --git a/XIVSlothComboX/Extensions/UIntExtensions.cs b/XIVSlothComboX/Extensions/UIntExtensions.cs
@@ -27,6 +27,16 @@ internal static bool GCDActionReady(this uint value)
             {
                 return true;
             }
+
+            if (CustomComboFunctions.GetMaxCharges(value) > 1)
+            {
+                if (cooldownRemainingTime - gcdCooldownRemainingTime <= CustomComboFunctions.GetCooldown(value).单次计时器 + 0.5f)
+                {
+                    return true;
+                }
+            }
+
+
             return false;
         }
 

diff --git a/XIVSlothComboX/Window/Tabs/Debug.cs b/XIVSlothComboX/Window/Tabs/Debug.cs
@@ -186,20 +186,22 @@ internal class DebugCombo : CustomCombo
 
                     bool 用bool = MCH.Config.MCH_ST_Reassembled[3]  && 钻头是否可以用bool;
 
-                    ImGui.TextUnformatted($"钻头是否可以用: {钻头是否可以用}");
                     ImGui.TextUnformatted($"钻头是否可以用<20f: {钻头是否可以用bool}");
 
                     ImGui.TextUnformatted($"MCH_ST_Adv_Reassemble: {CustomComboFunctions.IsEnabled(CustomComboPreset.MCH_ST_Adv_Reassemble)}");
                     ImGui.TextUnformatted($"GetRemainingCharges 整备Reassemble: { CustomComboFunctions.GetRemainingCharges(MCH.整备Reassemble) > MCH.Config.MCH_ST_ReassemblePool}");
                     ImGui.TextUnformatted($"GetRemainingCharges 整备Reassemble: { CustomComboFunctions.GetRemainingCharges(MCH.整备Reassemble) }");
                     ImGui.TextUnformatted($"MCH_ST_ReassemblePool: {  MCH.Config.MCH_ST_ReassemblePool+""}");
 
-                    ImGui.TextUnformatted($"白盾倒计时GetMaxCharges: { CustomComboFunctions.GetMaxCharges(WHM.DivineBenison)}");
-                    ImGui.TextUnformatted($"白盾倒计时CooldownTotal: { CustomComboFunctions.GetCooldown(WHM.DivineBenison).CooldownTotal}");
-                    ImGui.TextUnformatted($"白盾倒计时CooldownRemaining: { CustomComboFunctions.GetCooldown(WHM.DivineBenison).CooldownRemaining}");
-                    ImGui.TextUnformatted($"白盾倒计时CooldownElapsed: { CustomComboFunctions.GetCooldown(WHM.DivineBenison).CooldownElapsed}");
-                    ImGui.TextUnformatted($"白盾倒计时ChargeCooldownRemaining: { CustomComboFunctions.GetCooldown(WHM.DivineBenison).ChargeCooldownRemaining}");
-                    ImGui.TextUnformatted($"白盾倒计时单次计时器: { CustomComboFunctions.GetCooldown(WHM.DivineBenison).单次计时器}");
+                    ImGui.TextUnformatted($"白盾倒计时GetMaxCharges: { CustomComboFunctions.GetMaxCharges(MCH.钻头Drill)}");
+                    ImGui.TextUnformatted($"白盾倒计时CooldownTotal: { CustomComboFunctions.GetCooldown(MCH.钻头Drill).CooldownTotal}");
+                    ImGui.TextUnformatted($"白盾倒计时CooldownRemaining: { CustomComboFunctions.GetCooldown(MCH.钻头Drill).CooldownRemaining}");
+                    ImGui.TextUnformatted($"白盾倒计时CooldownElapsed: { CustomComboFunctions.GetCooldown(MCH.钻头Drill).CooldownElapsed}");
+                    ImGui.TextUnformatted($"白盾倒计时ChargeCooldownRemaining: { CustomComboFunctions.GetCooldown(MCH.钻头Drill).ChargeCooldownRemaining}");
+                    ImGui.TextUnformatted($"白盾倒计时单次计时器: { CustomComboFunctions.GetCooldown(MCH.钻头Drill).单次计时器}");
+                    ImGui.TextUnformatted($"钻头是否可以用: {钻头是否可以用}");
+                    
+                    
                     // ImGui.TextUnformatted($"白盾倒计时: { CustomComboFunctions.GetCooldown(WHM.DivineBenison).ChargeCooldownRemaining}");
                     
                     // ImGui.TextUnformatted($"CleanShot_GetCooldownRemainingTime : {CustomComboFunctions.GetCooldownRemainingTime(MCH.CleanShot) }");