Merge pull request 'Tooltip: game-style formatting with section labels, tail alignment, and config options' (#1) from feature/tooltip-updates into main

- Add TooltipSegment and colored formatting (section labels green, status names yellow)
- Sections: Additional Effect, Duration, Maximum Charges, Blood Gauge Cost, Combo, role labels
- Tail text (e.g. 'Cannot be executed while bound.', parenthetical notes) now left-aligned on own line
- Section values (e.g. '2', '50', '30m') stay on same line as labels
- Config: Use Game-style formatting, Section/Status/Secondary colors
- Config: Tooltip Max Width, Line Spacing, Font Scale, Icon Scale, Height Buffer slider
- ActionBarsHud: pass formatted segments to ShowTooltipOnCursor when game-style enabled

Co-authored-by: Cursor <cursoragent@cursor.com>

Config/ConfigurationManager.cs

@@ -675,6 +675,7 @@ namespace HSUI.Config
             // Other Elements
             typeof(ExperienceBarConfig),
             typeof(GCDIndicatorConfig),
+            typeof(MouseGCDIndicatorConfig),
             typeof(HotbarsConfig),
             typeof(Hotbar1BarConfig),
             typeof(Hotbar2BarConfig),

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.8.0</AssemblyVersion>
-		<FileVersion>1.0.8.0</FileVersion>
-		<InformationalVersion>1.0.8.0</InformationalVersion>
+		<AssemblyVersion>1.0.8.14</AssemblyVersion>
+		<FileVersion>1.0.8.14</FileVersion>
+		<InformationalVersion>1.0.8.14</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -24,6 +24,9 @@
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<Deterministic>true</Deterministic>
+		<!-- Do not emit PDBs in Release; prevents your local path from appearing in user crash logs -->
+		<DebugType>none</DebugType>
+		<DebugSymbols>false</DebugSymbols>
 	</PropertyGroup>
 
 	<PropertyGroup>

HSUI.json

@@ -2,7 +2,7 @@
   "Author": "Knack117",
   "Name": "HSUI",
   "InternalName": "HSUI",
-  "AssemblyVersion": "1.0.8.0",
+  "AssemblyVersion": "1.0.8.14",
   "Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
   "ApplicableVersion": "any",
   "RepoUrl": "https://github.com/Knack117/HSUI",

Helpers/ActionBarsManager.cs

@@ -89,9 +89,48 @@ namespace HSUI.Helpers
             return p;
         }
 
+        /// <summary>Track PvP state so we can restore PvE bars when leaving PvP (game sometimes leaves PvP data in StandardHotbars).</summary>
+        private static bool _pvpHotbarsActiveLastFrame;
+        private static bool _clientStatePvPLastFrame;
+        /// <summary>After leaving PvP, keep re-applying PvE load for this many frames in case the game overwrites.</summary>
+        private static int _restorePvEFramesLeft;
+
+        /// <summary>
+        /// Call once per frame (e.g. from Framework Update). When we detect leaving PvP, loads saved PvE hotbars into the live bars
+        /// and keeps re-applying for a short window so PvE actions are not overwritten by stale PvP state.
+        /// </summary>
+        public static unsafe void TryRestorePvEHotbarsAfterLeavePvP()
+        {
+            var module = RaptureHotbarModule.Instance();
+            if (module == null || !module->ModuleReady)
+                return;
+
+            bool pvpActive = module->PvPHotbarsActive;
+            bool clientPvP = Plugin.ClientState.IsPvP;
+
+            if (!pvpActive && !clientPvP)
+            {
+                bool justLeftPvP = _pvpHotbarsActiveLastFrame || _clientStatePvPLastFrame;
+                if (justLeftPvP)
+                    _restorePvEFramesLeft = 120; // ~2s at 60fps
+
+                if (_restorePvEFramesLeft > 0)
+                {
+                    uint classJobId = (uint)(module->ActiveHotbarClassJobId & 0x7F);
+                    for (uint barId = 0; barId < 10; barId++)
+                        module->LoadSavedHotbar(classJobId, barId);
+                    _restorePvEFramesLeft--;
+                }
+            }
+
+            _pvpHotbarsActiveLastFrame = pvpActive;
+            _clientStatePvPLastFrame = clientPvP;
+        }
+
         /// <summary>
         /// Reads hotbar slot data from RaptureHotbarModule. Returns up to slotCount slots.
         /// hotbarIndex 1-10 maps to StandardHotbars 0-9.
+        /// Always reads from live Hotbars; when leaving PvP, TryRestorePvEHotbarsAfterLeavePvP loads saved PvE into live so we then show PvE.
         /// </summary>
         public unsafe List<SlotInfo> GetSlotData(int hotbarIndex, int slotCount)
         {
@@ -100,11 +139,11 @@ namespace HSUI.Helpers
             if (module == null || !module->ModuleReady)
                 return list;
 
-            var hotbars = module->StandardHotbars;
             int barIdx = Math.Clamp(hotbarIndex, 1, 10) - 1;
             int count = Math.Clamp(slotCount, 1, 12);
-
+            var hotbars = module->StandardHotbars;
             ref var bar = ref hotbars[barIdx];
+
             for (int i = 0; i < count; i++)
             {
                 var slot = bar.GetHotbarSlot((uint)i);
@@ -116,19 +155,37 @@ namespace HSUI.Helpers
                     continue;
                 }
 
-                if (slot->IsEmpty)
+                bool isEmpty = slot->IsEmpty && slot->CommandType != RaptureHotbarModule.HotbarSlotType.GearSet;
+                if (isEmpty)
                 {
                     list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
                     continue;
                 }
 
-                bool usable = slot->IsSlotUsable(slot->ApparentSlotType, slot->ApparentActionId);
+                var slotType = slot->CommandType == RaptureHotbarModule.HotbarSlotType.GearSet
+                    ? RaptureHotbarModule.HotbarSlotType.GearSet
+                    : slot->ApparentSlotType;
+                uint actionId = slot->CommandType == RaptureHotbarModule.HotbarSlotType.GearSet
+                    ? slot->CommandId
+                    : slot->ApparentActionId;
+
+                if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet)
+                    slot->LoadIconId();
+
+                bool usable = slot->IsSlotUsable(slotType, actionId);
                 uint iconId = slot->IconId;
-                uint actionId = slot->ApparentActionId;
-                var slotType = slot->ApparentSlotType;
+                if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet && iconId == 0)
+                {
+                    int resolved = slot->GetIconIdForSlot(slotType, actionId);
+                    if (resolved > 0)
+                        iconId = (uint)resolved;
+                }
 
                 (int pct, int secsLeft) = GetSlotCooldown(slot);
                 (int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
+                uint apparentCharges = slotType == RaptureHotbarModule.HotbarSlotType.Action ? slot->GetApparentIconRecastCharges() : 0;
+                if (maxCharges > 1 && (apparentCharges > 0 || currentCharges > 0))
+                    usable = true;
                 list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
             }
 

Helpers/ActionChatLinkHelper.cs

@@ -52,50 +52,58 @@ namespace HSUI.Helpers
 
         private void OnFrameworkUpdate(IFramework framework)
         {
-            if (!_config.ActionChatLinkEnabled) return;
-
-            bool shiftHeld = ImGui.IsKeyDown(ImGuiKey.LeftShift) || ImGui.IsKeyDown(ImGuiKey.RightShift);
-            bool leftClicked = ImGui.IsMouseClicked(ImGuiMouseButton.Left);
-
-            // ActionMenu must be visible
-            var addon = Plugin.GameGui.GetAddonByName("ActionMenu", 1);
-            if (addon == null || addon.Address == IntPtr.Zero)
+            try
             {
-                _pendingActionId = 0;
-                return;
-            }
+                if (!_config.ActionChatLinkEnabled) return;
 
-            // Capture action: 1) Addon list (ActionList or TraitList); 2) HoveredAction only when mouse is over ActionMenu (excludes hotbars)
-            if (shiftHeld)
-            {
-                if (TryGetHoveredActionFromAddon(addon.Address, out uint fromAddon))
-                    _pendingActionId = fromAddon;
-                else if (IsMouseOverActionMenu(addon.Address) && !ActionBarsHitTestHelper.IsMouseOverAnyHSUIHotbar())
+                bool shiftHeld = ImGui.IsKeyDown(ImGuiKey.LeftShift) || ImGui.IsKeyDown(ImGuiKey.RightShift);
+                bool leftClicked = ImGui.IsMouseClicked(ImGuiMouseButton.Left);
+
+                // ActionMenu must be visible
+                var addon = Plugin.GameGui.GetAddonByName("ActionMenu", 1);
+                if (addon == null || addon.Address == IntPtr.Zero)
                 {
-                    var ha = Plugin.GameGui.HoveredAction;
-                    if (ha != null && ha.ActionKind != HoverActionKind.None && ha.ActionID != 0)
-                        _pendingActionId = ha.ActionID;
+                    _pendingActionId = 0;
+                    return;
+                }
+
+                // Capture action: 1) Addon list (ActionList or TraitList); 2) HoveredAction only when mouse is over ActionMenu (excludes hotbars)
+                if (shiftHeld)
+                {
+                    if (TryGetHoveredActionFromAddon(addon.Address, out uint fromAddon))
+                        _pendingActionId = fromAddon;
+                    else if (IsMouseOverActionMenu(addon.Address) && !ActionBarsHitTestHelper.IsMouseOverAnyHSUIHotbar())
+                    {
+                        var ha = Plugin.GameGui.HoveredAction;
+                        if (ha != null && ha.ActionKind != HoverActionKind.None && ha.ActionID != 0)
+                            _pendingActionId = ha.ActionID;
+                        else
+                            _pendingActionId = 0;
+                        }
                     else
                         _pendingActionId = 0;
                 }
                 else
                     _pendingActionId = 0;
-            }
-            else
+
+                // On shift+click, use captured action or HoveredAction as fallback
+                if (!shiftHeld || !leftClicked) return;
+
+                if (_pendingActionId == 0) return;
+                uint idToUse = _pendingActionId;
+
+                string? actionName = GetActionName(idToUse);
+                if (string.IsNullOrWhiteSpace(actionName)) return;
+
+                string text = $"You should check out {actionName}";
+                InsertOrCopyToChat(text);
                 _pendingActionId = 0;
-
-            // On shift+click, use captured action or HoveredAction as fallback
-            if (!shiftHeld || !leftClicked) return;
-
-            if (_pendingActionId == 0) return;
-            uint idToUse = _pendingActionId;
-
-            string? actionName = GetActionName(idToUse);
-            if (string.IsNullOrWhiteSpace(actionName)) return;
-
-            string text = $"You should check out {actionName}";
-            InsertOrCopyToChat(text);
-            _pendingActionId = 0;
+            }
+            catch (Exception ex)
+            {
+                _pendingActionId = 0;
+                Plugin.Logger.Warning($"[ActionChatLink] OnFrameworkUpdate: {ex.Message}");
+            }
         }
 
         /// <summary>Read action ID from AddonActionMenu. Tries ActionList and TraitList, HoveredItemIndex and HeldItemIndex.</summary>
