v1.0.8.13: Item tooltips (TryGetRow + base item ID)

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

Config/ImportConfig.cs

@@ -45,12 +45,6 @@ namespace HSUI.Interface
             }
 
             ImGuiHelper.DrawSeparator(1, 1);
-            ImGui.Text("To browse presets made by users of the HSUI community join our Discord and find the #profiles channel.");
-
-            if (ImGui.Button("HSUI Discord", new Vector2(560, 24)))
-            {
-                Utils.OpenUrl("https://discord.gg/xzde5qQayh");
-            }
 
             // error modal
             if (_errorMessage != null)

Config/Tree/BaseNode.cs

@@ -241,32 +241,6 @@ namespace HSUI.Config.Tree
                         ImGui.PopStyleColor();
                         ImGui.PopFont();
                         ImGuiHelper.SetTooltip("Changelog");
-
-                        // discord button
-                        ImGui.PushFont(UiBuilder.IconFont);
-                        ImGui.PushStyleColor(ImGuiCol.Button, new Vector4(114f / 255f, 137f / 255f, 218f / 255f, alpha));
-                        ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(114f / 255f, 137f / 255f, 218f / 255f, alpha * .85f));
-                        ImGui.SetCursorPos(new Vector2(48 * _scale, y));
-                        if (ImGui.Button(FontAwesomeIcon.Link.ToIconString(), new Vector2(24 * _scale, 24 * _scale)))
-                        {
-                            Utils.OpenUrl("https://discord.gg/xzde5qQayh");
-                        }
-                        ImGui.PopStyleColor(2);
-                        ImGui.PopFont();
-                        ImGuiHelper.SetTooltip("HSUI Discord");
-
-                        // discord button
-                        ImGui.PushFont(UiBuilder.IconFont);
-                        ImGui.PushStyleColor(ImGuiCol.Button, new Vector4(255f / 255f, 94f / 255f, 91f / 255f, alpha));
-                        ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(255f / 255f, 94f / 255f, 91f / 255f, alpha * .85f));
-                        ImGui.SetCursorPos(new Vector2(77 * _scale, y));
-                        if (ImGui.Button(FontAwesomeIcon.MugHot.ToIconString(), new Vector2(24 * _scale, 24 * _scale)))
-                        {
-                            Utils.OpenUrl("https://ko-fi.com/Tischel");
-                        }
-                        ImGui.PopStyleColor(2);
-                        ImGui.PopFont();
-                        ImGuiHelper.SetTooltip("Tip the developer at ko-fi.com");
                     }
 
                     ImGui.EndChild();

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.3.0</AssemblyVersion>
-		<FileVersion>1.0.3.0</FileVersion>
-		<InformationalVersion>1.0.3.0</InformationalVersion>
+		<AssemblyVersion>1.0.8.13</AssemblyVersion>
+		<FileVersion>1.0.8.13</FileVersion>
+		<InformationalVersion>1.0.8.13</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.3.0",
+  "AssemblyVersion": "1.0.8.13",
   "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

@@ -50,8 +50,12 @@ namespace HSUI.Helpers
             public RaptureHotbarModule.HotbarSlotType SlotType { get; }
             /// <summary>Keybind hint from game (user's keybind settings). Empty if unavailable.</summary>
             public string KeybindHint { get; }
+            /// <summary>Current charges for charge-based actions; 0 when not applicable.</summary>
+            public int CurrentCharges { get; }
+            /// <summary>Max charges for charge-based actions; &gt;1 only for actions with charges.</summary>
+            public int MaxCharges { get; }
 
-            public SlotInfo(uint iconId, bool isEmpty, bool usable, int cooldownPct, int cooldownSecs, uint actionId = 0, RaptureHotbarModule.HotbarSlotType slotType = 0, string keybindHint = "")
+            public SlotInfo(uint iconId, bool isEmpty, bool usable, int cooldownPct, int cooldownSecs, uint actionId = 0, RaptureHotbarModule.HotbarSlotType slotType = 0, string keybindHint = "", int currentCharges = 0, int maxCharges = 0)
             {
                 IconId = iconId;
                 IsEmpty = isEmpty;
@@ -61,6 +65,8 @@ namespace HSUI.Helpers
                 ActionId = actionId;
                 SlotType = slotType;
                 KeybindHint = keybindHint ?? "";
+                CurrentCharges = currentCharges;
+                MaxCharges = maxCharges;
             }
         }
 
@@ -83,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)
         {
@@ -94,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);
@@ -106,23 +151,42 @@ namespace HSUI.Helpers
 
                 if (slot == null)
                 {
-                    list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind));
+                    list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
                     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));
+                    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);
-                list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind));
+                (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));
             }
 
             return list;
@@ -132,6 +196,27 @@ namespace HSUI.Helpers
         /// Gets cooldown for a hotbar slot. For Action/GeneralAction/PetAction, uses ActionManager recast API
         /// (more accurate for adjusted IDs, recast groups). Falls back to slot's GetSlotActionCooldownPercentage for Items/Macros.
         /// </summary>
+        /// <summary>
+        /// Gets current and max charges for a slot. Only applies to Action type; returns (0,0) otherwise.
+        /// </summary>
+        private static unsafe (int CurrentCharges, int MaxCharges) GetSlotCharges(RaptureHotbarModule.HotbarSlotType slotType, uint actionId)
+        {
+            if (slotType != RaptureHotbarModule.HotbarSlotType.Action || actionId == 0)
+                return (0, 0);
+
+            var actionManager = ActionManager.Instance();
+            if (actionManager == null)
+                return (0, 0);
+
+            uint effectiveId = actionManager->GetAdjustedActionId(actionId);
+            ushort maxCh = ActionManager.GetMaxCharges(effectiveId, 0);
+            if (maxCh <= 1)
+                return (0, 0);
+
+            uint currentCh = actionManager->GetCurrentCharges(effectiveId);
+            return ((int)currentCh, (int)maxCh);
+        }
+
         private static unsafe (int CooldownPercent, int SecondsLeft) GetSlotCooldown(RaptureHotbarModule.HotbarSlot* slot)
         {
             if (slot == null) return (0, 0);
@@ -513,16 +598,32 @@ namespace HSUI.Helpers
             return true;
         }
 
