In Combat Only option

Author: Zeffuro

KamiToolKit

@@ -623,6 +623,20 @@ public bool SelfAppliedStatusesOnly
         }
     } = true;
 
+    [JsonProperty]
+    public bool InCombatOnly
+    {
+        get => field;
+        set
+        {
+            if (InCombatOnly != value)
+            {
+                field = value;
+                Notify(nameof(InCombatOnly));
+            }
+        }
+    } = false;
+
     public class NodePartConfig
     {
         public bool IsVisible { get; set; }

StatusTimers/Config/StatusTimerOverlayConfig.cs

@@ -1,6 +1,7 @@
 // File: StatusTimers/Nodes/FunctionalNodes/ColorInputRowNode.cs
 
 using KamiToolKit.Nodes;
+using Lumina.Text.ReadOnly;
 using System;
 
 namespace StatusTimers.Nodes.FunctionalNodes;
@@ -42,10 +43,10 @@ public string Label
         set => _labelNode.String = value;
     }
 
-    public string LabelTooltip
+    public ReadOnlySeString LabelTooltip
     {
-        get => _labelNode.TooltipString;
-        set => _labelNode.TooltipString = value;
+        get => _labelNode.TextTooltip;
+        set => _labelNode.TextTooltip = value;
     }
 
     public int Value

StatusTimers/Nodes/FunctionalNodes/ColorInputRowNode.cs

@@ -32,7 +32,7 @@ public ColorPreviewNode()
         {
             IsVisible = true,
             TexturePath = GetAlphaTexturePath(),
-            WrapMode = WrapMode.Tile,
+            WrapMode = WrapMode.Stretch,
         };
         _alphaLayer.AttachNode(this);
 

StatusTimers/Nodes/FunctionalNodes/ColorPreviewNode.cs

@@ -38,7 +38,7 @@ public StatusFilterButtonGroupNode(Func<StatusTimerOverlayConfig> getConfig, Act
             Height = 30,
             Width = 30,
             IsVisible = true,
-            Tooltip = "Export Filter List",
+            TextTooltip = "Export Filter List",
             TexturePath = Path.Combine(GlobalServices.PluginInterface.AssemblyLocation.Directory?.FullName!, @"Media\Icons\upload.png"),
             OnClick = () => FilterListHelper.TryExportFilterListToClipboard(getConfig().FilterList)
         };
@@ -49,7 +49,7 @@ public StatusFilterButtonGroupNode(Func<StatusTimerOverlayConfig> getConfig, Act
             Height = 30,
             Width = 30,
             IsVisible = true,
-            TooltipString = "     Import Filter List \n(hold shift to confirm)",
+            TextTooltip = "     Import Filter List \n(hold shift to confirm)",
             TexturePath = Path.Combine(GlobalServices.PluginInterface.AssemblyLocation.Directory?.FullName!, @"Media\Icons\download.png"),
             OnClick = () => FilterListHelper.TryImportFilterListFromClipboard(getConfig(), onChanged)
         };

StatusTimers/Nodes/FunctionalNodes/StatusFilterButtonGroupNode.cs

@@ -96,6 +96,12 @@ public FunctionalSectionNode(Func<StatusTimerOverlayConfig> getConfig, NodeKind
             });
         }
 
+        AddNode(new CheckboxOptionNode {
+            String = "Only show when in combat",
+            IsChecked = getConfig().InCombatOnly,
+            OnClick = isChecked => getConfig().InCombatOnly = isChecked
+        });
+
         RecalculateLayout();
     }
 }

StatusTimers/Nodes/LayoutNodes/FunctionalSectionNode.cs

@@ -32,7 +32,7 @@ public ImportExportResetNode(
             Height = 30,
             Width = 30,
             IsVisible = true,
-            Tooltip = " Import Configuration\n(hold shift to confirm)",
+            TextTooltip = " Import Configuration\n(hold shift to confirm)",
             TexturePath = Path.Combine(GlobalServices.PluginInterface.AssemblyLocation.Directory?.FullName!, @"Media\Icons\download.png"),
             OnClick = () => ImportExportResetHelper.TryImportConfigFromClipboard(
                 getOverlay(), getConfig(), onConfigChanged, closeWindow)
@@ -43,7 +43,7 @@ public ImportExportResetNode(
             Height = 30,
             Width = 30,
             IsVisible = true,
-            Tooltip = "Export Configuration",
+            TextTooltip = "Export Configuration",
             TexturePath = Path.Combine(GlobalServices.PluginInterface.AssemblyLocation.Directory?.FullName!, @"Media\Icons\upload.png"),
             OnClick = () => ImportExportResetHelper.TryExportConfigToClipboard(getConfig())
         });
@@ -54,7 +54,7 @@ public ImportExportResetNode(
             Height = 32,
             Width = 100,
             String = "Reset",
-            Tooltip = "   Reset configuration\n(hold button to confirm)",
+            TextTooltip = "   Reset configuration\n(hold button to confirm)",
             OnClick = () => ImportExportResetHelper.TryResetConfig(
                 getConfig(), kind, onConfigChanged, closeWindow)
         });

StatusTimers/Nodes/LayoutNodes/ImportExportResetNode.cs

@@ -25,13 +25,13 @@ public VisualSectionNode(
                 String = "Locked",
                 IsChecked = overlay.IsLocked,
                 OnClick = isChecked => { overlay.IsLocked = isChecked; },
-                Tooltip = "When locked, the overlay cannot be moved or resized."
+                TextTooltip = "When locked, the overlay cannot be moved or resized."
             },
             new CheckboxOptionNode {
                 String = "Preview Mode",
                 IsChecked = overlay.IsPreviewEnabled,
                 OnClick = isChecked => { overlay.IsPreviewEnabled = isChecked; },
-                Tooltip = "When enabled, will show random statuses to test with."
+                TextTooltip = "When enabled, will show random statuses to test with."
             },
             20
         ));

StatusTimers/Nodes/LayoutNodes/VisualSectionNode.cs

@@ -12,6 +12,7 @@ namespace StatusTimers.Services;
 public class Services {
     [PluginService] public static IClientState ClientState { get; private set; } = null!;
     [PluginService] public static ICommandManager CommandManager { get; private set; } = null!;
+    [PluginService] public static ICondition Condition { get; private set; } = null!;
     [PluginService] public static IDalamudPluginInterface PluginInterface { get; private set; } = null!;
     [PluginService] public static IDataManager DataManager { get; private set; } = null!;
     [PluginService] public static IFramework Framework { get; private set; } = null!;

StatusTimers/Services/Services.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Dalamud.Game.ClientState.Conditions;
 
 namespace StatusTimers.Services;
 
@@ -40,6 +41,10 @@ public class StatusDataSourceManager<TKey>(
     private DateTime _lastDummyUpdateTime;
 
     public List<StatusInfo> FetchAndProcessStatuses(StatusTimerOverlayConfig overlayConfig) {
+        if (overlayConfig.InCombatOnly && !Services.Condition[ConditionFlag.InCombat]) {
+            return [];
+        }
+
         IReadOnlyList<StatusInfo> current;
 
         if (getIsPreviewEnabled()) {