@@ -104,19 +112,26 @@ namespace HSUI.Helpers
             actionId = 0;
             if (addonAddress == IntPtr.Zero) return false;
 
-            var addon = (AddonActionMenu*)addonAddress;
-            byte* basePtr = (byte*)addonAddress;
-
-            foreach (var list in new[] { addon->ActionList, addon->TraitList })
+            try
             {
-                if (list == null) continue;
-                foreach (int idx in new[] { list->HoveredItemIndex, list->HeldItemIndex })
+                var addon = (AddonActionMenu*)addonAddress;
+                byte* basePtr = (byte*)addonAddress;
+
+                foreach (var list in new[] { addon->ActionList, addon->TraitList })
                 {
-                    if (idx < 0 || idx >= 80) continue;
-                    actionId = *(uint*)(basePtr + 0x338 + idx * 0x38 + 0x14);
-                    if (actionId != 0) return true;
+                    if (list == null) continue;
+                    foreach (int idx in new[] { list->HoveredItemIndex, list->HeldItemIndex })
+                    {
+                        if (idx < 0 || idx >= 80) continue;
+                        actionId = *(uint*)(basePtr + 0x338 + idx * 0x38 + 0x14);
+                        if (actionId != 0) return true;
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Verbose($"[ActionChatLink] TryGetHoveredActionFromAddon: {ex.Message}");
+            }
             return false;
         }
 
@@ -124,13 +139,21 @@ namespace HSUI.Helpers
         private static unsafe bool IsMouseOverActionMenu(IntPtr addonAddress)
         {
             if (addonAddress == IntPtr.Zero) return false;
-            var addon = (AtkUnitBase*)addonAddress;
-            var root = addon->RootNode;
-            if (root == null || !addon->IsVisible) return false;
+            try
+            {
+                var addon = (AtkUnitBase*)addonAddress;
+                var root = addon->RootNode;
+                if (root == null || !addon->IsVisible) return false;
 
-            var mp = ImGui.GetMousePos();
-            float x = root->ScreenX, y = root->ScreenY, w = root->Width, h = root->Height;
-            return mp.X >= x && mp.X < x + w && mp.Y >= y && mp.Y < y + h;
+                var mp = ImGui.GetMousePos();
+                float x = root->ScreenX, y = root->ScreenY, w = root->Width, h = root->Height;
+                return mp.X >= x && mp.X < x + w && mp.Y >= y && mp.Y < y + h;
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Verbose($"[ActionChatLink] IsMouseOverActionMenu: {ex.Message}");
+                return false;
+            }
         }
 
         private static string? GetActionName(uint actionId)

Helpers/InputsHelper.cs

@@ -470,18 +470,28 @@ namespace HSUI.Helpers
 
         public void OnFrameworkUpdate(IFramework framework)
         {
-            // Keep WndProc hooked when: proxy mode (for mouseover) OR we need to block game drag
-            // release (so dropping on HSUI action bar doesn't execute the ability).
-            bool needHook = IsProxyEnabled || ShouldBlockGameDragRelease();
-            if (needHook && _wndProcPtr == IntPtr.Zero)
+            try
             {
-                HookWndProc();
-                // Only log when we actually installed (HookWndProc can return early during init delay)
-                if (_wndProcPtr != IntPtr.Zero && IsActionBarDragDropDebugEnabled())
-                    Plugin.Logger.Information("[HSUI DragDrop DBG] WndProc hook INSTALLED (needHook=true for drag-block)");
+                // When leaving PvP, force load PvE hotbars so HSUI bars don't keep showing PvP actions.
+                ActionBarsManager.TryRestorePvEHotbarsAfterLeavePvP();
+
+                // Keep WndProc hooked when: proxy mode (for mouseover) OR we need to block game drag
+                // release (so dropping on HSUI action bar doesn't execute the ability).
+                bool needHook = IsProxyEnabled || ShouldBlockGameDragRelease();
+                if (needHook && _wndProcPtr == IntPtr.Zero)
+                {
+                    HookWndProc();
+                    // Only log when we actually installed (HookWndProc can return early during init delay)
+                    if (_wndProcPtr != IntPtr.Zero && IsActionBarDragDropDebugEnabled())
+                        Plugin.Logger.Information("[HSUI DragDrop DBG] WndProc hook INSTALLED (needHook=true for drag-block)");
+                }
+                else if (!needHook && _wndProcPtr != IntPtr.Zero)
+                    RestoreWndProc();
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Warning($"[HSUI InputsHelper] OnFrameworkUpdate: {ex.Message}");
             }
-            else if (!needHook && _wndProcPtr != IntPtr.Zero)
-                RestoreWndProc();
         }
 
         private static bool ShouldBlockGameDragRelease()
@@ -565,7 +575,8 @@ namespace HSUI.Helpers
             Plugin.Logger.Info("\tOld WndProc: " + _imguiWndProcPtr.ToString("X"));
         }
 
-        private void RestoreWndProc()
+        /// <summary>Restore the game window's WndProc so left-click works again. Idempotent.</summary>
+        internal void RestoreWndProc()
         {
             if (_wndHandle == IntPtr.Zero || _imguiWndProcPtr == IntPtr.Zero)
                 return;
@@ -584,6 +595,20 @@ namespace HSUI.Helpers
             {
                 _wndHandle = IntPtr.Zero;
                 _imguiWndProcPtr = IntPtr.Zero;
+                _wndProcPtr = IntPtr.Zero;
+            }
+        }
+
+        /// <summary>Call at the very start of plugin disable so left-click is restored even if disposal fails later.</summary>
+        public static void RestoreWndProcIfNeeded()
+        {
+            try
+            {
+                Instance?.RestoreWndProc();
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger?.Warning($"[HSUI] RestoreWndProcIfNeeded: {ex.Message}");
             }
         }
 

Helpers/MpTickHelper.cs

@@ -43,35 +43,34 @@ namespace HSUI.Helpers
 
         private void FrameworkOnOnUpdateEvent(IFramework framework)
         {
-            var player = Plugin.ObjectTable.LocalPlayer;
-            if (player is null)
+            try
             {
-                return;
-            }
+                var player = Plugin.ObjectTable.LocalPlayer;
+                if (player is null)
+                    return;
 
-            var now = ImGui.GetTime();
-            if (now - LastUpdate < PollingRate)
+                var now = ImGui.GetTime();
+                if (now - LastUpdate < PollingRate)
+                    return;
+
+                LastUpdate = now;
+
+                var mp = player.CurrentMp;
+
+                // account for lucid dreaming screwing up mp calculations
+                var lucidDreamingActive = Utils.StatusListForBattleChara(player).Any(e => e.StatusId == 1204);
+
+                if (!lucidDreamingActive && _lastMpValue < mp)
+                    LastTickTime = now;
+                else if (LastTickTime + ServerTickRate <= now)
+                    LastTickTime += ServerTickRate;
+
+                _lastMpValue = (int)mp;
+            }
+            catch (Exception ex)
             {
-                return;
+                Plugin.Logger.Verbose($"[HSUI MpTickHelper] FrameworkOnOnUpdateEvent: {ex.Message}");
             }
-
-            LastUpdate = now;
-
-            var mp = player.CurrentMp;
-
-            // account for lucid dreaming screwing up mp calculations
-            var lucidDreamingActive = Utils.StatusListForBattleChara(player).Any(e => e.StatusId == 1204);
-
-            if (!lucidDreamingActive && _lastMpValue < mp)
-            {
-                LastTickTime = now;
-            }
-            else if (LastTickTime + ServerTickRate <= now)
-            {
-                LastTickTime += ServerTickRate;
-            }
-
-            _lastMpValue = (int)mp;
         }
 
         protected virtual void Dispose(bool disposing)

Helpers/TexturesHelper.cs