-        /// <summary>Sets a slot and persists to disk. For shared hotbars, explicitly writes to classJobId 0 to ensure persistence across job changes and teleports.</summary>
+        /// <summary>Sets a slot and persists to disk. For shared hotbars, explicitly writes to classJobId 0.
+        /// For job-specific hotbars, explicitly writes to current class job ID to ensure persistence when switching jobs.</summary>
         public static unsafe void SetAndSaveSlotInternal(RaptureHotbarModule* module, uint barId, uint slotId, RaptureHotbarModule.HotbarSlotType slotType, uint commandId, RaptureHotbarModule.HotbarSlot* slotPtr = null)
         {
             var ptr = slotPtr != null ? slotPtr : module->GetSlotById(barId, slotId);
-            if (module->IsHotbarShared(barId) && ptr != null)
+            if (ptr == null) return;
+
+            if (module->IsHotbarShared(barId))
             {
-                // Shared hotbars: explicitly write to classJobId 0 (shared storage) for correct persistence across teleports/job changes
+                // Shared hotbars: explicitly write to classJobId 0 (shared storage) for persistence across job changes and teleports
                 module->WriteSavedSlot(0, barId, slotId, ptr, false, false);
             }
-            // SetAndSaveSlot triggers file save; for shared bars also ensures save is queued (WriteSavedSlot may only update _savedHotbars)
+            else
+            {
+                // Job-specific hotbars: explicitly write to current class job ID so saves persist when switching jobs
+                uint classJobId = (uint)(module->ActiveHotbarClassJobId & 0x7F); // strip 0x80 flag if set
+                if (classJobId == 0)
+                {
+                    var player = Plugin.ObjectTable?.LocalPlayer;
+                    if (player != null)
+                        classJobId = player.ClassJob.RowId;
+                }
+                if (classJobId != 0)
+                    module->WriteSavedSlot(classJobId, barId, slotId, ptr, false, false);
+            }
+            // SetAndSaveSlot updates live slot and triggers file save
             module->SetAndSaveSlot(barId, slotId, slotType, commandId, ignoreSharedHotbars: false, allowSaveToPvP: true);
         }
     }

Helpers/ActionChatLinkHelper.cs

@@ -0,0 +1,231 @@
+/*
+ * ActionChatLinkHelper: Shift+click on actions in the Actions & Traits menu to insert
+ * "You should check out {ActionName}" into the chat input (or clipboard if chat not focused).
+ */
+
+using Dalamud.Bindings.ImGui;
+using Dalamud.Plugin.Services;
+using Dalamud.Game.Gui;
+using FFXIVClientStructs.FFXIV.Client.UI;
+using FFXIVClientStructs.FFXIV.Component.GUI;
+using HSUI.Config;
+using System;
+using System.Numerics;
+using LuminaAction = Lumina.Excel.Sheets.Action;
+
+namespace HSUI.Helpers
+{
+    public sealed class ActionChatLinkHelper : IDisposable
+    {
+        public static ActionChatLinkHelper? Instance { get; private set; }
+
+        private readonly IFramework _framework;
+
+        /// <summary>Store last hovered action when ActionMenu is visible and shift held, so we have it at click time.</summary>
+        private uint _pendingActionId;
+
+        private ActionChatLinkHelper(IFramework framework)
+        {
+            _framework = framework;
+            _framework.Update += OnFrameworkUpdate;
+            ConfigurationManager.Instance.ResetEvent += OnConfigReset;
+            OnConfigReset(ConfigurationManager.Instance);
+        }
+
+        private WorldObjectTooltipConfig _config = null!;
+
+        public static void Initialize()
+        {
+            if (Instance != null) return;
+            Instance = new ActionChatLinkHelper(Plugin.Framework);
+        }
+
+        public void Dispose()
+        {
+            _framework.Update -= OnFrameworkUpdate;
+            try { ConfigurationManager.Instance.ResetEvent -= OnConfigReset; } catch { }
+            Instance = null;
+        }
+
+        private void OnConfigReset(ConfigurationManager _) =>
+            _config = ConfigurationManager.Instance.GetConfigObject<WorldObjectTooltipConfig>();
+
+        private void OnFrameworkUpdate(IFramework framework)
+        {
+            try
+            {
+                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)
+                {
+                    _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;
+
+                // 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>
+        private static unsafe bool TryGetHoveredActionFromAddon(IntPtr addonAddress, out uint actionId)
+        {
+            actionId = 0;
+            if (addonAddress == IntPtr.Zero) return false;
+
+            try
+            {
+                var addon = (AddonActionMenu*)addonAddress;
+                byte* basePtr = (byte*)addonAddress;
+
+                foreach (var list in new[] { addon->ActionList, addon->TraitList })
+                {
+                    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;
+        }
+
+        /// <summary>True if mouse is within ActionMenu addon bounds (so we can safely use HoveredAction — excludes hotbars).</summary>
+        private static unsafe bool IsMouseOverActionMenu(IntPtr addonAddress)
+        {
+            if (addonAddress == IntPtr.Zero) 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;
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Verbose($"[ActionChatLink] IsMouseOverActionMenu: {ex.Message}");
+                return false;
+            }
+        }
+
+        private static string? GetActionName(uint actionId)
+        {
+            try
+            {
+                var sheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
+                var row = sheet?.GetRow(actionId);
+                return row.HasValue ? row.Value.Name.ToString() : null;
+            }
+            catch { return null; }
+        }
+
+        private static void InsertOrCopyToChat(string text)
+        {
+            if (TryInsertIntoActiveTextInput(text))
+                return;
+
+            // Fallback: copy to clipboard and notify (leave text on clipboard for user to paste)
+            try
+            {
+                ImGui.SetClipboardText(text);
+                Plugin.Chat.Print("[HSUI] Copied to clipboard — open chat and press Ctrl+V to paste.");
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Warning($"[ActionChatLink] Failed to copy to clipboard: {ex.Message}");
+            }
+        }
+
+        private static unsafe bool TryInsertIntoActiveTextInput(string text)
+        {
+            try
+            {
+                var raptureAtk = RaptureAtkModule.Instance();
+                if (raptureAtk == null || !raptureAtk->IsTextInputActive())
+                    return false;
+
+                var stage = AtkStage.Instance();
+                if (stage == null) return false;
+
+                var focus = stage->GetFocus();
+                if (focus == null) return false;
+
+                // Traverse up to find the text input component
+                var node = focus;
+                while (node != null)
+                {
+                    if (node->Type == NodeType.Component)
+                    {
+                        var componentNode = (AtkComponentNode*)node;
+                        var component = componentNode->Component;
+                        if (component != null)
+                        {
+                            if (component->GetComponentType() == ComponentType.TextInput)
+                            {
+                                var textInput = (AtkComponentTextInput*)component;
+                                textInput->InsertText(text, false);
+                                return true;
+                            }
+                        }
+                    }
+                    node = node->ParentNode;
+                }
+
+                return false;
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Warning($"[ActionChatLink] InsertText failed: {ex.Message}");
+                return false;
+            }
+        }
+    }
+}

Helpers/InputsHelper.cs

@@ -142,8 +142,22 @@ namespace HSUI.Helpers
                 return;
             }
 
-            ConfigurationManager.Instance.ResetEvent -= OnConfigReset;
-            Plugin.Framework.Update -= OnFrameworkUpdate;
+            // Restore WndProc first so left-click works again immediately after unload.
+            // After a game/Dalamud patch, other singletons may be disposed before us;
+            // if we unsub or touch config first and that throws, we would never restore and LButton stays broken.
+            RestoreWndProc();
+
+            try
+            {
+                ConfigurationManager.Instance.ResetEvent -= OnConfigReset;
+            }
+            catch { /* Instance may already be disposed */ }
+
+            try
+            {
+                Plugin.Framework.Update -= OnFrameworkUpdate;
+            }
+            catch { /* Framework may already be disposed */ }
 
             Plugin.Logger.Info("\t\tDisposing _requestActionHook: " + (_requestActionHook?.Address.ToString("X") ?? "null"));
             _requestActionHook?.Disable();
@@ -151,9 +165,6 @@ namespace HSUI.Helpers
             _executeSlotByIdHook?.Disable();
             _executeSlotByIdHook?.Dispose();
 
-            // give imgui the control of inputs again
-            RestoreWndProc();
-
             Instance = null!;
         }
         #endregion
@@ -459,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()
@@ -554,19 +575,40 @@ 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)
+            if (_wndHandle == IntPtr.Zero || _imguiWndProcPtr == IntPtr.Zero)
+                return;
+
+            try
             {
                 Plugin.Logger.Info("\t\tRestoring WndProc");
-                Plugin.Logger.Info("\t\t\tOld _wndHandle = " + _wndHandle.ToString("X"));
-                Plugin.Logger.Info("\t\t\tOld _imguiWndProcPtr = " + _imguiWndProcPtr.ToString("X"));
-
                 SetWindowLongPtr(_wndHandle, GWL_WNDPROC, _imguiWndProcPtr);
-                Plugin.Logger.Info("\t\t\tDone!");
-
+                Plugin.Logger.Info("\t\t\tWndProc restored.");
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Warning($"\t\tRestoreWndProc failed: {ex.Message}");
+            }
+            finally
+            {
                 _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

@@ -1,14 +1,26 @@
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using HSUI.Config;
 using HSUI.Config.Attributes;
 using HSUI.Interface.GeneralElements;
 using Dalamud.Bindings.ImGui;
+using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using System;
 using System.Numerics;
+using System.Text;
 
 namespace HSUI.Helpers
 {
+    /// <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
@@ -52,18 +64,21 @@ namespace HSUI.Helpers
         private string? _currentTooltipTitle = null;
         private Vector2 _titleSize;
         private string? _previousRawText = null;
+        private uint? _currentIconId = null;
 
         private Vector2 _position;
         private Vector2 _size;
 
         private bool _dataIsValid = false;
 
-        public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "")
+        private const float IconSize = 24f;
+
+        public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None)
         {
-            ShowTooltip(text, ImGui.GetMousePos(), title, id, name);
+            ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId, idKind);
         }
 
