Fix Earthy Star instant pops

PunishXIV · Jan 22, 2025 · 62b4a59 · 62b4a59
1 parent 5cdd957
commit 62b4a59
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/WrathCombo/Combos/PvE/AST/AST.cs b/WrathCombo/Combos/PvE/AST/AST.cs
@@ -112,6 +112,7 @@ Gauge.DrawnCards[0] is not CardType.NONE &&
 
                 //Earthly Star
                 if (IsEnabled(CustomComboPreset.AST_ST_DPS_EarthlyStar) &&
+                    !HasEffect(Buffs.EarthlyDominance) &&
                     ActionReady(EarthlyStar) &&
                     CanSpellWeave())
                     return EarthlyStar;
@@ -216,6 +217,7 @@ Gauge.DrawnCards[0] is not CardType.NONE &&
                 return Divination;
             //Earthly Star
             if (IsEnabled(CustomComboPreset.AST_AOE_DPS_EarthlyStar) && !IsMoving() &&
+                !HasEffect(Buffs.EarthlyDominance) &&
                 ActionReady(EarthlyStar) &&
                 CanSpellWeave())
                 return EarthlyStar;

diff --git a/WrathCombo/Combos/PvE/AST/AST_Helper.cs b/WrathCombo/Combos/PvE/AST/AST_Helper.cs
@@ -112,7 +112,8 @@ internal const ushort
             Lightspeed = 841,
             SelfSynastry = 845,
             TargetSynastry = 846,
-            Divining = 3893;
+            Divining = 3893,
+            EarthlyDominance = 1224;
     }
 
     internal static class Debuffs

diff --git a/WrathCombo/Window/Tabs/Debug.cs b/WrathCombo/Window/Tabs/Debug.cs
@@ -16,17 +16,16 @@
 using Lumina.Excel.Sheets;
 using System;
 using System.Linq;
+using WrathCombo.AutoRotation;
 using WrathCombo.CustomComboNS;
 using WrathCombo.Data;
-using WrathCombo.Services;
 using WrathCombo.Extensions;
+using WrathCombo.Services;
+using WrathCombo.Services.IPC;
 using static WrathCombo.CustomComboNS.Functions.CustomComboFunctions;
 using Action = Lumina.Excel.Sheets.Action;
 using ObjectKind = Dalamud.Game.ClientState.Objects.Enums.ObjectKind;
 using Status = Dalamud.Game.ClientState.Statuses.Status;
-using ECommons;
-using WrathCombo.Services.IPC;
-using WrathCombo.AutoRotation;
 
 namespace WrathCombo.Window.Tabs
 {
@@ -66,35 +65,24 @@ static void CustomStyleText(string label, object? value)
                 {
                     foreach (Status? status in LocalPlayer.StatusList)
                     {
-                        // Null Check (Source Name)
-                        if (status.SourceObject is not null)
-                        {
-                            ImGui.TextUnformatted($"{status.SourceObject.Name} ->");
-                            ImGui.SameLine(0, 4f);
-                        }
-
-                        // Null Check (Status Name)
-                        if (!string.IsNullOrEmpty(ActionWatching.GetStatusName(status.StatusId)))
-                        {
-                            CustomStyleText(ActionWatching.GetStatusName(status.StatusId) + ":", $"{status.StatusId} P: {status.Param}");
-                        }
-                        else CustomStyleText("", status.StatusId);
-
-                        // Duration + Blacklist Check
                         float buffDuration = GetBuffRemainingTime((ushort)status.StatusId, false);
+                        string formattedDuration = "";
                         if (buffDuration != 0 && !statusBlacklist.Contains(status.StatusId))
                         {
-                            string formattedDuration;
                             if (buffDuration >= 60)
                             {
                                 int minutes = (int)(buffDuration / 60);
                                 formattedDuration = $"{minutes}m";
                             }
                             else formattedDuration = $"{buffDuration:F1}s";
+                        }
 
-                            ImGui.SameLine(0, 4f);
-                            CustomStyleText("", $"({formattedDuration})");
+                        // Null Check (Status Name)
+                        if (!string.IsNullOrEmpty(ActionWatching.GetStatusName(status.StatusId)))
+                        {
+                            CustomStyleText(ActionWatching.GetStatusName(status.StatusId) + ":", $"{status.StatusId} P: {status.Param}, {formattedDuration}");
                         }
+                        else CustomStyleText("", status.StatusId);
                     }
                 }