@@ -22,8 +22,22 @@ namespace HSUI.Helpers
 
         public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, uint stackCount = 0, bool hdIcon = true)
         {
-            GameIconLookup lookup = new GameIconLookup(iconId + stackCount, false, hdIcon);
-            return Plugin.TextureProvider.GetFromGameIcon(lookup).GetWrapOrDefault();
+            if (iconId == 0)
+                return null;
+
+            try
+            {
+                // Game encodes item icons: iconId >= 1000000 means HQ; actual icon = iconId % 1000000
+                uint actualIconId = iconId >= 1000000 ? (iconId % 1000000) + stackCount : iconId + stackCount;
+                bool itemHq = iconId >= 1000000;
+                GameIconLookup lookup = new GameIconLookup(actualIconId, itemHq, hdIcon);
+                return Plugin.TextureProvider.GetFromGameIcon(lookup).GetWrapOrDefault();
+            }
+            catch
+            {
+                // GetFromGameIcon can throw for invalid/unsupported icon IDs (e.g. certain inventory item icons during drag-drop)
+                return null;
+            }
         }
 
         public static IDalamudTextureWrap? GetTextureFromPath(string path)

Helpers/TooltipsHelper.cs

@@ -8,11 +8,35 @@ using HSUI.Interface.GeneralElements;
 using Dalamud.Bindings.ImGui;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Numerics;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace HSUI.Helpers
 {
+    /// <summary>Colored segment for game-style tooltip formatting.</summary>
+    public readonly struct TooltipSegment
+    {
+        public readonly string Text;
+        public readonly Vector4 Color;
+
+        public TooltipSegment(string text, Vector4 color)
+        {
+            Text = text ?? "";
+            Color = color;
+        }
+    }
+
+    /// <summary>When showing an ID in the tooltip title, use Action for action IDs or Status for status effect IDs.</summary>
+    public enum TooltipIdKind
+    {
+        None = 0,
+        Action = 1,
+        Status = 2,
+    }
+
     public class TooltipsHelper : IDisposable
     {
         #region Singleton
@@ -46,7 +70,7 @@ namespace HSUI.Helpers
         }
         #endregion
 
-        private float MaxWidth => Math.Max(160, 340 * ImGuiHelpers.GlobalScale * _config.TooltipScale);
+        private float MaxWidth => Math.Max(160, _config.TooltipMaxWidth * ImGuiHelpers.GlobalScale * _config.TooltipScale);
         private float Margin => Math.Max(4, 5 * ImGuiHelpers.GlobalScale * _config.TooltipScale);
 
         private TooltipsConfig _config => ConfigurationManager.Instance.GetConfigObject<TooltipsConfig>();
@@ -57,6 +81,7 @@ namespace HSUI.Helpers
         private Vector2 _titleSize;
         private string? _previousRawText = null;
         private uint? _currentIconId = null;
+        private List<TooltipSegment>? _formattedSegments = null;
 
         private Vector2 _position;
         private Vector2 _size;
@@ -65,12 +90,12 @@ namespace HSUI.Helpers
 
         private const float IconSize = 24f;
 
-        public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null)
+        public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None, List<TooltipSegment>? formattedText = null)
         {
-            ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId);
+            ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId, idKind, formattedText);
         }
 
-        public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null)
+        public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None, List<TooltipSegment>? formattedText = null)
         {
             if (text == null)
             {
@@ -87,6 +112,7 @@ namespace HSUI.Helpers
             }
 
             _currentIconId = iconId;
+            _formattedSegments = formattedText;
 
             // calcualte title size
             _titleSize = Vector2.Zero;
@@ -99,7 +125,11 @@ namespace HSUI.Helpers
                     _currentTooltipTitle += $" ({name})";
                 }
 
-                if (_config.ShowStatusIDs)
+                bool showId = id != 0 && (
+                    (idKind == TooltipIdKind.Action && _config.ShowActionIDs) ||
+                    (idKind == TooltipIdKind.Status && _config.ShowStatusIDs) ||
+                    (idKind == TooltipIdKind.None && _config.ShowStatusIDs));
+                if (showId)
                 {
                     _currentTooltipTitle += " (ID: " + id + ")";
                 }
@@ -112,20 +142,42 @@ namespace HSUI.Helpers
                 }
             }
 
-            // calculate text size
+            // calculate text size (build combined text from segments for sizing)
             string fontIdForText = _config.FontID ?? FontsConfig.DefaultSmallFontKey;
             using (FontsManager.Instance.PushFont(fontIdForText))
             {
-                _textSize = ImGui.CalcTextSize(_currentTooltipText, false, MaxWidth);
+                float lineHeight = ImGui.GetTextLineHeight();
+                if (_formattedSegments != null && _formattedSegments.Count > 0)
+                {
+                    var sb = new StringBuilder();
+                    int newlineCount = 0;
+                    foreach (var seg in _formattedSegments)
+                    {
+                        sb.Append(seg.Text);
+                        if (seg.Text == "\n") newlineCount++;
+                    }
+                    _textSize = ImGui.CalcTextSize(sb.ToString(), false, MaxWidth);
+                    // Account for Dummy spacing between sections (each \n adds compactSpacing)
+                    float compactSpacing = Math.Max(2, lineHeight * _config.TooltipLineSpacing);
+                    _textSize.Y += newlineCount * compactSpacing;
+                }
+                else
+                {
+                    _textSize = ImGui.CalcTextSize(_currentTooltipText, false, MaxWidth);
+                }
             }
 
-            float contentWidth = Math.Max(_titleSize.X, _textSize.X);
-            float contentHeight = _titleSize.Y + _textSize.Y;
-            float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale;
+            float fontScale = Math.Max(0.7f, _config.TooltipFontScale);
+            float contentWidth = Math.Max(_titleSize.X, _textSize.X) * fontScale;
+            float contentHeight = (_titleSize.Y + _textSize.Y) * fontScale;
+            float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale * _config.TooltipIconScale;
             float iconGap = _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled + Margin : 0;
+            // Add buffer to prevent clipping (font/scale changes, rounding, padding)
+            float heightBuffer = _config.TooltipHeightBuffer;
+            float minContentHeight = contentHeight + heightBuffer;
             _size = new Vector2(
                 contentWidth + iconGap + Margin * 2,
-                Math.Max(contentHeight, _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled : 0) + Margin * 2);
+                Math.Max(minContentHeight, _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled + Margin * 2 : 0) + Margin * 2);
 
             // position tooltip using the given coordinates as bottom center
             position.X = position.X - _size.X / 2f;
@@ -258,6 +310,41 @@ namespace HSUI.Helpers
         public void RemoveTooltip()
         {
             _dataIsValid = false;
+            _formattedSegments = null;
+        }
+
+        private void DrawTooltipBody()
+        {
+            if (_formattedSegments != null && _formattedSegments.Count > 0)
+            {
+                bool afterNewline = true;
+                float lineHeight = ImGui.GetTextLineHeight();
+                float compactSpacing = Math.Max(2, lineHeight * _config.TooltipLineSpacing);
+
+                foreach (var seg in _formattedSegments)
+                {
+                    if (seg.Text == "\n")
+                    {
+                        ImGui.Dummy(new Vector2(0, compactSpacing));
+                        afterNewline = true;
+                    }
+                    else if (!string.IsNullOrEmpty(seg.Text))
+                    {
+                        if (!afterNewline)
+                            ImGui.SameLine(0, 0);
+                        string text = afterNewline ? seg.Text.TrimStart() : seg.Text;
+                        if (!string.IsNullOrEmpty(text))
+                        {
+                            ImGui.TextColored(seg.Color, text);
+                            afterNewline = false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText);
+            }
         }
 
         public void Draw()
@@ -291,6 +378,7 @@ namespace HSUI.Helpers
 
             ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0);
             ImGui.Begin("DelvUI_tooltip", windowFlags);
+            ImGui.SetWindowFontScale(_config.TooltipFontScale);
             var drawList = ImGui.GetWindowDrawList();
 
             drawList.AddRectFilled(_position, _position + _size, _config.BackgroundColor.Base);
@@ -304,7 +392,7 @@ namespace HSUI.Helpers
             float globalScaleCorrection = -15 + 15 * ImGuiHelpers.GlobalScale;
 
             string fontId = _config.FontID ?? FontsConfig.DefaultSmallFontKey;
-            float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale;
+            float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale * _config.TooltipIconScale;
             float iconGap = (_currentIconId.HasValue && _currentIconId.Value > 0) ? iconSizeScaled + Margin : 0;
             float wrapWidth = (_currentIconId.HasValue && _currentIconId.Value > 0)
                 ? _size.X - iconGap - Margin * 2
@@ -330,19 +418,19 @@ namespace HSUI.Helpers
                     ImGui.PopTextWrapPos();
                 }
 
-                // text
+                // text (formatted or plain)
                 using (FontsManager.Instance.PushFont(fontId))
                 {
                     cursorPos = new Vector2(textBlockX, Margin + _titleSize.Y);
                     ImGui.SetCursorPos(cursorPos);
                     ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
-                    ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText);
+                    DrawTooltipBody();
                     ImGui.PopTextWrapPos();
                 }
             }
             else
             {
-                // text
+                // text (formatted or plain)
                 using (FontsManager.Instance.PushFont(fontId))
                 {
                     var cursorPos = new Vector2(textBlockX, Margin);
@@ -350,11 +438,12 @@ namespace HSUI.Helpers
 
                     ImGui.SetCursorPos(cursorPos);
                     ImGui.PushTextWrapPos(cursorPos.X + textWidth + globalScaleCorrection);
-                    ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText);
+                    DrawTooltipBody();
                     ImGui.PopTextWrapPos();
                 }
             }
 
+            ImGui.SetWindowFontScale(1f);
             ImGui.End();
             ImGui.PopStyleVar();
 