-        public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "")
+        public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None)
         {
             if (text == null)
             {
@@ -79,6 +94,8 @@ namespace HSUI.Helpers
                 _previousRawText = text;
             }
 
+            _currentIconId = iconId;
+
             // calcualte title size
             _titleSize = Vector2.Zero;
             if (title != null)
@@ -90,7 +107,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 + ")";
                 }
@@ -110,7 +131,13 @@ namespace HSUI.Helpers
                 _textSize = ImGui.CalcTextSize(_currentTooltipText, false, MaxWidth);
             }
 
-            _size = new Vector2(Math.Max(_titleSize.X, _textSize.X) + Margin * 2, _titleSize.Y + _textSize.Y + Margin * 2);
+            float contentWidth = Math.Max(_titleSize.X, _textSize.X);
+            float contentHeight = _titleSize.Y + _textSize.Y;
+            float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale;
+            float iconGap = _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled + Margin : 0;
+            _size = new Vector2(
+                contentWidth + iconGap + Margin * 2,
+                Math.Max(contentHeight, _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled : 0) + Margin * 2);
 
             // position tooltip using the given coordinates as bottom center
             position.X = position.X - _size.X / 2f;
@@ -124,6 +151,122 @@ namespace HSUI.Helpers
                 Plugin.Logger.Information($"[HSUI Tooltip DBG] ShowTooltip: title='{title}' textLen={text?.Length ?? 0} textPreview='{(text != null && text.Length > 80 ? text[..80] + "..." : text ?? "")}' pos=({_position.X:F0},{_position.Y:F0})");
         }
 
