Merge pull request #109 from MKhayle/main

VFX = 0 Filter for StatusEffects
Etheirys · Jan 5, 2025 · 836df61 · 836df61
2 parents ca4a5a5 + 17b484d
commit 836df61
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/Brio/UI/Controls/Selectors/StatusEffectSelector.cs b/Brio/UI/Controls/Selectors/StatusEffectSelector.cs
@@ -1,4 +1,5 @@
 using Brio.Resources;
+using Brio.UI.Widgets.Actor;
 using Dalamud.Interface.Textures.TextureWraps;
 using ImGuiNET;
 using Lumina.Excel.Sheets;
@@ -10,11 +11,13 @@ namespace Brio.UI.Controls.Selectors;
 public class StatusEffectSelectorHolder
 {
     public Status Status { get; set; }
+    public bool _VFXLockEnabled { get; set; }
 }
 
 internal class StatusEffectSelector(string id) : Selector<StatusEffectSelectorHolder>(id)
 {
     protected override Vector2 MinimumListSize { get; } = new(300, 300);
+    public bool _VFXLockEnabled = true;
 
     protected override float EntrySize => ImGui.GetTextLineHeight() * 3f;
 
@@ -28,6 +31,17 @@ protected override void PopulateList()
         }
     }
 
+	protected override void DrawOptions()
+	{
+		base.DrawOptions();
+
+		if(ImGui.Checkbox("###status_vfx_filter", ref this._VFXLockEnabled))
+		    UpdateList();
+        ImGui.SameLine();
+        ImGui.Text("Remove Status Effects that do not have a VFX.");
+
+	}
+
     protected override void DrawItem(StatusEffectSelectorHolder sesh, bool isHovered)
     {
         var item = sesh.Status;
@@ -43,7 +57,7 @@ protected override void DrawItem(StatusEffectSelectorHolder sesh, bool isHovered
 
         ImGui.Image(tex.ImGuiHandle, iconSize);
         ImGui.SameLine();
-        ImGui.Text($"{item.Name}\n{item.RowId}\nVFX: {item.VFX.RowId} / Hit: {item.HitEffect.RowId}");
+        ImGui.Text($"{item.Name.ExtractText()}\n{item.RowId}\nVFX: {item.VFX.RowId} / Hit: {item.HitEffect.RowId}");
     }
 
     protected override int Compare(StatusEffectSelectorHolder sesh1, StatusEffectSelectorHolder sesh2)
@@ -63,10 +77,10 @@ protected override int Compare(StatusEffectSelectorHolder sesh1, StatusEffectSel
     protected override bool Filter(StatusEffectSelectorHolder sesh, string search)
     {
         var item = sesh.Status;
+		if(_VFXLockEnabled && item.VFX.RowId == 0) return false;
 
         if(item.StatusCategory == 0)
             return false;
-
         var searchTerm = $"{item.Name} {item.RowId} {item.VFX.RowId} {item.HitEffect.RowId}";
 
         if(searchTerm.Contains(search, StringComparison.InvariantCultureIgnoreCase))

diff --git a/Brio/UI/Widgets/Actor/StatusEffectsWidget.cs b/Brio/UI/Widgets/Actor/StatusEffectsWidget.cs
@@ -1,4 +1,5 @@
 using Brio.Capabilities.Actor;
+using Brio.Capabilities.Core;
 using Brio.Resources;
 using Brio.UI.Controls.Selectors;
 using Brio.UI.Controls.Stateless;
@@ -19,6 +20,7 @@ internal class StatusEffectsWidget(StatusEffectCapability capability) : Widget<S
     public override WidgetFlags Flags => WidgetFlags.DrawBody;
 
     private int _selectedStatus;
+    private bool _VFXLockEnabled = false;
 
     private static readonly StatusEffectSelector _globalStatusEffectSelector = new("global_status_selector");
 
@@ -33,6 +35,8 @@ public override void DrawBody()
             {
                 foreach(var status in statuses)
                 {
+                    if(_VFXLockEnabled && status.VFX.RowId == 0) continue;
+
                     bool selected = status.RowId == _selectedStatus;
 
                     IDalamudTextureWrap? tex = null;
@@ -50,7 +54,7 @@ public override void DrawBody()
                     ImGui.SetCursorPos(position);
                     ImGui.Image(tex.ImGuiHandle, iconSize);
                     ImGui.SameLine();
-                    ImGui.Text($"{status.Name}\n{status.RowId}");
+                    ImGui.Text($"{status.Name.ExtractText()}\n{status.RowId}");
 
                     if(wasSelected)
                         _selectedStatus = (int)status.RowId;
@@ -78,6 +82,12 @@ public override void DrawBody()
         if(ImBrio.FontIconButton("status_effects_remove", FontAwesomeIcon.Minus, "Remove Effect", isSelectedPlaying))
             Capability.RemoveStatus((ushort)_selectedStatus);
 
+        ImGui.SameLine();
+
+		ImGui.Checkbox("###status_vfx_filter", ref _VFXLockEnabled);
+		if(ImGui.IsItemHovered())
+			ImGui.SetTooltip("Hide Status Effects that have no VFX.");
+
         ImGui.SameLine();