@@ -363,6 +452,211 @@ namespace HSUI.Helpers
             RemoveTooltip();
         }
 
+        /// <summary>
+        /// Parses action/ability description text into colored segments for game-style tooltips.
+        /// Adds newlines before section headers and colors: section labels (Additional Effect, Duration) green,
+        /// status names (e.g. Blood of the Dragon) yellow, secondary labels grey.
+        /// </summary>
+        public static List<TooltipSegment> FormatActionTooltip(string description, Vector4 textColor, Vector4 sectionLabelColor, Vector4 statusNameColor)
+        {
+            var result = new List<TooltipSegment>();
+            if (string.IsNullOrEmpty(description))
+                return result;
+
+            // Pattern: section labels to color (Additional Effect, Duration, X Effect, Maximum Charges, Blood Gauge Cost, Combo, roles)
+            var sectionRegex = new Regex(@"\b(Additional Effect:|Duration:|Maximum Charges:|Blood Gauge Cost:|Combo Action:|Combo Potency:|Combo Bonus:|Tank:|Melee:|Ranged:|Caster:|Healer:|[A-Za-z][A-Za-z0-9\s]+ Effect:)", RegexOptions.None);
+            // Pattern: "Grants X X Effect:" - captures status name X
+            var grantsRegex = new Regex(@"Grants\s+(.+?)\s+\1\s+Effect:", RegexOptions.Singleline);
+
+            int lastEnd = 0;
+            foreach (Match m in sectionRegex.Matches(description))
+            {
+                string chunk = description.Substring(lastEnd, m.Index - lastEnd).TrimEnd();
+                if (!string.IsNullOrEmpty(chunk))
+                {
+                    // Check for "Grants StatusName" in this chunk to color status name yellow
+                    var grantsMatch = grantsRegex.Match(chunk);
+                    if (grantsMatch.Success)
+                    {
+                        string statusName = grantsMatch.Groups[1].Value.Trim();
+                        string grantsPrefix = "Grants " + statusName;
+                        int idx = chunk.IndexOf(grantsPrefix, StringComparison.Ordinal);
+                        if (idx >= 0)
+                        {
+                            if (idx > 0)
+                                result.Add(new TooltipSegment(chunk.Substring(0, idx), textColor));
+                            result.Add(new TooltipSegment("Grants ", textColor));
+                            result.Add(new TooltipSegment(statusName + " ", statusNameColor));
+                            int after = idx + grantsPrefix.Length;
+                            if (after < chunk.Length)
+                                result.Add(new TooltipSegment(chunk.Substring(after), textColor));
+                        }
+                        else
+                            result.Add(new TooltipSegment(chunk, textColor));
+                    }
+                    else
+                        result.Add(new TooltipSegment(chunk, textColor));
+                }
+
+                result.Add(new TooltipSegment("\n", textColor));
+                result.Add(new TooltipSegment(m.Value + " ", sectionLabelColor));
+                // Add newline so description wraps below label like stock game (not floating beside it)
+                if (m.Value.IndexOf("Effect:", StringComparison.OrdinalIgnoreCase) >= 0)
+                    result.Add(new TooltipSegment("\n", textColor));
+                lastEnd = m.Index + m.Length;
+            }
+            if (lastEnd < description.Length)
+            {
+                string tail = description.Substring(lastEnd).TrimStart();
+                if (!string.IsNullOrEmpty(tail))
+                {
+                    string valuePart = "";
+                    string notePart = "";
+                    bool hasValue = false;
+
+                    int newlineIdx = tail.IndexOf('\n');
+                    if (newlineIdx >= 0)
+                    {
+                        // "2\nCannot be executed..." - value on first line, note on next
+                        valuePart = tail.Substring(0, newlineIdx).TrimEnd();
+                        notePart = tail.Substring(newlineIdx + 1).TrimStart();
+                        hasValue = Regex.IsMatch(valuePart, @"^\d+[ms]?$");
+                    }
+                    else
+                    {
+                        // "2 Cannot be executed while bound." - value + space + note (no newline)
+                        var valueNoteMatch = Regex.Match(tail, @"^(\d+[ms]?)\s+([A-Z].+)$", RegexOptions.Singleline);
+                        if (valueNoteMatch.Success)
+                        {
+                            valuePart = valueNoteMatch.Groups[1].Value;
+                            notePart = valueNoteMatch.Groups[2].Value;
+                            hasValue = true;
+                        }
+                        else if (Regex.IsMatch(tail, @"^\d+[ms]?$"))
+                        {
+                            // Plain value only: "50" (Blood Gauge Cost), "2" (charges) - stay on same line as label
+                            valuePart = tail;
+                            hasValue = true;
+                        }
+                    }
+
+                    // Add valuePart when present - section content (e.g. "Restore party HP..." for Healer, "2" for charges)
+                    if (!string.IsNullOrEmpty(valuePart))
+                    {
+                        result.Add(new TooltipSegment(valuePart, textColor));
+                    }
+                    if (!string.IsNullOrEmpty(notePart))
+                    {
+                        result.Add(new TooltipSegment("\n", textColor));
+                        result.Add(new TooltipSegment(notePart, textColor));
+                    }
+                    else if (!hasValue)
+                    {
+                        // Standalone note: "(Duration can be extended...)", "Cannot be executed...", footnotes
+                        result.Add(new TooltipSegment("\n", textColor));
+                        result.Add(new TooltipSegment(tail, textColor));
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Builds formatted segments from a full action tooltip body (stats + description).
+        /// Used when UseGameStyleFormatting is enabled.
+        /// Stats are placed first, then exactly one newline, then description below.
+        /// </summary>
+        public static List<TooltipSegment>? BuildFormattedActionTooltipBody(string body, TooltipsConfig config)
+        {
+            if (string.IsNullOrEmpty(body) || !config.UseGameStyleFormatting)
+                return null;
+
+            var result = new List<TooltipSegment>();
+            var textColor = config.TextColor.Vector;
+            var sectionColor = config.SectionLabelColor.Vector;
+            var statusColor = config.StatusNameColor.Vector;
+            var secondaryColor = config.SecondaryLabelColor.Vector;
+
+            var blocks = body.Split(new[] { "\n\n" }, StringSplitOptions.None);
+            int descStart = 0;
+            bool hasStats = false;
+
+            // Stats block: may contain "Potency: X" and "Cast: ... | Recast: ..." on separate lines
+            for (int i = 0; i < blocks.Length; i++)
+            {
+                string block = blocks[i].Trim();
+                var lines = block.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                bool blockIsStats = false;
+                foreach (string line in lines)
+                {
+                    string part = line.Trim();
+                    if (part.StartsWith("Potency:", StringComparison.OrdinalIgnoreCase))
+                    {
+                        if (hasStats) result.Add(new TooltipSegment("\n", textColor));
+                        result.Add(new TooltipSegment("Potency:", secondaryColor));
+                        result.Add(new TooltipSegment(" " + part.Substring(8).TrimStart(), textColor));
+                        hasStats = true;
+                        blockIsStats = true;
+                    }
+                    else if (part.Contains("Cast:") || part.Contains("Recast:"))
+                    {
+                        if (hasStats) result.Add(new TooltipSegment("\n", textColor));
+                        var statsSegs = FormatActionStats(part, textColor, secondaryColor);
+                        result.AddRange(statsSegs);
+                        hasStats = true;
+                        blockIsStats = true;
+                    }
+                }
+                if (!blockIsStats)
+                {
+                    descStart = i;
+                    break;
+                }
+                descStart = i + 1;
+            }
+
+            // Description: exactly one newline after stats, then description with compact section spacing
+            string desc = string.Join("\n", blocks.Skip(descStart)).Trim();
+            if (!string.IsNullOrEmpty(desc))
+            {
+                if (hasStats) result.Add(new TooltipSegment("\n", textColor));
+                var descSegs = FormatActionTooltip(desc, textColor, sectionColor, statusColor);
+                result.AddRange(descSegs);
+            }
+
+            return result.Count > 0 ? result : null;
+        }
+
+        /// <summary>
+        /// Formats action stats (Cast, Recast, Range, Radius) as colored segments.
+        /// </summary>
+        public static List<TooltipSegment> FormatActionStats(string statsLine, Vector4 textColor, Vector4 secondaryLabelColor)
+        {
+            var result = new List<TooltipSegment>();
+            if (string.IsNullOrEmpty(statsLine))
+                return result;
+
+            // statsLine format: "Cast: Instant | Recast: 60.0s | Range: 15y | Radius: 15y"
+            var parts = statsLine.Split(new[] { " | " }, StringSplitOptions.None);
+            for (int i = 0; i < parts.Length; i++)
+            {
+                if (i > 0)
+                    result.Add(new TooltipSegment(" | ", textColor));
+                int colonIdx = parts[i].IndexOf(':');
+                if (colonIdx >= 0)
+                {
+                    result.Add(new TooltipSegment(parts[i].Substring(0, colonIdx + 1), secondaryLabelColor));
+                    result.Add(new TooltipSegment(parts[i].Substring(colonIdx + 1), textColor));
+                }
+                else
+                {
+                    result.Add(new TooltipSegment(parts[i], textColor));
+                }
+            }
+            return result;
+        }
+
         private Vector2 ConstrainPosition(Vector2 position, Vector2 size)
         {
             var screenSize = ImGui.GetWindowViewport().Size;
@@ -400,17 +694,57 @@ namespace HSUI.Helpers
         public string? FontID = null;
 
         [DragFloat("Tooltip Scale", min = 0.5f, max = 2f, help = "Scale the tooltip window size. Useful for large resolutions.")]
-        [Order(6)]
+        [Order(5)]
         public float TooltipScale = 1f;
 
-        [Checkbox("Show Status Effects IDs")]
+        [DragFloat("Tooltip Max Width", min = 160f, max = 600f, help = "Maximum width of the tooltip box in pixels.")]
+        [Order(6)]
+        public float TooltipMaxWidth = 340f;
+
+        [DragFloat("Line Spacing", min = 0.2f, max = 1.5f, help = "Spacing between lines and sections (1 = normal, lower = compact).")]
         [Order(7)]
+        public float TooltipLineSpacing = 0.6f;
+
+        [DragFloat("Font Scale", min = 0.7f, max = 1.5f, help = "Scale factor for tooltip font size.")]
+        [Order(8)]
+        public float TooltipFontScale = 1f;
+
+        [DragFloat("Icon Scale", min = 0.5f, max = 2f, help = "Scale factor for the ability/status icon in tooltips.")]
+        [Order(9)]
+        public float TooltipIconScale = 1f;
+
+        [DragFloat("Height Buffer", min = 0f, max = 80f, help = "Extra space at bottom of tooltip to prevent clipping. Adjust if text is cut off.")]
+        [Order(10)]
+        public float TooltipHeightBuffer = 28f;
+
+        [Checkbox("Show Status Effects IDs")]
+        [Order(11)]
         public bool ShowStatusIDs = false;
 
+        [Checkbox("Show Action ID", help = "Show action ID in hotbar and action tooltips.")]
+        [Order(12)]
+        public bool ShowActionIDs = false;
+
         [Checkbox("Show Source Name")]
-        [Order(10)]
+        [Order(13)]
         public bool ShowSourceName = false;
 
+        [Checkbox("Game-style formatting", help = "Color section labels (Additional Effect, Duration) green, status names yellow, and add new lines between sections like the base game tooltips.")]
+        [Order(14)]
+        public bool UseGameStyleFormatting = true;
+
+        [ColorEdit4("Section Label Color", help = "Color for labels like 'Additional Effect:', 'Duration:'.")]
+        [Order(15)]
+        public PluginConfigColor SectionLabelColor = new PluginConfigColor(new(0f, 255f / 255f, 0f, 1f));
+
+        [ColorEdit4("Status Name Color", help = "Color for buff/status effect names like 'Blood of the Dragon'.")]
+        [Order(16)]
+        public PluginConfigColor StatusNameColor = new PluginConfigColor(new(255f / 255f, 255f / 255f, 0f, 1f));
+
+        [ColorEdit4("Secondary Label Color", help = "Color for Cast, Recast, Range, Radius labels.")]
+        [Order(17)]
+        public PluginConfigColor SecondaryLabelColor = new PluginConfigColor(new(204f / 255f, 204f / 255f, 204f / 255f, 1f));
+
         [ColorEdit4("Background Color")]
         [Order(15)]
         public PluginConfigColor BackgroundColor = new PluginConfigColor(new(19f / 255f, 19f / 255f, 19f / 255f, 190f / 250f));

Interface/GeneralElements/ActionBarsHud.cs

@@ -253,7 +253,7 @@ namespace HSUI.Interface.GeneralElements
             });
 
             // Overlay at HIGHEST so it captures input above the bar; required for icon swap.
-            // Use unique ID per hotbar to avoid any cross-bar conflicts (bar 2–10 had input capture issues).
+            // Draw as a child of HSUI_HUD so hovering does not create a separate toplevel window that hides other HSUI elements.
             AddDrawAction(StrataLevel.HIGHEST, () =>
             {
                 var slots = ActionBarsManager.Instance.GetSlotData(Config.HotbarIndex, Config.SlotCount);
@@ -262,13 +262,11 @@ namespace HSUI.Interface.GeneralElements
                     | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus
                     | ImGuiWindowFlags.NoNav;
 
-                ImGuiHelpers.ForceNextWindowMainViewport();
-                ImGui.SetNextWindowPos(topLeft);
-                ImGui.SetNextWindowSize(barSize);
                 string overlayId = $"HSUI_Hotbar{Config.HotbarIndex}_input";
-                if (!ImGui.Begin(overlayId, flags))
+                ImGui.SetCursorScreenPos(topLeft);
+                if (!ImGui.BeginChild(overlayId, barSize, false, flags))
                 {
-                    ImGui.End();
+                    ImGui.EndChild();
                     return;
                 }
 
@@ -372,7 +370,9 @@ namespace HSUI.Interface.GeneralElements
                             if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
                             {
                                 string body = string.IsNullOrEmpty(text) ? title : text;
-                                TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null);
+                                var tooltipConfig = ConfigurationManager.Instance?.GetConfigObject<HSUI.Helpers.TooltipsConfig>();
+                                var formatted = tooltipConfig != null ? TooltipsHelper.BuildFormattedActionTooltipBody(body, tooltipConfig) : null;
+                                TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, Helpers.TooltipIdKind.Action, formatted);
                                 if (IsTooltipDebugEnabled())
                                     Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'");
                             }
@@ -394,7 +394,7 @@ namespace HSUI.Interface.GeneralElements
                     _lastLoggedPickupSlotId = -1;
                 }
 
-                ImGui.End();
+                ImGui.EndChild();
             });
         }
 