+        private WorldObjectTooltipConfig? _worldTooltipConfig;
+
+        /// <summary>
+        /// Shows a tooltip for the game object the mouse is hovering over in the 3D world.
+        /// Call this each frame before Draw().
+        /// </summary>
+        public void ShowWorldObjectTooltip()
+        {
+            try
+            {
+                _worldTooltipConfig ??= ConfigurationManager.Instance.GetConfigObject<WorldObjectTooltipConfig>();
+                if (_worldTooltipConfig == null || !_worldTooltipConfig.Enabled)
+                    return;
+            }
+            catch (Exception ex)
+            {
+                // Config not ready yet or not found - silently skip
+                if (_config.DebugTooltips)
+                    Plugin.Logger.Warning($"[HSUI Tooltip] WorldObjectTooltipConfig not available: {ex.Message}");
+                return;
+            }
+
+            IGameObject? mouseOverTarget = Plugin.TargetManager.MouseOverTarget;
+            if (mouseOverTarget == null)
+                return;
+
+            // Don't show tooltip for ourselves
+            if (mouseOverTarget.GameObjectId == Plugin.ObjectTable.LocalPlayer?.GameObjectId)
+                return;
+
+            string name = mouseOverTarget.Name.ToString();
+            if (string.IsNullOrEmpty(name))
+                name = "Unknown";
+
+            var sb = new StringBuilder();
+
+            // Free Company tag for players
+            if (_worldTooltipConfig.ShowTitle && mouseOverTarget is IPlayerCharacter player)
+            {
+                string fcTag = player.CompanyTag.ToString();
+                if (!string.IsNullOrEmpty(fcTag))
+                    sb.AppendLine($"«{fcTag}»");
+            }
+
+            // Level
+            if (_worldTooltipConfig.ShowLevel && mouseOverTarget is ICharacter charLevel)
+            {
+                byte level = charLevel.Level;
+                if (level > 0)
+                    sb.AppendLine($"Level {level}");
+            }
+
+            // Job (for players)
+            if (_worldTooltipConfig.ShowJob && mouseOverTarget is IPlayerCharacter playerJob)
+            {
+                uint jobId = playerJob.ClassJob.RowId;
+                if (jobId > 0 && JobsHelper.JobNames.TryGetValue(jobId, out string? jobName))
+                    sb.AppendLine($"Job: {jobName}");
+            }
+
+            // HP
+            if (_worldTooltipConfig.ShowHP && mouseOverTarget is ICharacter charHp)
+            {
+                uint currentHp = charHp.CurrentHp;
+                uint maxHp = charHp.MaxHp;
+                if (maxHp > 0)
+                {
+                    float pct = (float)currentHp / maxHp * 100f;
+                    sb.AppendLine($"HP: {currentHp:N0} / {maxHp:N0} ({pct:F0}%)");
+                }
+            }
+
+            // Distance
+            if (_worldTooltipConfig.ShowDistance)
+            {
+                var localPlayer = Plugin.ObjectTable.LocalPlayer;
+                if (localPlayer != null)
+                {
+                    float dist = Vector3.Distance(localPlayer.Position, mouseOverTarget.Position);
+                    sb.AppendLine($"Distance: {dist:F1}y");
+                }
+            }
+
+            // Object ID (debug)
+            if (_worldTooltipConfig.ShowObjectId)
+            {
+                sb.AppendLine($"ID: {mouseOverTarget.GameObjectId}");
+            }
+
+            string body = sb.ToString().TrimEnd('\r', '\n');
+            if (string.IsNullOrEmpty(body))
+                body = "(No info)";
+
+            uint? iconId = _worldTooltipConfig.ShowIcon ? GetWorldObjectIconId(mouseOverTarget) : null;
+
+            if (_worldTooltipConfig.DetachFromCursor)
+            {
+                ShowTooltip(body, _worldTooltipConfig.Position, name, 0, "", iconId);
+            }
+            else
+            {
+                ShowTooltipOnCursor(body, name, 0, "", iconId);
+            }
+        }
+
+        private static unsafe uint? GetWorldObjectIconId(IGameObject gameObject)
+        {
+            if (gameObject == null || gameObject.Address == IntPtr.Zero)
+                return null;
+            var obj = (GameObject*)gameObject.Address;
+            if (obj == null)
+                return null;
+            uint iconId = obj->NamePlateIconId;
+            return iconId > 0 ? iconId : null;
+        }
+
         public void RemoveTooltip()
         {
             _dataIsValid = false;
@@ -173,14 +316,26 @@ namespace HSUI.Helpers
             float globalScaleCorrection = -15 + 15 * ImGuiHelpers.GlobalScale;
 
             string fontId = _config.FontID ?? FontsConfig.DefaultSmallFontKey;
-            float wrapWidth = Math.Max(_titleSize.X, _textSize.X) + Margin;
+            float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale;
+            float iconGap = (_currentIconId.HasValue && _currentIconId.Value > 0) ? iconSizeScaled + Margin : 0;
+            float wrapWidth = (_currentIconId.HasValue && _currentIconId.Value > 0)
+                ? _size.X - iconGap - Margin * 2
+                : Math.Max(_titleSize.X, _textSize.X) + Margin;
+            float textBlockX = windowMargin.X + Margin + iconGap;
+
+            if (_currentIconId.HasValue && _currentIconId.Value > 0)
+            {
+                var iconPos = _position + new Vector2(Margin, Margin);
+                DrawHelper.DrawIcon(_currentIconId.Value, iconPos, new Vector2(iconSizeScaled, iconSizeScaled), false, drawList);
+            }
+
             if (_currentTooltipTitle != null)
             {
                 // title
                 Vector2 cursorPos;
                 using (FontsManager.Instance.PushFont(fontId))
                 {
-                    cursorPos = new Vector2(windowMargin.X + _size.X / 2f - _titleSize.X / 2f, Margin);
+                    cursorPos = new Vector2(textBlockX, Margin);
                     ImGui.SetCursorPos(cursorPos);
                     ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
                     ImGui.TextColored(_config.TitleColor.Vector, _currentTooltipTitle);
@@ -190,7 +345,7 @@ namespace HSUI.Helpers
                 // text
                 using (FontsManager.Instance.PushFont(fontId))
                 {
-                    cursorPos = new Vector2(windowMargin.X + _size.X / 2f - _textSize.X / 2f, Margin + _titleSize.Y);
+                    cursorPos = new Vector2(textBlockX, Margin + _titleSize.Y);
                     ImGui.SetCursorPos(cursorPos);
                     ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
                     ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText);
@@ -202,8 +357,8 @@ namespace HSUI.Helpers
                 // text
                 using (FontsManager.Instance.PushFont(fontId))
                 {
-                    var cursorPos = windowMargin + new Vector2(Margin, Margin);
-                    var textWidth = _size.X - Margin * 2;
+                    var cursorPos = new Vector2(textBlockX, Margin);
+                    var textWidth = _size.X - iconGap - Margin * 2;
 
                     ImGui.SetCursorPos(cursorPos);
                     ImGui.PushTextWrapPos(cursorPos.X + textWidth + globalScaleCorrection);
@@ -264,6 +419,10 @@ namespace HSUI.Helpers
         [Order(7)]
         public bool ShowStatusIDs = false;
 
+        [Checkbox("Show Action ID", help = "Show action ID in hotbar and action tooltips.")]
+        [Order(8)]
+        public bool ShowActionIDs = false;
+
         [Checkbox("Show Source Name")]
         [Order(10)]
         public bool ShowSourceName = false;
@@ -305,4 +464,51 @@ namespace HSUI.Helpers
             Thickness = thickness;
         }
     }
+
+    [Section("Misc")]
+    [SubSection("World Tooltip", 0)]
+    public class WorldObjectTooltipConfig : PluginConfigObject
+    {
+        public new static WorldObjectTooltipConfig DefaultConfig() { return new WorldObjectTooltipConfig(); }
+
+        [Checkbox("Detach from Cursor", spacing = true)]
+        [Order(1)]
+        public bool DetachFromCursor = false;
+
+        [DragFloat2("Position (when detached)", min = -4000f, max = 4000f)]
+        [Order(2, collapseWith = nameof(DetachFromCursor))]
+        public Vector2 Position = new Vector2(100, 100);
+
+        [Checkbox("Show Icon (quest/NPC icons)", spacing = true)]
+        [Order(3)]
+        public bool ShowIcon = true;
+
+        [Checkbox("Shift+Click action in Actions & Traits → insert \"You should check out X\" in chat", help = "When chat is focused, inserts directly. Otherwise copies to clipboard.")]
+        [Order(4)]
+        public bool ActionChatLinkEnabled = true;
+
+        [Checkbox("Show Level", spacing = true)]
+        [Order(6)]
+        public bool ShowLevel = true;
+
+        [Checkbox("Show HP")]
+        [Order(10)]
+        public bool ShowHP = true;
+
+        [Checkbox("Show Job (Players)")]
+        [Order(15)]
+        public bool ShowJob = true;
+
+        [Checkbox("Show FC Tag (Players)")]
+        [Order(20)]
+        public bool ShowTitle = false;
+
+        [Checkbox("Show Distance")]
+        [Order(25)]
+        public bool ShowDistance = true;
+
+        [Checkbox("Show Object ID")]
+        [Order(30)]
+        public bool ShowObjectId = false;
+    }
 }

Helpers/Utils.cs

@@ -94,6 +94,27 @@ namespace HSUI.Helpers
             return plateType >= 4 && plateType <= 11;
         }
 
+        /// <summary>Returns Grand Company icon ID (Maelstrom, Flames, or Adders) for enemy players in PvP Frontline.
+        /// Nameplate color types 4, 5, 6 map to the three teams. Returns null when not a PvP enemy team (4–6).
+        /// Use iconOverrides for custom IDs: [0]=team1(plate4), [1]=team2(plate5), [2]=team3(plate6). Non-zero overrides default.</summary>
+        public static unsafe uint? GrandCompanyIconIdForPvPEnemy(IGameObject? obj, (int t1, int t2, int t3)? iconOverrides = null)
+        {
+            if (obj == null || !Plugin.ClientState.IsPvP) return null;
+            StructsGameObject* gameObject = (StructsGameObject*)obj.Address;
+            byte plateType = gameObject->GetNamePlateColorType();
+            if (plateType < 4 || plateType > 6) return null;
+
+            // 62601=Maelstrom, 62602=Twin Adder, 62603=Immortal Flames
+            uint iconId = plateType switch
+            {
+                4 => iconOverrides.HasValue && iconOverrides.Value.t1 > 0 ? (uint)iconOverrides.Value.t1 : 62601u,
+                5 => iconOverrides.HasValue && iconOverrides.Value.t2 > 0 ? (uint)iconOverrides.Value.t2 : 62602u,
+                6 => iconOverrides.HasValue && iconOverrides.Value.t3 > 0 ? (uint)iconOverrides.Value.t3 : 62603u,
+                _ => 0
+            };
+            return iconId > 0 ? iconId : null;
+        }
+
         public static unsafe float ActorShieldValue(IGameObject? actor)
         {
             if (actor == null || actor is not ICharacter)

Interface/GeneralElements/ActionBarsHud.cs

@@ -216,6 +216,14 @@ namespace HSUI.Interface.GeneralElements
                                 Vector2 labelPos = new Vector2(pos.X + size.X - labelSize.X - 2, pos.Y + size.Y - labelSize.Y - 2);
                                 DrawHelper.DrawOutlinedText(label, labelPos, 0xFFFFFFFF, 0xFF000000, drawList, 1);
                             }
+
+                            if (Config.ShowChargeCount && !slot.IsEmpty && slot.MaxCharges > 1)
+                            {
+                                string chargeText = slot.CurrentCharges.ToString();
+                                Vector2 chargeSize = ImGui.CalcTextSize(chargeText);
+                                Vector2 chargePos = new Vector2(pos.X + 2, pos.Y + 2);
+                                DrawHelper.DrawOutlinedText(chargeText, chargePos, 0xFFFFFFFF, 0xFF000000, drawList, 1);
+                            }
                         }
                     }
                 }
@@ -245,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);
@@ -254,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;
                 }
 
@@ -364,7 +370,7 @@ 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, "");
+                                TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, Helpers.TooltipIdKind.Action);
                                 if (IsTooltipDebugEnabled())
                                     Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'");
                             }
@@ -386,7 +392,7 @@ namespace HSUI.Interface.GeneralElements
                     _lastLoggedPickupSlotId = -1;
                 }
 
-                ImGui.End();
+                ImGui.EndChild();
             });
         }
 
@@ -423,7 +429,7 @@ 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, "");
+                            TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, Helpers.TooltipIdKind.Action);
                             if (IsTooltipDebugEnabled())
                                 Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'");
                         }
@@ -596,7 +602,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)
                             {
@@ -613,7 +619,7 @@ namespace HSUI.Interface.GeneralElements
                                             displaySlot->Set(slotType, id);
                                             displaySlot->LoadIconId();
                                         }
-                                        module->SetAndSaveSlot(barId, (uint)releaseIdx, slotType, id);
+                                        ActionBarsManager.SetAndSaveSlotInternal(module, barId, (uint)releaseIdx, slotType, id, displaySlot);
                                         uint iconId = GetIconIdForPayload(slotType, id);
                                         if (iconId == 0)
                                         {
@@ -695,7 +701,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)
                     {
@@ -1042,6 +1048,24 @@ namespace HSUI.Interface.GeneralElements
             return false;
         }
 
+        /// <summary>Maps HoverActionKind to HotbarSlotType for tooltip lookups. Returns Empty if not supported.</summary>
+        public static RaptureHotbarModule.HotbarSlotType GetHotbarSlotTypeForHover(HoverActionKind kind) =>
+            GetHotbarSlotTypeFromHoverActionKind(kind);
+
+        /// <summary>
+        /// Gets tooltip (title, text, iconId) for an action when hovered in chat or elsewhere.
+        /// Used by global tooltip to show action details when hovering over linked actions in chat.
+        /// </summary>
+        public static (string title, string text, uint iconId)? GetActionTooltipForHover(RaptureHotbarModule.HotbarSlotType slotType, uint actionId)
+        {
+            if (actionId == 0) return null;
+            var slot = new ActionBarsManager.SlotInfo(0, false, true, 0, 0, actionId, slotType, "", 0, 0);
+            var (title, text) = GetSlotTooltip(slot);
+            if (string.IsNullOrEmpty(title) && string.IsNullOrEmpty(text)) return null;
+            uint iconId = GetIconIdForPayload(slotType, actionId);
+            return (title, string.IsNullOrEmpty(text) ? title : text, iconId);
+        }
+
         private static RaptureHotbarModule.HotbarSlotType GetHotbarSlotTypeFromHoverActionKind(HoverActionKind kind)
         {
             return kind switch
@@ -1068,7 +1092,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();
@@ -1126,6 +1152,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)
@@ -1168,33 +1207,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;
@@ -1309,13 +1441,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);
@@ -1327,6 +1459,34 @@ namespace HSUI.Interface.GeneralElements
                 }
             }
 
+            if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.MainCommand ||
+                slot.SlotType == RaptureHotbarModule.HotbarSlotType.ExtraCommand)
+            {
+                if (Plugin.DataManager.GetExcelSheet<MainCommand>()?.TryGetRow(slot.ActionId, out var mcRow) == true)
+                {
+                    string name = mcRow.Name.ToString();
+                    string desc = "";
+                    try
+                    {
+                        string descRaw = mcRow.Description.ToDalamudString().ToString();
+                        if (!string.IsNullOrEmpty(descRaw))
+                        {
+                            try
+                            {
+                                var evaluated = Plugin.SeStringEvaluator.Evaluate(mcRow.Description.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 ?? "");
+                }
+            }
+
             return (slot.SlotType.ToString(), "");
         }
 

Interface/GeneralElements/HotbarsConfig.cs

@@ -63,15 +63,19 @@ namespace HSUI.Interface.GeneralElements
         [Order(28)]
         public bool ShowSlotNumbers = true;
 
-        [Checkbox("Show Combo Highlight")]
+        [Checkbox("Show Charge Count")]
         [Order(29)]
+        public bool ShowChargeCount = true;
+
+        [Checkbox("Show Combo Highlight")]
+        [Order(30)]
         public bool ShowComboHighlight = true;
 
         [Checkbox("Show Keypress Flash")]
-        [Order(30)]
+        [Order(31)]
         public bool ShowKeypressFlash = true;
 
-        [NestedConfig("Combo Highlight", 31)]
+        [NestedConfig("Combo Highlight", 32)]
         public ComboHighlightConfig ComboHighlightConfig = new();
 
         [Checkbox("Debug Drag & Drop")]

Interface/GeneralElements/IconConfig.cs

@@ -129,6 +129,29 @@ namespace HSUI.Interface.GeneralElements
         }
     }
 