@@ -431,7 +431,9 @@ namespace HSUI.Interface.GeneralElements
                         if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
                         {
                             string body = string.IsNullOrEmpty(text) ? title : text;
-                            TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null);
+                            var tooltipConfig = ConfigurationManager.Instance?.GetConfigObject<HSUI.Helpers.TooltipsConfig>();
+                            var formatted = tooltipConfig != null ? TooltipsHelper.BuildFormattedActionTooltipBody(body, tooltipConfig) : null;
+                            TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, Helpers.TooltipIdKind.Action, formatted);
                             if (IsTooltipDebugEnabled())
                                 Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'");
                         }
@@ -604,7 +606,7 @@ namespace HSUI.Interface.GeneralElements
                     if (ImGui.IsMouseReleased(ImGuiMouseButton.Left))
                     {
                         int releaseIdx = GetSlotIndexAtPosition(topLeft, barSize, slotSize, pad, Config.SlotCount, Config.GetLayoutGrid().Cols, mp, debug);
-                        if (releaseIdx >= 0 && slotType != RaptureHotbarModule.HotbarSlotType.Empty && (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro))
+                        if (releaseIdx >= 0 && slotType != RaptureHotbarModule.HotbarSlotType.Empty && (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet))
                         {
                             if (!ImGui.GetIO().KeyShift)
                             {
@@ -703,7 +705,7 @@ namespace HSUI.Interface.GeneralElements
                     // stale (e.g. from macro menu UI), causing wrong placements (macro drag -> GeneralAction placed).
                     // If we never got valid payload (e.g. Macro Int2=0), skip the place.
                     bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty &&
-                        (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro);
+                        (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet);
 
                     if (hasValidPayload)
                     {
@@ -1094,7 +1096,9 @@ namespace HSUI.Interface.GeneralElements
 
         private static unsafe uint GetIconIdForPayload(RaptureHotbarModule.HotbarSlotType slotType, uint id)
         {
-            if (id == 0) return 0;
+            // id 0 is valid for GearSet (first gearset in list) and Macro; don't short-circuit for those
+            if (id == 0 && slotType != RaptureHotbarModule.HotbarSlotType.GearSet && slotType != RaptureHotbarModule.HotbarSlotType.Macro)
+                return 0;
             if (slotType == RaptureHotbarModule.HotbarSlotType.Macro)
             {
                 var macroModule = RaptureMacroModule.Instance();
@@ -1152,6 +1156,19 @@ namespace HSUI.Interface.GeneralElements
         }
 
         private static unsafe (string title, string text) GetSlotTooltip(ActionBarsManager.SlotInfo slot)
+        {
+            try
+            {
+                return GetSlotTooltipCore(slot);
+            }
+            catch
+            {
+                // Lumina GetRow can throw for invalid/transitional row IDs (e.g. during inventory drag-drop)
+                return ("", "");
+            }
+        }
+
+        private static unsafe (string title, string text) GetSlotTooltipCore(ActionBarsManager.SlotInfo slot)
         {
             // GeneralAction uses a different ID space: GeneralAction 7 = Teleport links to Action 5. Look up via GeneralAction sheet.
             if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.GeneralAction)
@@ -1194,33 +1211,126 @@ namespace HSUI.Interface.GeneralElements
                 slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
                 slot.SlotType == RaptureHotbarModule.HotbarSlotType.PetAction)
             {
-                var row = Plugin.DataManager.GetExcelSheet<LuminaAction>()?.GetRow(slot.ActionId);
+                uint actionIdForLookup = slot.ActionId;
+                LuminaAction? actionRow = null;
+
+                var actionSheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
+                if (actionSheet != null)
+                {
+                    if (actionSheet.TryGetRow(slot.ActionId, out var actionRowOpt))
+                    {
+                        actionRow = actionRowOpt;
+                    }
+                    else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
+                    {
+                        // Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
+                        const uint CraftActionToActionOffset = 100000;
+                        uint mappedId = slot.ActionId + CraftActionToActionOffset;
+                        if (actionSheet.TryGetRow(mappedId, out var mappedRow))
+                        {
+                            actionIdForLookup = mappedId;
+                            actionRow = mappedRow;
+                        }
+                    }
+                }
+
+                // CraftAction fallback: when Action sheet lookup failed, try CraftAction sheet directly (hotbar stores CraftAction row ID).
+                if (!actionRow.HasValue && slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
+                {
+                    var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
+                    if (craftSheet != null && craftSheet.TryGetRow(slot.ActionId, out var craftRow))
+                    {
+                        try
+                        {
+                            var nameSe = craftRow.Name;
+                            string name = nameSe.ToString();
+                            if (string.IsNullOrWhiteSpace(name))
+                                name = nameSe.ToDalamudString().ToString();
+                            if (!string.IsNullOrWhiteSpace(name))
+                            {
+                                // CraftAction sheet has its own Description column with the full text
+                                string desc = "";
+                                try
+                                {
+                                    var descSe = craftRow.Description;
+                                    var descRaw = descSe.ToDalamudString().ToString();
+                                    if (!string.IsNullOrEmpty(descRaw))
+                                    {
+                                        try
+                                        {
+                                            var evaluated = Plugin.SeStringEvaluator.Evaluate(descSe.AsSpan());
+                                            desc = evaluated.ExtractText();
+                                            if (string.IsNullOrEmpty(desc)) desc = descRaw;
+                                        }
+                                        catch { desc = descRaw; }
+                                        if (!string.IsNullOrEmpty(desc))
+                                            desc = EncryptedStringsHelper.GetString(desc);
+                                    }
+                                }
+                                catch { /* ignore */ }
+                                return (name, desc);
+                            }
+                        }
+                        catch { /* ignore */ }
+                    }
+                }
+
+                var row = actionRow;
                 if (row.HasValue)
                 {
                     string name = row.Value.Name.ToString();
                     string desc = "";
-                    var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(slot.ActionId);
                     string descRaw = "";
-                    if (descRow.HasValue)
+                    // For CraftAction, use CraftAction.Description; ActionTransient returns the name instead of the full description
+                    if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
                     {
-                        try
+                        var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
+                        if (craftSheet != null && craftSheet.TryGetRow(actionIdForLookup, out var craftRow))
                         {
-                            var descSeStr = descRow.Value.Description;
-                            descRaw = descRow.Value.Description.ToDalamudString().ToString();
                             try
                             {
-                                var evaluated = Plugin.SeStringEvaluator.Evaluate(descSeStr.AsSpan());
-                                desc = evaluated.ExtractText();
-                                if (string.IsNullOrEmpty(desc)) desc = descRaw;
+                                var descSe = craftRow.Description;
+                                var craftDescRaw = descSe.ToDalamudString().ToString();
+                                if (!string.IsNullOrEmpty(craftDescRaw))
+                                {
+                                    try
+                                    {
+                                        var evaluated = Plugin.SeStringEvaluator.Evaluate(descSe.AsSpan());
+                                        desc = evaluated.ExtractText();
+                                        if (string.IsNullOrEmpty(desc)) desc = craftDescRaw;
+                                    }
+                                    catch { desc = craftDescRaw; }
+                                    if (!string.IsNullOrEmpty(desc))
+                                        desc = EncryptedStringsHelper.GetString(desc);
+                                }
                             }
-                            catch
-                            {
-                                desc = descRaw;
-                            }
-                            if (!string.IsNullOrEmpty(desc))
-                                desc = EncryptedStringsHelper.GetString(desc);
+                            catch { /* ignore */ }
+                        }
+                    }
+                    else
+                    {
+                        var descSheet = Plugin.DataManager.GetExcelSheet<ActionTransient>();
+                        if (descSheet != null && descSheet.TryGetRow(actionIdForLookup, out var descRow))
+                        {
+                            try
+                            {
+                                var descSeStr = descRow.Description;
+                                descRaw = descRow.Description.ToDalamudString().ToString();
+                                try
+                                {
+                                    var evaluated = Plugin.SeStringEvaluator.Evaluate(descSeStr.AsSpan());
+                                    desc = evaluated.ExtractText();
+                                    if (string.IsNullOrEmpty(desc)) desc = descRaw;
+                                }
+                                catch
+                                {
+                                    desc = descRaw;
+                                }
+                                if (!string.IsNullOrEmpty(desc))
+                                    desc = EncryptedStringsHelper.GetString(desc);
+                            }
+                            catch { /* ignore */ }
                         }
-                        catch { /* ignore */ }
                     }
                     bool isCombatAction = IsCombatAction(slot.SlotType, row.Value);
                     int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null;
@@ -1335,13 +1445,13 @@ namespace HSUI.Interface.GeneralElements
 
             if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.Item)
             {
-                var row = Plugin.DataManager.GetExcelSheet<Item>()?.GetRow(slot.ActionId);
-                if (row.HasValue)
+                uint baseItemId = slot.ActionId >= 1000000 ? slot.ActionId - 1000000 : slot.ActionId;
+                if (Plugin.DataManager.GetExcelSheet<Item>()?.TryGetRow(baseItemId, out var itemRow) == true)
                 {
-                    string name = row.Value.Name.ToString();
+                    string name = itemRow.Name.ToString();
                     try
                     {
-                        string desc = row.Value.Description.ToDalamudString().ToString();
+                        string desc = itemRow.Description.ToDalamudString().ToString();
                         if (!string.IsNullOrEmpty(desc))
                             desc = EncryptedStringsHelper.GetString(desc);
                         return (name, desc);

Interface/GeneralElements/MouseGCDIndicatorConfig.cs

@@ -0,0 +1,74 @@
+using HSUI.Config;
+using HSUI.Config.Attributes;
+using HSUI.Enums;
+using System.Numerics;
+
+namespace HSUI.Interface.GeneralElements
+{
+    [DisableParentSettings("Position")]
+    [Section("Other Elements")]
+    [SubSection("Mouse GCD Indicator", 0)]
+    public class MouseGCDIndicatorConfig : MovablePluginConfigObject
+    {
+        [Checkbox("Always Show")]
+        [Order(3)]
+        public bool AlwaysShow = false;
+
+        [ColorEdit4("Background Color")]
+        [Order(16)]
+        public PluginConfigColor BackgroundColor = new PluginConfigColor(new Vector4(0f / 255f, 0f / 255f, 0f / 255f, 50f / 100f));
+
+        [ColorEdit4("Color")]
+        [Order(17)]
+        public PluginConfigColor FillColor = new PluginConfigColor(new(220f / 255f, 220f / 255f, 220f / 255f, 100f / 100f));
+
+        [Checkbox("Show Border")]
+        [Order(18)]
+        public bool ShowBorder = true;
+
+        [Checkbox("Instant GCDs only", spacing = true)]
+        [Order(19)]
+        public bool InstantGCDsOnly = false;
+
+        [Checkbox("Only show when under GCD Threshold", spacing = true)]
+        [Order(20)]
+        public bool LimitGCDThreshold = false;
+
+        [DragFloat("GCD Threshold", velocity = 0.01f)]
+        [Order(21, collapseWith = nameof(LimitGCDThreshold))]
+        public float GCDThreshold = 1.50f;
+
+        [Checkbox("Show GCD Queue Indicator", spacing = true)]
+        [Order(24)]
+        public bool ShowGCDQueueIndicator = true;
+
+        [ColorEdit4("GCD Queue Color")]
+        [Order(25, collapseWith = nameof(ShowGCDQueueIndicator))]
+        public PluginConfigColor QueueColor = new PluginConfigColor(new(13f / 255f, 207f / 255f, 31f / 255f, 100f / 100f));
+
+        [DragInt("Radius")]
+        [Order(35)]
+        public int CircleRadius = 40;
+
+        [DragInt("Thickness")]
+        [Order(40)]
+        public int CircleThickness = 10;
+
+        [DragInt("Start Angle", min = 0, max = 359)]
+        [Order(45)]
+        public int CircleStartAngle = 0;
+
+        [Checkbox("Rotate CCW")]
+        [Order(50)]
+        public bool RotateCCW = false;
+
+        [DragInt2("Cursor Center Offset", min = -64, max = 64)]
+        [Order(55)]
+        public Vector2 CursorCenterOffset = new Vector2(8, 16);
+
+        [NestedConfig("Visibility", 70)]
+        public VisibilityConfig VisibilityConfig = new VisibilityConfig();
+
+        public new static MouseGCDIndicatorConfig DefaultConfig() { return new MouseGCDIndicatorConfig() { Enabled = false, Strata = StrataLevel.MID_HIGH }; }
+    }
+}

Interface/GeneralElements/MouseGCDIndicatorHud.cs

@@ -0,0 +1,140 @@
+using System;
+using HSUI.Helpers;
+using Dalamud.Bindings.ImGui;
+using System.Collections.Generic;
+using System.Numerics;
+using HSUI.Config;
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Game.ClientState.Objects.Types;
+
+namespace HSUI.Interface.GeneralElements
+{
+    public class MouseGCDIndicatorHud : DraggableHudElement, IHudElementWithActor, IHudElementWithVisibilityConfig
+    {
+        private MouseGCDIndicatorConfig Config => (MouseGCDIndicatorConfig)_config;
+        public VisibilityConfig VisibilityConfig => Config.VisibilityConfig;
+
+        public IGameObject? Actor { get; set; } = null;
+
+        private float _lastTotalCastTime = 0;
+
+        public MouseGCDIndicatorHud(MouseGCDIndicatorConfig config, string displayName) : base(config, displayName) { }
+
+        protected override (List<Vector2>, List<Vector2>) ChildrenPositionsAndSizes()
+        {
+            return (new List<Vector2>(), new List<Vector2>());
+        }
+
+        protected override void DrawDraggableArea(Vector2 origin)
+        {
+            return;
+        }
+
+        public override void DrawChildren(Vector2 origin)
+        {
+            if (!Config.Enabled || Actor == null || Actor is not IPlayerCharacter)
+            {
+                return;
+            }
+
+            GCDHelper.GetGCDInfo((IPlayerCharacter)Actor, out var elapsed, out var total);
+
+            if (!Config.AlwaysShow && total == 0)
+            {
+                _lastTotalCastTime = 0;
+                return;
+            }
+
+            if (_lastTotalCastTime == 0 && Utils.IsActorCasting(Actor))
+            {
+                _lastTotalCastTime = ((IBattleChara)Actor).TotalCastTime;
+            }
+
+            var scale = elapsed / total;
+            if (scale <= 0)
+            {
+                _lastTotalCastTime = 0;
+                return;
+            }
+
+            bool instantGCDsOnly = Config.InstantGCDsOnly && _lastTotalCastTime != 0;
+            bool thresholdGCDs = Config.LimitGCDThreshold && _lastTotalCastTime > Config.GCDThreshold;
+
+            if (instantGCDsOnly || thresholdGCDs)
+            {
+                if (Config.AlwaysShow)
+                {
+                    elapsed = 0;
+                    total = 0;
+                }
+                else
+                {
+                    return;
+                }
+            }
+
+            Vector2 center = ImGui.GetMousePos() + Config.CursorCenterOffset;
+            AddDrawAction(_config.StrataLevel, () =>
+            {
+                DrawCircularIndicator(center, Config.CircleRadius, elapsed, total);
+            });
+        }
+
+        private void DrawCircularIndicator(Vector2 position, float radius, float current, float total)
+        {
+            total = Config.AlwaysShow && total == 0 ? 1 : total;
+            current = Config.AlwaysShow && current == 0 ? total : current;
+
+            var size = new Vector2(radius * 2);
+            DrawHelper.DrawInWindow(ID, position - size / 2, size, false, (drawList) =>
+            {
+                current = Math.Min(current, total);
+
+                const int segments = 100;
+                const float queueTime = 0.5f;
+                float startAngle = 0f;
+                float endAngle = 2f * (float)Math.PI;
+                float offset = (float)(-Math.PI / 2f + (Config.CircleStartAngle * (Math.PI / 180f)));
+
+                if (Config.RotateCCW)
+                {
+                    startAngle *= -1;
+                    endAngle *= -1;
+                }
+
+                if (Config.AlwaysShow && current == total)
+                {
+                    drawList.PathArcTo(position, radius, startAngle + offset, endAngle + offset, segments);
+                    drawList.PathStroke(Config.FillColor.Base, ImDrawFlags.None, Config.CircleThickness);
+                }
+                else
+                {
+                    float progressAngle = Math.Min(current, total - (Config.ShowGCDQueueIndicator ? queueTime : 0f)) / total * endAngle;
+
+                    drawList.PathArcTo(position, radius, startAngle + offset, progressAngle + offset, segments);
+                    drawList.PathStroke(Config.FillColor.Base, ImDrawFlags.None, Config.CircleThickness);
+
+                    if (Config.ShowGCDQueueIndicator && current > total - queueTime)
+                    {
+                        float oldAngle = progressAngle - 0.0003f * total * endAngle;
+                        progressAngle = current / total * endAngle;
+                        drawList.PathArcTo(position, radius, oldAngle + offset, progressAngle + offset, segments);
+                        drawList.PathStroke(Config.QueueColor.Base, ImDrawFlags.None, Config.CircleThickness);
+                    }
+
+                    drawList.PathArcTo(position, radius, progressAngle + offset, endAngle + offset, segments);
+                    drawList.PathStroke(Config.BackgroundColor.Base, ImDrawFlags.None, Config.CircleThickness);
+                }
+
+                if (Config.ShowBorder)
+                {
+                    drawList.PathArcTo(position, radius - Config.CircleThickness / 2f, 0, endAngle, segments);
+                    drawList.PathStroke(0xFF000000, ImDrawFlags.None, 1);
+
+                    drawList.PathArcTo(position, radius + Config.CircleThickness / 2f, 0, endAngle, segments);
+                    drawList.PathStroke(0xFF000000, ImDrawFlags.None, 1);
+                }
+            });
+        }
+    }
+}

Interface/GeneralElements/VisibilityConfig.cs

@@ -96,6 +96,9 @@ namespace HSUI.Interface
             if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; }
             if (element != null && !element.GetConfig().Enabled) { return false; }
 
+            // Alliance frames only matter in alliance raids (duty). HideInDuty would hide them exactly when needed.
+            bool isAllianceFrames = element != null && element.GetType() == typeof(AllianceFramesHud);
+
             bool isInIslandSanctuary = IsInIslandSanctuary();
             bool isInDuty = IsInDuty() && !isInIslandSanctuary;
             IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer;
@@ -127,7 +130,8 @@ namespace HSUI.Interface
 
             if (HideOnFullHP && player != null && player.CurrentHp == player.MaxHp) { return false; }
 
-            if (HideInDuty && isInDuty) { return false; }
+            // Alliance frames only matter in alliance raids (duty). Skip HideInDuty for them.
+            if (HideInDuty && isInDuty && !isAllianceFrames) { return false; }
 
             if (HideInIslandSanctuary && isInIslandSanctuary) { return false; }
 

Interface/HudManager.cs

@@ -379,6 +379,11 @@ namespace HSUI.Interface
             _hudElements.Add(gcdIndicatorConfig, gcdIndicator);
             _hudElementsUsingPlayer.Add(gcdIndicator);
 
+            var mouseGcdIndicatorConfig = ConfigurationManager.Instance.GetConfigObject<MouseGCDIndicatorConfig>();
+            var mouseGcdIndicator = new MouseGCDIndicatorHud(mouseGcdIndicatorConfig, "Mouse GCD Indicator");
+            _hudElements.Add(mouseGcdIndicatorConfig, mouseGcdIndicator);
+            _hudElementsUsingPlayer.Add(mouseGcdIndicator);
+
             var mpTickerConfig = ConfigurationManager.Instance.GetConfigObject<MPTickerConfig>();
             var mpTicker = new MPTickerHud(mpTickerConfig, "MP Ticker");
             _hudElements.Add(mpTickerConfig, mpTicker);

Interface/Nameplates/NameplateConfig.cs

@@ -45,10 +45,6 @@ namespace HSUI.Interface.GeneralElements
         [Order(21)]
         public bool AlwaysShowTargetNameplate = true;
 
-        [Checkbox("In PvP, show only enemy player nameplates", spacing = true, help = "When in Frontlines, Rival Wings, or Crystal Conflict, hide ally player nameplates (party, alliance, teammates) and show only enemy players. Uses Enemy nameplate styling for PvP enemies.")]
-        [Order(22)]
-        public bool PvPShowOnlyEnemyPlayers = false;
-
         public int RaycastFlag() => OcclusionType == NameplatesOcclusionType.WallsAndObjects ? 0x2000 : 0x4000;
     }
 

Interface/Nameplates/NameplatesHud.cs

@@ -128,23 +128,6 @@ namespace HSUI.Interface.Nameplates
                         return _playerHud;
                     }
 
-                    // In PvP, optionally show only enemy player nameplates (hide allies)
-                    if (Config.PvPShowOnlyEnemyPlayers && Plugin.ClientState.IsPvP)
-                    {
-                        if (data.GameObject is ICharacter character)
-                        {
-                            if ((character.StatusFlags & StatusFlags.PartyMember) != 0 ||
-                                (character.StatusFlags & StatusFlags.AllianceMember) != 0 ||
-                                (character.StatusFlags & StatusFlags.Friend) != 0)
-                            {
-                                return null; // Hide party, alliance, and friend nameplates
-                            }
-                        }
-                        // Other players: show only hostile (enemy team), hide allies
-                        if (data.GameObject == null) { return null; }
-                        return Utils.IsHostile(data.GameObject) ? _enemyHud : null;
-                    }
-
                     if (data.GameObject is ICharacter character2)
                     {
                         if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember

Interface/Party/AllianceManager.cs

@@ -280,34 +280,18 @@ namespace HSUI.Interface.Party
             bool anyChanged = false;
             ref var mainGroup = ref gm->MainGroup;
 
+            // GroupManager layout: _allianceMembers flat array (indices 0-19) has groups 0 and 1.
+            // Group 2 (our party) is stored in _partyMembers. GetAllianceMemberByGroupAndIndex(0/1, slot)
+            // returns empty in-instance for some game versions; use GetAllianceMemberByIndex with flat
+            // indices: group 0 = indices 0-7, group 1 = indices 8-15.
             for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++)
             {
                 int count = 0;
                 var list = new List<IPartyFramesMember>();
 
-                for (int slot = 0; slot < 8; slot++)
-                {
-                    var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
-                    if (pm == null || pm->EntityId == 0) continue;
-                    var pfMember = new PartyFramesMember(
-                        pm->EntityId,
-                        count,
-                        count,
-                        EnmityLevel.Last,
-                        PartyMemberStatus.None,
-                        ReadyCheckStatus.None,
-                        false,
-                        false
-                    );
-                    pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
-                    list.Add(pfMember);
-                    count++;
-                }
-
-                // GroupManager stores our party in _partyMembers, not GetAllianceMemberByGroupAndIndex.
-                // When group 2 is empty, it's our alliance—populate from GetPartyMemberByIndex.
-                if (count == 0 && allianceIdx == 2)
+                if (allianceIdx == 2)
                 {
+                    // Our party: _partyMembers via GetPartyMemberByIndex
                     for (int slot = 0; slot < 8; slot++)
                     {
                         var pm = mainGroup.GetPartyMemberByIndex(slot);
@@ -327,6 +311,29 @@ namespace HSUI.Interface.Party
                         count++;
                     }
                 }
+                else
+                {
+                    // Other alliances: _allianceMembers flat indices. Group 0 = 0-7, group 1 = 8-15.
+                    int baseIdx = allianceIdx * 8;
+                    for (int slot = 0; slot < 8; slot++)
+                    {
+                        var pm = mainGroup.GetAllianceMemberByIndex(baseIdx + slot);
+                        if (pm == null || pm->EntityId == 0) continue;
+                        var pfMember = new PartyFramesMember(
+                            pm->EntityId,
+                            count,
+                            count,
+                            EnmityLevel.Last,
+                            PartyMemberStatus.None,
+                            ReadyCheckStatus.None,
+                            false,
+                            false
+                        );
+                        pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
+                        list.Add(pfMember);
+                        count++;
+                    }
+                }
 
                 if (count != _lastMemberCounts[allianceIdx])
                 {
@@ -340,9 +347,11 @@ namespace HSUI.Interface.Party
                     int ourIdx = 0;
                     for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
                     {
-                        PartyMember* pm = allianceIdx == 2
-                            ? mainGroup.GetPartyMemberByIndex(slot)
-                            : mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
+                        PartyMember* pm;
+                        if (allianceIdx == 2)
+                            pm = mainGroup.GetPartyMemberByIndex(slot);
+                        else
+                            pm = mainGroup.GetAllianceMemberByIndex(allianceIdx * 8 + slot);
                         if (pm == null || pm->EntityId == 0) continue;
                         if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember)
                             pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);

Interface/Party/PartyFramesCooldownListHud.cs

@@ -289,7 +289,8 @@ namespace HSUI.Interface.Party
                         hoveringCooldown.Data.Name,
                         hoveringCooldown.Data.ActionId,
                         "",
-                        iconId
+                        iconId,
+                        HSUI.Helpers.TooltipIdKind.Action
                     );
                 }
             }

Interface/PartyCooldowns/PartyCooldownsHud.cs

@@ -310,7 +310,8 @@ namespace HSUI.Interface.PartyCooldowns
                             cooldown.Data.Name,
                             cooldown.Data.ActionId,
                             "",
-                            iconId
+                            iconId,
+                            HSUI.Helpers.TooltipIdKind.Action
                         );
                     }
 

Interface/StatusEffects/StatusEffectsListHud.cs

@@ -474,7 +474,8 @@ namespace HSUI.Interface.StatusEffects
                         EncryptedStringsHelper.GetString(data.Data.Name.ToString()),
                         data.Status.StatusId,
                         GetStatusActorName(data.Status),
-                        iconId
+                        iconId,
+                        HSUI.Helpers.TooltipIdKind.Status
                     );
                 }
 