+    /// <summary>Shows Grand Company icon (Maelstrom, Flames, or Adders) on enemy player nameplates in PvP Frontline.</summary>
+    public class NameplateCompanyIconConfig : NameplateIconConfig
+    {
+        [DragInt("Icon ID Team 1 (plateType 4)", min = 0, max = 999999)]
+        [Order(19)]
+        public int IconIdTeam1;
+
+        [DragInt("Icon ID Team 2 (plateType 5)", min = 0, max = 999999)]
+        [Order(20)]
+        public int IconIdTeam2;
+
+        [DragInt("Icon ID Team 3 (plateType 6)", min = 0, max = 999999)]
+        [Order(21)]
+        public int IconIdTeam3;
+
+        public NameplateCompanyIconConfig() : base() { }
+
+        public NameplateCompanyIconConfig(Vector2 position, Vector2 size, DrawAnchor anchor, DrawAnchor frameAnchor)
+            : base(position, size, anchor, frameAnchor)
+        {
+        }
+    }
+
     public class NameplateRoleJobIconConfig : RoleJobIconConfig
     {
         public NameplateRoleJobIconConfig() : base() { }

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

@@ -522,6 +522,9 @@ namespace HSUI.Interface
                 DraggablesHelper.DrawElements(origin, _hudHelper, _hudElements.Values, _jobHud, _selectedElement);
             }
 
+            // world object tooltip (mouseover in 3D world)
+            TooltipsHelper.Instance.ShowWorldObjectTooltip();
+
             // tooltip
             TooltipsHelper.Instance.Draw();
 

Interface/Nameplates/Nameplate.cs

@@ -550,6 +550,53 @@ namespace HSUI.Interface.Nameplates
 
             }
 
+            // company icon (PvP Frontline: Maelstrom, Flames, Adders)
+            var gcIconOverrides = (Config.CompanyIconConfig.IconIdTeam1, Config.CompanyIconConfig.IconIdTeam2, Config.CompanyIconConfig.IconIdTeam3);
+            if (Config.CompanyIconConfig.Enabled && Utils.GrandCompanyIconIdForPvPEnemy(data.GameObject, gcIconOverrides) is uint gcIconId)
+            {
+                anchor = anchors.GetAnchor(Config.CompanyIconConfig.NameplateLabelAnchor, Config.CompanyIconConfig.PrioritizeHealthBarAnchor);
+                anchor = anchor ?? new NameplateAnchor(data.ScreenPosition, Vector2.Zero);
+
+                var pos = Utils.GetAnchoredPosition(_config.Position + anchor.Value.Position, -anchor.Value.Size, Config.CompanyIconConfig.FrameAnchor);
+                var iconPos = Utils.GetAnchoredPosition(pos + Config.CompanyIconConfig.Position, Config.CompanyIconConfig.Size, Config.CompanyIconConfig.Anchor);
+
+                drawActions.Add((Config.CompanyIconConfig.StrataLevel, () =>
+                {
+                    DrawHelper.DrawInWindow(_config.ID + "_enemyCompanyIcon", iconPos, Config.CompanyIconConfig.Size, false, (drawList) =>
+                    {
+                        DrawHelper.DrawIcon(gcIconId, iconPos, Config.CompanyIconConfig.Size, false, alpha, drawList);
+                    });
+                }
+                ));
+            }
+
+            // role/job icon (enemy players only; has ClassJob)
+            if (Config.RoleIconConfig.Enabled && data.GameObject is IPlayerCharacter playerCharacter)
+            {
+                uint jobId = playerCharacter.ClassJob.RowId;
+                uint iconId = Config.RoleIconConfig.UseRoleIcons
+                    ? JobsHelper.RoleIconIDForJob(jobId, Config.RoleIconConfig.UseSpecificDPSRoleIcons)
+                    : JobsHelper.IconIDForJob(jobId, (uint)Config.RoleIconConfig.Style);
+
+                if (iconId > 0)
+                {
+                    anchor = anchors.GetAnchor(Config.RoleIconConfig.NameplateLabelAnchor, Config.RoleIconConfig.PrioritizeHealthBarAnchor);
+                    anchor = anchor ?? new NameplateAnchor(data.ScreenPosition, Vector2.Zero);
+
+                    var pos = Utils.GetAnchoredPosition(_config.Position + anchor.Value.Position, -anchor.Value.Size, Config.RoleIconConfig.FrameAnchor);
+                    var iconPos = Utils.GetAnchoredPosition(pos + Config.RoleIconConfig.Position, Config.RoleIconConfig.Size, Config.RoleIconConfig.Anchor);
+
+                    drawActions.Add((Config.RoleIconConfig.StrataLevel, () =>
+                    {
+                        DrawHelper.DrawInWindow(_config.ID + "_enemyRoleJobIcon", iconPos, Config.RoleIconConfig.Size, false, (drawList) =>
+                        {
+                            DrawHelper.DrawIcon(iconId, iconPos, Config.RoleIconConfig.Size, false, alpha, drawList);
+                        });
+                    }
+                    ));
+                }
+            }
+
             return drawActions;
         }
 

Interface/Nameplates/NameplateConfig.cs

@@ -490,6 +490,24 @@ namespace HSUI.Interface.GeneralElements
         )
         { PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
 
+        [NestedConfig("Company Icon (PvP)", 46, collapsingHeader = false)]
+        public NameplateCompanyIconConfig CompanyIconConfig = new NameplateCompanyIconConfig(
+            new Vector2(-5, 0),
+            new Vector2(24, 24),
+            DrawAnchor.Right,
+            DrawAnchor.Left
+        )
+        { PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
+
+        [NestedConfig("Role/Job Icon (enemy players)", 47)]
+        public NameplateRoleJobIconConfig RoleIconConfig = new NameplateRoleJobIconConfig(
+            new Vector2(-35, 0),
+            new Vector2(24, 24),
+            DrawAnchor.Right,
+            DrawAnchor.Left
+        )
+        { PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
+
         [NestedConfig("Debuffs", 50)]
         public EnemyNameplateStatusEffectsListConfig DebuffsConfig = null!;
 

Interface/Nameplates/NameplatesHud.cs

@@ -128,17 +128,17 @@ namespace HSUI.Interface.Nameplates
                         return _playerHud;
                     }
 
-                    if (data.GameObject is ICharacter character)
+                    if (data.GameObject is ICharacter character2)
                     {
-                        if ((character.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember
+                        if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember
                         {
                             return _partyMemberHud;
                         }
-                        else if ((character.StatusFlags & StatusFlags.AllianceMember) != 0) // AllianceMember
+                        else if ((character2.StatusFlags & StatusFlags.AllianceMember) != 0) // AllianceMember
                         {
                             return _allianceMemberHud;
                         }
-                        else if ((character.StatusFlags & StatusFlags.Friend) != 0) // Friend
+                        else if ((character2.StatusFlags & StatusFlags.Friend) != 0) // Friend
                         {
                             return _friendsHud;
                         }

Interface/Party/AllianceManager.cs

@@ -145,7 +145,7 @@ namespace HSUI.Interface.Party
             return false;
         }
 
-        /// <summary>Gets the alliance letter (A/B/C) for an internal group index. Uses member EntityId matching to CrossRealm when GroupManager/CrossRealm use different orderings.</summary>
+        /// <summary>Gets the alliance letter (A/B/C) for an internal group index. GroupManager ordering can differ from game display; use LocalPlayerGroupIndex to map when CrossRealm member data is unavailable.</summary>
         public bool TryGetAllianceLetter(int allianceIndex, out string letter)
         {
             letter = "";
@@ -154,53 +154,72 @@ namespace HSUI.Interface.Party
             var info = InfoProxyCrossRealm.Instance();
             if (info != null && info->GroupCount >= 3)
             {
-                // Get first member EntityId from our group (works for both GroupManager and CrossRealm data)
-                uint matchEntityId = 0;
-                if (_allianceMembers[allianceIndex].Count > 0)
-                    matchEntityId = _allianceMembers[allianceIndex][0].ObjectId;
-
-                // Find which CrossRealm group contains this member - they may use different ordering than GroupManager
-                for (int crIdx = 0; crIdx < 3 && matchEntityId != 0; crIdx++)
+                // Check if CrossRealm has member data - when empty, we're in-instance using GroupManager (indices differ from InfoProxy)
+                bool crossRealmHasData = false;
+                for (int i = 0; i < 3; i++)
                 {
-                    var crGroup = info->CrossRealmGroups[crIdx];
-                    for (int j = 0; j < crGroup.GroupMemberCount; j++)
+                    if (info->CrossRealmGroups[i].GroupMemberCount > 0)
                     {
-                        if (crGroup.GroupMembers[j].EntityId == matchEntityId)
+                        crossRealmHasData = true;
+                        break;
+                    }
+                }
+
+                if (crossRealmHasData)
+                {
+                    // CrossRealm populated: use EntityId lookup or direct lookup
+                    uint matchEntityId = 0;
+                    if (_allianceMembers[allianceIndex].Count > 0)
+                        matchEntityId = _allianceMembers[allianceIndex][0].ObjectId;
+
+                    if (matchEntityId != 0)
+                    {
+                        for (int crIdx = 0; crIdx < 3; crIdx++)
                         {
-                            byte displayIdx = crGroup.GroupMembers[j].GroupIndex;
-                            if (displayIdx < 3)
+                            var crGroup = info->CrossRealmGroups[crIdx];
+                            for (int j = 0; j < crGroup.GroupMemberCount; j++)
                             {
-                                letter = ((char)('A' + displayIdx)).ToString();
-                                return true;
+                                if (crGroup.GroupMembers[j].EntityId == matchEntityId)
+                                {
+                                    byte displayIdx = crGroup.GroupMembers[j].GroupIndex;
+                                    if (displayIdx < 3)
+                                    {
+                                        letter = ((char)('A' + displayIdx)).ToString();
+                                        return true;
+                                    }
+                                }
                             }
                         }
                     }
+
+                    var group = info->CrossRealmGroups[allianceIndex];
+                    if (group.GroupMemberCount > 0)
+                    {
+                        byte displayIdx = group.GroupMembers[0].GroupIndex;
+                        if (displayIdx < 3)
+                        {
+                            letter = ((char)('A' + displayIdx)).ToString();
+                            return true;
+                        }
+                    }
+
+                    for (byte d = 0; d < 3; d++)
+                    {
+                        if (InfoProxyCrossRealm.GetGroupIndex(d) == allianceIndex)
+                        {
+                            letter = ((char)('A' + d)).ToString();
+                            return true;
+                        }
+                    }
                 }
 
-                // Direct lookup when CrossRealm index matches ours (e.g. both use same ordering)
-                var group = info->CrossRealmGroups[allianceIndex];
-                if (group.GroupMemberCount > 0)
-                {
-                    byte displayIdx = group.GroupMembers[0].GroupIndex;
-                    if (displayIdx < 3)
-                    {
-                        letter = ((char)('A' + displayIdx)).ToString();
-                        return true;
-                    }
-                }
-
-                // GetGroupIndex(displayLetter) returns internal index - find which letter maps to our index
-                for (byte d = 0; d < 3; d++)
-                {
-                    if (InfoProxyCrossRealm.GetGroupIndex(d) == allianceIndex)
-                    {
-                        letter = ((char)('A' + d)).ToString();
-                        return true;
-                    }
-                }
+                // CrossRealm empty (in-instance with GroupManager): use direct GM-index mapping.
+                // GroupManager alliance index 0=A, 1=B, 2=C in the game's party list display order.
+                letter = ((char)('A' + allianceIndex)).ToString();
+                return true;
             }
 
-            // Fallback when no CrossRealm data (PvP, in-instance)
+            // Fallback when no CrossRealm/InfoProxy data (PvP edge cases)
             letter = ((char)('A' + allianceIndex)).ToString();
             return true;
         }
@@ -261,28 +280,61 @@ 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++)
+
+                if (allianceIdx == 2)
                 {
-                    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++;
+                    // Our party: _partyMembers via GetPartyMemberByIndex
+                    for (int slot = 0; slot < 8; slot++)
+                    {
+                        var pm = mainGroup.GetPartyMemberByIndex(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++;
+                    }
                 }
+                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])
                 {
                     _allianceMembers[allianceIdx].Clear();
@@ -295,7 +347,11 @@ namespace HSUI.Interface.Party
                     int ourIdx = 0;
                     for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
                     {
-                        var pm = 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);
@@ -372,6 +428,34 @@ namespace HSUI.Interface.Party
                 else
                     Plugin.Logger.Information($"[Alliance] Display slot {slot}: no data");
             }
+
+            // Letter-resolution path debug: which code path is used and why
+            bool crossRealmHasData = false;
+            if (info != null && info->GroupCount >= 3)
+            {
+                for (int i = 0; i < 3; i++)
+                {
+                    if (info->CrossRealmGroups[i].GroupMemberCount > 0)
+                    {
+                        crossRealmHasData = true;
+                        break;
+                    }
+                }
+            }
+            Plugin.Logger.Information($"[Alliance] crossRealmHasData={crossRealmHasData} → {(crossRealmHasData ? "EntityId/GetGroupIndex path" : "LocalPlayerGroupIndex path")}");
+
+            int dbgPlayerIdx = inst.PlayerAllianceIndex;
+            byte dbgLocalDisplayIdx = info != null ? info->LocalPlayerGroupIndex : (byte)255;
+            Plugin.Logger.Information($"[Alliance] LocalPlayerGroupIndex mapping: playerIdx={dbgPlayerIdx} localDisplayIdx={dbgLocalDisplayIdx} (0=A,1=B,2=C for our alliance)");
+            Plugin.Logger.Information($"[Alliance] Formula: displayIndex = (gmIndex - playerIdx + localDisplayIdx + 3) % 3");
+            for (int i = 0; i < 3; i++)
+            {
+                int displayIndex = (i - dbgPlayerIdx + dbgLocalDisplayIdx + 3) % 3;
+                char computedLetter = displayIndex >= 0 && displayIndex < 3 ? (char)('A' + displayIndex) : '?';
+                string ours = i == dbgPlayerIdx ? " (OURS)" : "";
+                Plugin.Logger.Information($"[Alliance]   GM[{i}] → displayIndex=({i}-{dbgPlayerIdx}+{dbgLocalDisplayIdx}+3)%3={displayIndex} → letter '{computedLetter}'{ours}");
+            }
+
             Plugin.Logger.Information("=== End Alliance Debug ===");
         }
 

Interface/Party/PartyFramesCooldownListHud.cs

@@ -283,10 +283,14 @@ namespace HSUI.Interface.Party
                 // tooltip
                 if (Config.ShowTooltips)
                 {
+                    uint? iconId = hoveringCooldown.Data.IconId > 0 ? hoveringCooldown.Data.IconId : null;
                     TooltipsHelper.Instance.ShowTooltipOnCursor(
                         hoveringCooldown.TooltipText(),
                         hoveringCooldown.Data.Name,
-                        hoveringCooldown.Data.ActionId
+                        hoveringCooldown.Data.ActionId,
+                        "",
+                        iconId,
+                        HSUI.Helpers.TooltipIdKind.Action
                     );
                 }
             }