Plugin.cs

@@ -438,6 +438,9 @@ namespace HSUI
         {
             if (!disposing) return;
 
+            // Restore game window WndProc first so left-click works again immediately, even if teardown throws.
+            InputsHelper.RestoreWndProcIfNeeded();
+
             // Stop UI callbacks first so no Draw/OpenConfigUi runs during teardown
             try
             {

changelog.md

@@ -1,3 +1,49 @@
+# 1.0.8.14
+- **Mouse GCD Indicator**: New HUD element (Other Elements → Mouse GCD Indicator) — circular GCD ring drawn around the cursor. Configurable radius, thickness, colors, queue indicator, and cursor center offset so the ring aligns with the cursor graphic.
+
+# 1.0.8.13
+- **Hotbars**: Fixed item tooltips not showing — use TryGetRow for Item sheet and base item ID so tooltip no longer fails for some items.
+
+# 1.0.8.12
+- **Hotbars**: Fixed item icons not drawing on hotbar — game encodes HQ items as iconId + 1000000; now use iconId % 1000000 and itemHq flag so item icons (including HQ) display correctly.
+
+# 1.0.8.11
+- **Hotbars**: Fixed tooltip crash — Lumina GetRow can throw for invalid/transitional row IDs (e.g. during inventory drag-drop); GetSlotTooltip now catches and returns empty instead of crashing.
+
+# 1.0.8.10
+- **Hotbars**: Fixed crash when dragging items from inventory to hotbar — GetFromGameIcon can throw for invalid/unsupported icon IDs; now handled gracefully.
+- **Build**: Release builds no longer emit PDBs to avoid local path leakage in user crash logs.
+
+# 1.0.8.9
+- **Hotbars**: Gearset on slot now persists — do not treat slot as empty when CommandType is GearSet (gearset index 0 uses CommandId 0). Use CommandType/CommandId for GearSet display and resolve icon when IconId is still 0.
+
+# 1.0.8.8
+- **Hotbars**: Only refresh icon via LoadIconId() for GearSet slots so drag-and-drop of gearsets onto the bar works again.
+- **Hotbars**: Allow gearset index 0 (top-most gearset in list) — drop validation and icon lookup now accept id 0 for GearSet type.
+
+# 1.0.8.7
+- **Hotbars**: Fixed Gearset/Job Gear Set icon clearing when the first equipment slot in the gearset changes — call LoadIconId() before reading slot IconId so the game populates the icon from the gearset (e.g. job icon).
+
+# 1.0.8.6
+- **Hotbars**: Fixed crafting action tooltips showing the action name instead of the full description — use CraftAction.Description directly instead of ActionTransient, which returns the name for crafting actions.
+
+# 1.0.8.5
+- **Hotbars**: Fixed other HSUI elements disappearing when hovering over hotbar icons — overlay is now a child of the main HUD window instead of a separate window.
+
+# 1.0.8.4
+- **Alliance Frames**: Fixed frames 1 and 2 not showing in alliance raids — populate other alliances via flat GetAllianceMemberByIndex (indices 0–7, 8–15) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance.
+- **Alliance Frames**: Visibility "Hide in duty" no longer hides alliance frames (they are only relevant in duty).
+- **Hotbars**: Crafting job action tooltips now display — fallback Action sheet lookup when hotbar stores CraftAction row ID.
+
+# 1.0.8.3
+- **Fix**: Left-click no longer sometimes stays broken after disabling HSUI. WndProc is restored at the very start of plugin teardown so the game window gets normal input back even if disposal fails later.
+
+# 1.0.8.2
+- **Action bars**: Charge icons stay lit until all charges are spent — uses the slot’s recast charge count and ActionManager so abilities with charges remaining no longer grey out incorrectly.
+
+# 1.0.8.1
+- **Action bars**: Do not grey out action icons until all charges are spent (initial fix for multi-charge abilities).
+
 # 1.0.8.0
 - **Action Chat Link**: Shift+click an action in the Actions & Traits menu to insert "You should check out {ActionName}" into chat (or clipboard if chat not focused). Enable in Misc → World Tooltip. Restricted to Actions & Traits only — hotbar shift+click unaffected.
 - **Fix**: Job-specific hotbar actions now persist when changing jobs. Explicitly write to the current class job ID so saves survive job/role switches.

pluginmaster.json

@@ -1,24 +1 @@
-[
-  {
-    "Author": "Knack117",
-    "Name": "HSUI",
-    "Punchline": "A modern HUD replacement built for customization.",
-    "Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
-    "Changelog": "Action Chat Link: Shift+click actions in Actions & Traits to insert 'You should check out X' into chat. Fix: Job-specific hotbar actions now persist when changing jobs.",
-    "InternalName": "HSUI",
-    "AssemblyVersion": "1.0.8.0",
-    "RepoUrl": "https://github.com/Knack117/HSUI",
-    "ApplicableVersion": "any",
-    "Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
-    "CategoryTags": ["UI"],
-    "DalamudApiLevel": 14,
-    "IconUrl": "https://raw.githubusercontent.com/Knack117/HSUI/main/Media/Images/icon.png",
-    "ImageUrls": [],
-    "DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
-    "IsHide": false,
-    "IsTestingExclusive": false,
-    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
-    "LastUpdate": "1770007214"
-  }
-]
+[{"Author":"Knack117","Name":"HSUI","Punchline":"A modern HUD replacement built for customization.","Description":"HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.","Changelog":"1.0.8.14: Mouse GCD Indicator (ring around cursor). 1.0.8.13: Item tooltips now show. 1.0.8.12: Item/HQ icons now draw on hotbar. 1.0.8.11: Hotbar tooltip crash fix (Lumina GetRow). 1.0.8.10: Hotbar crash fix when dragging inventory items; Release builds strip PDBs. 1.0.8.9: Gearset persists on slot (fix CommandId 0 treated as empty). 1.0.8.8: Gearset drag-drop fix; allow first gearset (index 0) on bar. 1.0.8.7: Fixed Gearset/Job Gear Set icon clearing when first equipment slot changes. 1.0.8.6: Crafting action tooltips now show full description instead of action name. 1.0.8.4: Alliance Frames 1 and 2 fix in raids; crafting action tooltips; Hide in duty no longer hides alliance frames. 1.0.8.3: Fix left-click staying broken after disable. 1.0.8.2: Charge icons stay lit until all charges spent.","InternalName":"HSUI","AssemblyVersion":"1.0.8.14","RepoUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI","ApplicableVersion":"any","Tags":["UI","HUD","Unit Frames","Nameplates","Party Frames","Hotbars"],"CategoryTags":["UI"],"DalamudApiLevel":14,"IconUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/raw/branch/main/Media/Images/icon.png","ImageUrls":[],"DownloadLinkInstall":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.14/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.14/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.14/latest.zip","LastUpdate":"1760486400"}]