Interface/PartyCooldowns/PartyCooldownsHud.cs

@@ -304,10 +304,14 @@ namespace HSUI.Interface.PartyCooldowns
                     pos = origin + new Vector2(pos.X - size.Y + 1, pos.Y);
                     if (Config.ShowTooltips && ImGui.IsMouseHoveringRect(pos, pos + _barConfig.Size))
                     {
+                        uint? iconId = cooldown.Data.IconId > 0 ? cooldown.Data.IconId : null;
                         TooltipsHelper.Instance.ShowTooltipOnCursor(
                             cooldown.TooltipText(),
                             cooldown.Data.Name,
-                            cooldown.Data.ActionId
+                            cooldown.Data.ActionId,
+                            "",
+                            iconId,
+                            HSUI.Helpers.TooltipIdKind.Action
                         );
                     }
 

Interface/StatusEffects/StatusEffectsListHud.cs

@@ -468,11 +468,14 @@ namespace HSUI.Interface.StatusEffects
                 // tooltip
                 if (Config.ShowTooltips)
                 {
+                    uint? iconId = data.Data.Icon > 0 ? data.Data.Icon : null;
                     TooltipsHelper.Instance.ShowTooltipOnCursor(
                         EncryptedStringsHelper.GetString(data.Data.Description.ToDalamudString().ToString()),
                         EncryptedStringsHelper.GetString(data.Data.Name.ToString()),
                         data.Status.StatusId,
-                        GetStatusActorName(data.Status)
+                        GetStatusActorName(data.Status),
+                        iconId,
+                        HSUI.Helpers.TooltipIdKind.Status
                     );
                 }
 

Plugin.cs

@@ -136,6 +136,7 @@ namespace HSUI
             ActionBarsManager.Initialize();
             TextTagsHelper.Initialize();
             TooltipsHelper.Initialize();
+            ActionChatLinkHelper.Initialize();
             PetRenamerHelper.Initialize();
             HonorificHelper.Initialize();
             WotsitHelper.Initialize();
@@ -437,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
             {
@@ -479,6 +483,7 @@ namespace HSUI
             TryDispose("ProfilesManager", () => ProfilesManager.Instance?.Dispose());
             TryDispose("SpellHelper", () => SpellHelper.Instance?.Dispose());
             TryDispose("TooltipsHelper", () => TooltipsHelper.Instance?.Dispose());
+            TryDispose("ActionChatLinkHelper", () => ActionChatLinkHelper.Instance?.Dispose());
             TryDispose("HonorificHelper", () => HonorificHelper.Instance?.Dispose());
             TryDispose("PetRenamerHelper", () => PetRenamerHelper.Instance?.Dispose());
             TryDispose("WotsitHelper", () => WotsitHelper.Instance?.Dispose());

changelog.md

@@ -1,3 +1,70 @@
+# 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.
+
+# 1.0.7.1
+- **UI**: Removed Discord and Ko-fi links from in-game config.
+
+# 1.0.7.0
+- **Hotbars**: Charge count on slots — abilities with charges (e.g. 2-stack) show the current charge number in the top-left of the slot; keybind stays in the bottom-right. Toggle in Hotbars → Show Charge Count.
+- **Fix**: Left-click no longer stays broken after disabling HSUI. WndProc is restored first on plugin unload so the game window gets normal input back even when disposal order changes (e.g. after a patch).
+
+# 1.0.6.0
+- **Tooltips**: Icons in tooltips — action bars, status effects, and party cooldowns now show the item's icon next to the tooltip text when available.
+- **World Object Tooltip**: Quest/NPC icons — hovering over NPCs or objects displays their quest or state icon (e.g., exclamation marks, turn-in checks) in the tooltip. Toggle in Misc → World Tooltip → Show Icon.
+
+# 1.0.5.0
+- **World Object Tooltip**: Hover over players, NPCs, or objects in the world to see a tooltip with name, level, HP, job (players), FC tag (optional), distance, and object ID. Enable in Misc → World Tooltip; optional detach-from-cursor with fixed position.
+
+# 1.0.4.0
+- **PvP nameplates**: Grand Company icons on enemy nameplates (Maelstrom, Twin Adder, Immortal Flames — icon IDs 62601, 62602, 62603). Configurable icon IDs in Nameplates → Enemies → Company Icon (PvP) if you need to override.
+- **PvP nameplates**: Role/Job icon on enemy player nameplates — enable in Nameplates → Enemies → Role/Job Icon (enemy players); supports job or role style like player nameplates.
+- **Hotbars**: Main Actions and Extra Commands now show correct tooltip name and description from the MainCommand sheet (fixes "Main Action" / "Main Action" generic text).
+- **Alliance Frames**: Further label fixes and debug output for alliance letter mapping.
+
 # 1.0.3.0
 - **Alliance Frames**: Fixed alliance letter labels (A/B/C) — correct display when player is in any alliance (A, B, or C); EntityId matching for proper letter resolution when GroupManager and CrossRealm use different orderings; improved PlayerAllianceIndex detection.
 - **Alliance Frames**: PvP support — frames now display in Frontlines and Rival Wings.

pluginmaster.json

@@ -1,23 +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": "Alliance Frames: Fixed A/B/C labels when player in any alliance; PvP support. Hotbars: Shared bar persistence. Config: Save on teleport. Debug: /hsui_alliance_debug.",
-    "InternalName": "HSUI",
-    "AssemblyVersion": "1.0.3.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.3.0/latest.zip",
-    "IsHide": false,
-    "IsTestingExclusive": false,
-    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.3.0/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.3.0/latest.zip"
-  }
-]
+[{"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.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.13","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.13/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.13/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.13/latest.zip","LastUpdate":"1760486400"}]