Compare commits

..

33 Commits

Author SHA1 Message Date
KnackAtNite 3618fc5121 v1.0.8.18: Visibility 'Hide unless hovered' option
Made-with: Cursor
2026-02-28 15:09:42 -05:00
KnackAtNite 1c25918c22 v1.0.8.17: Controller hotbars (PR #2) - cross layout, separate storage, sync with game. Fix KamiToolKit ref for build.
Made-with: Cursor
2026-02-26 23:22:27 -05:00
KnackAtNite c2e0b1be62 Merge pull request 'feat: Controller hotbars with cross layout, separate storage, and sync with game' (#2) from feature/controller-hotbars into main 2026-02-27 04:20:41 +00:00
Jorg f3e10f27d2 feat: Controller hotbars with cross layout, separate storage, and sync with game
- Add controller hotbars: 8 cross bars (L2/R2 style), separate from normal hotbars 1-8
- Controller bar slot data stored in config (not game StandardHotbars) so layouts can differ per mode
- Drag-and-drop on controller bars: from game, shift+drag rearrange, release outside to clear
- Independent controller bar keybinds with modifier+trigger combinations (e.g. L2+South)
- Optional 'Sync bar mode with game client': follow Character Config Mouse/Gamepad toggle (PadMode)
- Clone/copy actions: normal hotbars ↔ controller bars
- Restore controller bar layout button; deploy to devPlugins on Release build

Made-with: Cursor
2026-02-26 22:18:40 -06:00
KnackAtNite 369a770162 Release v1.0.8.16: Show HUD during dialogue, update pluginmaster and download URLs
Made-with: Cursor
2026-02-26 02:51:03 -05:00
KnackAtNite b635e72084 Show HUD during dialogue: add option to keep hotbars/UI visible when talking to NPCs or interacting
Made-with: Cursor
2026-02-26 02:47:33 -05:00
KnackAtNite cb7b09a820 v1.0.8.15: Tooltip game-style formatting (section labels, tail alignment, config)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-21 21:54:37 -05:00
KnackAtNite 19254aad20 Merge pull request 'Tooltip: game-style formatting with section labels, tail alignment, and config options' (#1) from feature/tooltip-updates into main 2026-02-22 02:53:03 +00:00
Jorg 925c3af558 Tooltip: game-style formatting with section labels, tail alignment, and config options
- Add TooltipSegment and colored formatting (section labels green, status names yellow)
- Sections: Additional Effect, Duration, Maximum Charges, Blood Gauge Cost, Combo, role labels
- Tail text (e.g. 'Cannot be executed while bound.', parenthetical notes) now left-aligned on own line
- Section values (e.g. '2', '50', '30m') stay on same line as labels
- Config: Use Game-style formatting, Section/Status/Secondary colors
- Config: Tooltip Max Width, Line Spacing, Font Scale, Icon Scale, Height Buffer slider
- ActionBarsHud: pass formatted segments to ShowTooltipOnCursor when game-style enabled

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-21 20:50:07 -06:00
KnackAtNite c5b8e48072 v1.0.8.14: Mouse GCD Indicator (ring around cursor)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-11 00:36:56 -05:00
KnackAtNite d2eb40b450 v1.0.8.13: Item tooltips (TryGetRow + base item ID)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-10 21:55:38 -05:00
KnackAtNite cdffaeb168 v1.0.8.12: Item/HQ icons draw on hotbar (iconId >= 1000000 encoding)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-10 21:51:04 -05:00
KnackAtNite 346969835a v1.0.8.11: Hotbar tooltip crash fix (Lumina GetRow)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-10 21:37:10 -05:00
KnackAtNite 2ac48bbd81 v1.0.8.10: Hotbar crash fix when dragging inventory items; Release builds strip PDBs
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-10 21:24:16 -05:00
KnackAtNite ccee580789 PvP hotbar fix: load saved PvE on zone leave then use live bars; Show Action ID in tooltips
- On leaving PvP, LoadSavedHotbar for all 10 bars (via TryRestorePvEHotbarsAfterLeavePvP in Framework update) and re-apply for ~2s so live Hotbars show PvE
- GetSlotData always reads from live StandardHotbars so combo updates (e.g. Pictomancer) and icons work normally
- Misc: Show Action ID option in Misc -> Tooltips; hotbar/party cooldown tooltips pass TooltipIdKind for Action vs Status IDs

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 16:26:26 -05:00
KnackAtNite 5ffbdd0b51 Release v1.0.8.9: Gearset persists on slot
- Do not treat slot as empty when CommandType is GearSet (CommandId 0 valid)
- Use CommandType/CommandId for GearSet display; resolve icon when IconId 0
- Bump version, changelog, pluginmaster

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 15:29:37 -05:00
KnackAtNite 280004bdb0 Release v1.0.8.8: Gearset drag-drop and index 0 fix
- Only call LoadIconId() for GearSet slots so drop still sticks
- Allow gearset id 0 (first in list) in drop validation and GetIconIdForPayload
- Bump version, changelog, pluginmaster

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 15:24:40 -05:00
KnackAtNite d8da154e72 Release v1.0.8.7: Gearset icon fix
- Bump version to 1.0.8.7
- Changelog: fix Gearset/Job Gear Set icon clearing when first equipment slot changes
- pluginmaster: update AssemblyVersion, Changelog, download links, LastUpdate

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 15:16:14 -05:00
KnackAtNite db6e91afd1 Action bars: fix Gearset/Job Gear Set icon clearing when first gear slot changes
Call LoadIconId() before reading slot IconId so the game populates the icon
from ApparentSlotType/ApparentActionId (e.g. job icon for GearSet). Without
this, when the first equipment slot in a gearset changes the cached IconId
can be 0 and the bar shows a blank icon.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 15:13:46 -05:00
KnackAtNite 01426d3c30 v1.0.8.6: Fix crafting action tooltips - use CraftAction.Description instead of ActionTransient
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 00:47:35 -05:00
KnackAtNite cb3d6b5e0b 1.0.8.5: Fix other HSUI elements disappearing on hotbar hover (child window overlay)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 23:36:46 -05:00
KnackAtNite 9391ef1451 Bump to 1.0.8.4, changelog for alliance/crafting/visibility fixes
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 22:39:48 -05:00
KnackAtNite 3b5ddbe2f9 Alliance frames, crafting tooltips, visibility: fix display and tooltips
- Alliance Frames: Populate other alliances (A/B) via GetAllianceMemberByIndex flat indices (0-7, 8-15) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance; keep own party from GetPartyMemberByIndex.
- Alliance Frames: Visibility: do not apply HideInDuty to Alliance Frames so they show in alliance raids when visibility rules are enabled.
- Hotbars: Crafting action tooltips: fallback Action sheet lookup with +100000 offset when hotbar stores CraftAction row ID.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 22:34:10 -05:00
KnackAtNite 57d1bc5c0f 1.0.8.3: Restore WndProc at start of teardown so left-click works after disable
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 10:57:36 -05:00
KnackAtNite f4912bbdb2 1.0.8.2: Charge icons stay lit until all charges spent (slot recast + ActionManager). Changelog 1.0.8.1/1.0.8.2.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 02:01:20 -05:00
KnackAtNite 61a3de4d09 Bump to 1.0.8.1 for release (changelog, pluginmaster)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 01:28:46 -05:00
KnackAtNite eba2a33649 Don't grey out action icons until all charges are spent
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 01:24:04 -05:00
KnackAtNite 11e30309c4 Bump version to 1.0.8.1
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-03 22:56:56 -05:00
KnackAtNite c49d22d867 Action bars: use GetAdjustedActionId for Action slot display (combo/HSRCombos)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-03 22:51:37 -05:00
KnackAtNite 78b37a3f15 v1.0.8.0: Action Chat Link, hotbar job-specific persistence fix
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-01 23:40:50 -05:00
KnackAtNite 9f41c18c0b v1.0.7.1: Remove Discord and Ko-fi links from in-game config
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-01 15:01:45 -05:00
KnackAtNite d95884fe7d v1.0.7.0: Hotbar charge count on slots; fix WndProc restore on unload (left-click after disable)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-01 14:45:12 -05:00
KnackAtNite 9f95fb90dd v1.0.6.0: Tooltip icons for action bars, status effects, party cooldowns; World Object Tooltip quest/NPC icons
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-01 11:12:54 -05:00
34 changed files with 3134 additions and 252 deletions
+19
View File
@@ -45,6 +45,7 @@ namespace HSUI.Config
private MainConfigWindow _mainConfigWindow; private MainConfigWindow _mainConfigWindow;
private ChangelogWindow _changelogWindow; private ChangelogWindow _changelogWindow;
private GridWindow _gridWindow; private GridWindow _gridWindow;
private ControllerBarKeybindsWindow _controllerBarKeybindsWindow;
public bool IsConfigWindowOpened => _mainConfigWindow.IsOpen; public bool IsConfigWindowOpened => _mainConfigWindow.IsOpen;
public bool IsChangelogWindowOpened => _changelogWindow.IsOpen; public bool IsChangelogWindowOpened => _changelogWindow.IsOpen;
@@ -145,11 +146,13 @@ namespace HSUI.Config
string changelog = LoadChangelog(); string changelog = LoadChangelog();
_changelogWindow = new ChangelogWindow("HSUI Changelog v" + Plugin.Version, changelog); _changelogWindow = new ChangelogWindow("HSUI Changelog v" + Plugin.Version, changelog);
_gridWindow = new GridWindow("Grid ##HSUI"); _gridWindow = new GridWindow("Grid ##HSUI");
_controllerBarKeybindsWindow = new ControllerBarKeybindsWindow();
_windowSystem = new WindowSystem("HSUI_Windows"); _windowSystem = new WindowSystem("HSUI_Windows");
_windowSystem.AddWindow(_mainConfigWindow); _windowSystem.AddWindow(_mainConfigWindow);
_windowSystem.AddWindow(_changelogWindow); _windowSystem.AddWindow(_changelogWindow);
_windowSystem.AddWindow(_gridWindow); _windowSystem.AddWindow(_gridWindow);
_windowSystem.AddWindow(_controllerBarKeybindsWindow);
CheckVersion(); CheckVersion();
@@ -336,6 +339,11 @@ namespace HSUI.Config
_changelogWindow.IsOpen = true; _changelogWindow.IsOpen = true;
} }
public void OpenControllerBarKeybindsWindow()
{
_controllerBarKeybindsWindow.IsOpen = true;
}
public void Draw() public void Draw()
{ {
_windowSystem.Draw(); _windowSystem.Draw();
@@ -675,6 +683,7 @@ namespace HSUI.Config
// Other Elements // Other Elements
typeof(ExperienceBarConfig), typeof(ExperienceBarConfig),
typeof(GCDIndicatorConfig), typeof(GCDIndicatorConfig),
typeof(MouseGCDIndicatorConfig),
typeof(HotbarsConfig), typeof(HotbarsConfig),
typeof(Hotbar1BarConfig), typeof(Hotbar1BarConfig),
typeof(Hotbar2BarConfig), typeof(Hotbar2BarConfig),
@@ -686,6 +695,16 @@ namespace HSUI.Config
typeof(Hotbar8BarConfig), typeof(Hotbar8BarConfig),
typeof(Hotbar9BarConfig), typeof(Hotbar9BarConfig),
typeof(Hotbar10BarConfig), typeof(Hotbar10BarConfig),
typeof(ControllerHotbarsConfig),
typeof(ControllerBar1Config),
typeof(ControllerBar2Config),
typeof(ControllerBar3Config),
typeof(ControllerBar4Config),
typeof(ControllerBar5Config),
typeof(ControllerBar6Config),
typeof(ControllerBar7Config),
typeof(ControllerBar8Config),
typeof(ControllerBarKeybindsConfig),
typeof(PullTimerConfig), typeof(PullTimerConfig),
typeof(LimitBreakConfig), typeof(LimitBreakConfig),
typeof(MPTickerConfig), typeof(MPTickerConfig),
-6
View File
@@ -45,12 +45,6 @@ namespace HSUI.Interface
} }
ImGuiHelper.DrawSeparator(1, 1); 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 // error modal
if (_errorMessage != null) if (_errorMessage != null)
-26
View File
@@ -241,32 +241,6 @@ namespace HSUI.Config.Tree
ImGui.PopStyleColor(); ImGui.PopStyleColor();
ImGui.PopFont(); ImGui.PopFont();
ImGuiHelper.SetTooltip("Changelog"); 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(); ImGui.EndChild();
@@ -0,0 +1,245 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using Dalamud.Game.ClientState.GamePad;
using Dalamud.Game.ClientState.Keys;
using Dalamud.Interface.Windowing;
using HSUI.Config;
using HSUI.Interface.GeneralElements;
using Dalamud.Bindings.ImGui;
namespace HSUI.Config.Windows
{
public class ControllerBarKeybindsWindow : Window
{
private ControllerBarKeybindsConfig? _config;
private int _selectedBar = 1;
private int _listeningBar = -1;
private int _listeningSlot = -1;
private HashSet<VirtualKey>? _listeningLastKeys;
private HashSet<GamepadButtons>? _listeningLastPads;
private const int SlotsPerBar = 8;
private static readonly GamepadButtons[] ModifierButtons = { GamepadButtons.L1, GamepadButtons.L2, GamepadButtons.R1, GamepadButtons.R2 };
private static readonly VirtualKey[] ModifierKeys = { VirtualKey.LSHIFT, VirtualKey.RSHIFT, VirtualKey.LCONTROL, VirtualKey.RCONTROL, VirtualKey.LMENU, VirtualKey.RMENU };
private const float CellSize = 44;
private const float Pad = 4;
private const float Gap = 8;
public ControllerBarKeybindsWindow() : base("Controller bar keybinds")
{
Size = new Vector2(520, 380);
SizeCondition = ImGuiCond.FirstUseEver;
Flags = ImGuiWindowFlags.NoScrollbar;
}
public override void Draw()
{
_config = ConfigurationManager.Instance?.GetConfigObject<ControllerBarKeybindsConfig>();
if (_config == null) return;
ImGui.Text("Assign keyboard or gamepad buttons to controller cross bar slots.");
ImGui.Spacing();
// Bar selector
ImGui.Text("Cross bar:");
ImGui.SameLine(100);
for (int b = 1; b <= 8; b++)
{
if (b > 1) ImGui.SameLine();
if (ImGui.Button($"{(b == _selectedBar ? "[" : " ")}{b}{(b == _selectedBar ? "]" : " ")}", new Vector2(32, 0)))
_selectedBar = b;
}
ImGui.Spacing();
ImGui.Separator();
ImGui.Spacing();
if (_listeningBar >= 0 && _listeningSlot >= 0)
{
ImGui.TextColored(new Vector4(1, 0.8f, 0, 1), "Hold trigger (L2/R2/L1/R1) or modifier (Shift/Ctrl/Alt), then press a key or button. Or press a key/button alone.");
ImGui.SameLine();
if (ImGui.Button("Cancel"))
{
_listeningBar = -1;
_listeningSlot = -1;
_listeningLastKeys = null;
_listeningLastPads = null;
}
PollAndAssign();
}
else
{
ImGui.Text($"Bar {_selectedBar} — click a slot, then hold modifiers (e.g. L2) and press a button. Right-click to clear.");
}
ImGui.Spacing();
// Two crosses side by side (same layout as CrossBarHud)
float leftCrossW = 3 * (CellSize + Pad);
float startX = ImGui.GetCursorScreenPos().X;
float startY = ImGui.GetCursorScreenPos().Y;
for (int slot = 0; slot < SlotsPerBar; slot++)
{
(int col, int row) = GetCrossSlotLayout(slot);
float x = startX + (slot < 4 ? col * (CellSize + Pad) : leftCrossW + Gap + col * (CellSize + Pad));
float y = startY + row * (CellSize + Pad);
ImGui.SetCursorScreenPos(new Vector2(x, y));
string current = _config.GetKeybind(_selectedBar, slot);
string label = string.IsNullOrEmpty(current) ? "None" : GetKeybindDisplayName(current);
bool listening = _listeningBar == _selectedBar && _listeningSlot == slot;
if (listening)
ImGui.PushStyleColor(ImGuiCol.Button, new Vector4(0.4f, 0.6f, 0.2f, 0.8f));
if (ImGui.Button($"##bar{_selectedBar}_slot{slot}", new Vector2(CellSize, CellSize)))
{
_listeningBar = _selectedBar;
_listeningSlot = slot;
}
if (listening) ImGui.PopStyleColor();
if (ImGui.IsItemHovered())
{
if (ImGui.IsMouseClicked(ImGuiMouseButton.Right))
{
_config.SetKeybind(_selectedBar, slot, "");
ConfigurationManager.Instance?.SaveConfigurations();
}
}
string shortLabel = label.Length > 6 ? label.Substring(0, 6) + "…" : label;
Vector2 textSize = ImGui.CalcTextSize(shortLabel);
ImGui.SetCursorScreenPos(new Vector2(x + (CellSize - textSize.X) * 0.5f, y + (CellSize - textSize.Y) * 0.5f));
ImGui.Text(shortLabel);
}
ImGui.SetCursorScreenPos(new Vector2(startX, startY + 3 * (CellSize + Pad) + 20));
ImGui.Spacing();
if (ImGui.Button("Close"))
IsOpen = false;
}
private static (int col, int row) GetCrossSlotLayout(int slotIndex)
{
if (slotIndex < 4)
return slotIndex switch { 0 => (1, 0), 1 => (0, 1), 2 => (2, 1), _ => (1, 2) };
int i = slotIndex - 4;
return i switch { 0 => (1, 0), 1 => (0, 1), 2 => (2, 1), _ => (1, 2) };
}
private void PollAndAssign()
{
var currentKeys = new HashSet<VirtualKey>();
var currentPads = new HashSet<GamepadButtons>();
if (Plugin.KeyState != null)
{
foreach (var vk in Plugin.KeyState.GetValidVirtualKeys())
{
if (vk == VirtualKey.ESCAPE) continue;
if (Plugin.KeyState[vk])
currentKeys.Add(vk);
}
}
if (Plugin.GamepadState != null)
{
foreach (var btn in GetGamepadButtonsToPoll())
{
if (Plugin.GamepadState.Raw(btn) > 0.5f)
currentPads.Add(btn);
}
}
// First frame of listening: record state as "last" and wait for next frame
if (_listeningLastKeys == null)
{
_listeningLastKeys = new HashSet<VirtualKey>(currentKeys);
_listeningLastPads = new HashSet<GamepadButtons>(currentPads);
return;
}
var modifierKeySet = new HashSet<VirtualKey>(ModifierKeys);
var modifierPadSet = new HashSet<GamepadButtons>(ModifierButtons);
var heldModifierKeys = new HashSet<VirtualKey>(currentKeys.Where(k => modifierKeySet.Contains(k) && _listeningLastKeys.Contains(k)));
var heldModifierPads = new HashSet<GamepadButtons>(currentPads.Where(b => modifierPadSet.Contains(b) && _listeningLastPads!.Contains(b)));
string? triggerPart = null;
foreach (var vk in Plugin.KeyState?.GetValidVirtualKeys() ?? Array.Empty<VirtualKey>())
{
if (vk == VirtualKey.ESCAPE) continue;
if (currentKeys.Contains(vk) && !_listeningLastKeys.Contains(vk))
{
triggerPart = "Key:" + vk;
break;
}
}
if (triggerPart == null && Plugin.GamepadState != null)
{
foreach (var btn in GetGamepadButtonsToPoll())
{
if (currentPads.Contains(btn) && !_listeningLastPads!.Contains(btn))
{
triggerPart = "Pad:" + btn;
break;
}
}
}
_listeningLastKeys = new HashSet<VirtualKey>(currentKeys);
_listeningLastPads = new HashSet<GamepadButtons>(currentPads);
if (triggerPart == null) return;
var parts = new List<string>();
foreach (var vk in heldModifierKeys.OrderBy(k => k.ToString()))
parts.Add("Key:" + vk);
foreach (var btn in heldModifierPads.OrderBy(b => b.ToString()))
parts.Add("Pad:" + btn);
parts.Add(triggerPart);
string assigned = string.Join("+", parts);
if (_listeningBar >= 0 && _listeningSlot >= 0 && _config != null)
{
_config.SetKeybind(_listeningBar, _listeningSlot, assigned);
ConfigurationManager.Instance?.SaveConfigurations();
_listeningBar = -1;
_listeningSlot = -1;
_listeningLastKeys = null;
_listeningLastPads = null;
}
}
private static IEnumerable<GamepadButtons> GetGamepadButtonsToPoll()
{
return new[]
{
GamepadButtons.DpadUp, GamepadButtons.DpadDown, GamepadButtons.DpadLeft, GamepadButtons.DpadRight,
GamepadButtons.North, GamepadButtons.South, GamepadButtons.West, GamepadButtons.East,
GamepadButtons.L1, GamepadButtons.L2, GamepadButtons.L3,
GamepadButtons.R1, GamepadButtons.R2, GamepadButtons.R3,
GamepadButtons.Start, GamepadButtons.Select
};
}
private static string GetKeybindDisplayName(string value)
{
if (string.IsNullOrEmpty(value)) return "None";
var parts = value.Split('+');
var display = new List<string>();
foreach (var p in parts)
{
string s = p.Trim();
if (s.StartsWith("Key:", StringComparison.OrdinalIgnoreCase))
display.Add(s.Length > 4 ? s.Substring(4).Replace("VK_", "") : s);
else if (s.StartsWith("Pad:", StringComparison.OrdinalIgnoreCase))
display.Add(s.Length > 4 ? s.Substring(4) : s);
else
display.Add(s);
}
return string.Join(" + ", display);
}
}
}
+20 -3
View File
@@ -9,9 +9,9 @@
<PropertyGroup> <PropertyGroup>
<AssemblyName>HSUI</AssemblyName> <AssemblyName>HSUI</AssemblyName>
<AssemblyVersion>1.0.5.0</AssemblyVersion> <AssemblyVersion>1.0.8.18</AssemblyVersion>
<FileVersion>1.0.5.0</FileVersion> <FileVersion>1.0.8.18</FileVersion>
<InformationalVersion>1.0.5.0</InformationalVersion> <InformationalVersion>1.0.8.18</InformationalVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@@ -24,6 +24,9 @@
<PropertyGroup Condition="'$(Configuration)'=='Release'"> <PropertyGroup Condition="'$(Configuration)'=='Release'">
<Deterministic>true</Deterministic> <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>
<PropertyGroup> <PropertyGroup>
@@ -53,4 +56,18 @@
<PackageReference Include="Colourful" Version="3.2.0" /> <PackageReference Include="Colourful" Version="3.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup> </ItemGroup>
<!-- Deploy Release build to devPlugins so the game loads it automatically -->
<Target Name="DeployToDevPlugins" AfterTargets="Build" Condition="'$(Configuration)'=='Release'">
<PropertyGroup>
<_HomeDir>$([System.Environment]::GetEnvironmentVariable('HOME'))</_HomeDir>
<_UserProfile>$([System.Environment]::GetEnvironmentVariable('USERPROFILE'))</_UserProfile>
<DevPluginsDir Condition="'$(_HomeDir)' != ''">$(_HomeDir)/.xlcore/devPlugins/HSUI</DevPluginsDir>
<DevPluginsDir Condition="'$(DevPluginsDir)' == '' and '$(_UserProfile)' != ''">$(_UserProfile)/.xlcore/devPlugins/HSUI</DevPluginsDir>
<DevPluginsDir Condition="'$(DevPluginsDir)' == ''">$(UserProfile)/.xlcore/devPlugins/HSUI</DevPluginsDir>
</PropertyGroup>
<MakeDir Directories="$(DevPluginsDir)" Condition="'$(DevPluginsDir)' != '' and !Exists('$(DevPluginsDir)')" />
<Copy SourceFiles="$(OutputPath)HSUI.dll" DestinationFolder="$(DevPluginsDir)" SkipUnchangedFiles="true" Condition="'$(DevPluginsDir)' != '' and Exists('$(DevPluginsDir)')" />
<Message Importance="high" Text="Deployed HSUI.dll to $(DevPluginsDir)" Condition="'$(DevPluginsDir)' != ''" />
</Target>
</Project> </Project>
+1 -1
View File
@@ -2,7 +2,7 @@
"Author": "Knack117", "Author": "Knack117",
"Name": "HSUI", "Name": "HSUI",
"InternalName": "HSUI", "InternalName": "HSUI",
"AssemblyVersion": "1.0.5.0", "AssemblyVersion": "1.0.8.18",
"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.", "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", "ApplicableVersion": "any",
"RepoUrl": "https://github.com/Knack117/HSUI", "RepoUrl": "https://github.com/Knack117/HSUI",
+276 -15
View File
@@ -7,6 +7,8 @@ using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.System.String;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using HSUI.Config;
using HSUI.Interface.GeneralElements;
using KamiToolKit.Controllers; using KamiToolKit.Controllers;
using static FFXIVClientStructs.FFXIV.Client.Game.ActionManager; using static FFXIVClientStructs.FFXIV.Client.Game.ActionManager;
@@ -50,8 +52,12 @@ namespace HSUI.Helpers
public RaptureHotbarModule.HotbarSlotType SlotType { get; } public RaptureHotbarModule.HotbarSlotType SlotType { get; }
/// <summary>Keybind hint from game (user's keybind settings). Empty if unavailable.</summary> /// <summary>Keybind hint from game (user's keybind settings). Empty if unavailable.</summary>
public string KeybindHint { get; } 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; IconId = iconId;
IsEmpty = isEmpty; IsEmpty = isEmpty;
@@ -61,6 +67,8 @@ namespace HSUI.Helpers
ActionId = actionId; ActionId = actionId;
SlotType = slotType; SlotType = slotType;
KeybindHint = keybindHint ?? ""; KeybindHint = keybindHint ?? "";
CurrentCharges = currentCharges;
MaxCharges = maxCharges;
} }
} }
@@ -83,9 +91,48 @@ namespace HSUI.Helpers
return p; 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> /// <summary>
/// Reads hotbar slot data from RaptureHotbarModule. Returns up to slotCount slots. /// Reads hotbar slot data from RaptureHotbarModule. Returns up to slotCount slots.
/// hotbarIndex 1-10 maps to StandardHotbars 0-9. /// 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> /// </summary>
public unsafe List<SlotInfo> GetSlotData(int hotbarIndex, int slotCount) public unsafe List<SlotInfo> GetSlotData(int hotbarIndex, int slotCount)
{ {
@@ -94,11 +141,11 @@ namespace HSUI.Helpers
if (module == null || !module->ModuleReady) if (module == null || !module->ModuleReady)
return list; return list;
var hotbars = module->StandardHotbars;
int barIdx = Math.Clamp(hotbarIndex, 1, 10) - 1; int barIdx = Math.Clamp(hotbarIndex, 1, 10) - 1;
int count = Math.Clamp(slotCount, 1, 12); int count = Math.Clamp(slotCount, 1, 12);
var hotbars = module->StandardHotbars;
ref var bar = ref hotbars[barIdx]; ref var bar = ref hotbars[barIdx];
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
var slot = bar.GetHotbarSlot((uint)i); var slot = bar.GetHotbarSlot((uint)i);
@@ -106,32 +153,214 @@ namespace HSUI.Helpers
if (slot == null) 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; 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; 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 iconId = slot->IconId;
uint actionId = slot->ApparentActionId; if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet && iconId == 0)
var slotType = slot->ApparentSlotType; {
int resolved = slot->GetIconIdForSlot(slotType, actionId);
if (resolved > 0)
iconId = (uint)resolved;
}
(int pct, int secsLeft) = GetSlotCooldown(slot); (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; return list;
} }
/// <summary>Scratch bar/slot used to build SlotInfo or execute from (type, id) without touching game bars 1-8. Bar 10 slot 0.</summary>
internal const int ScratchBarIndex = 10;
internal const int ScratchSlotIndex = 0;
/// <summary>Get SlotInfo for a single (type, id) by temporarily writing to scratch slot and reading. Used for controller bars.</summary>
private unsafe SlotInfo GetSlotInfoViaScratch(RaptureHotbarModule.HotbarSlotType slotType, uint commandId)
{
var module = RaptureHotbarModule.Instance();
if (module == null || !module->ModuleReady)
return new SlotInfo(0, true, false, 0, 0, 0, 0, "", 0, 0);
int barIdx = ScratchBarIndex - 1;
var slotPtr = module->GetSlotById((uint)barIdx, (uint)ScratchSlotIndex);
if (slotPtr == null)
return new SlotInfo(0, true, false, 0, 0, 0, 0, "", 0, 0);
uint saveType = (uint)slotPtr->CommandType;
uint saveId = slotPtr->CommandId;
try
{
slotPtr->Set(slotType, commandId);
slotPtr->LoadIconId();
if (slotType == RaptureHotbarModule.HotbarSlotType.Item)
slotPtr->LoadCostDataForSlot(true);
var list = GetSlotData(ScratchBarIndex, 1);
return list.Count > 0 ? list[0] : new SlotInfo(0, true, false, 0, 0, 0, 0, "", 0, 0);
}
finally
{
slotPtr->Set((RaptureHotbarModule.HotbarSlotType)saveType, saveId);
slotPtr->LoadIconId();
}
}
/// <summary>Get slot data for a controller cross bar (1-8) from persisted controller storage. Returns 8 SlotInfos.</summary>
public unsafe List<SlotInfo> GetControllerSlotData(int barIndex, int slotCount)
{
var list = new List<SlotInfo>(slotCount);
var barConfig = ControllerBarConfig.GetBarConfig(barIndex);
if (barConfig == null)
{
for (int i = 0; i < slotCount; i++)
list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, "", 0, 0));
return list;
}
barConfig.EnsureSlotsPadded();
int count = Math.Min(slotCount, barConfig.Slots.Count);
for (int i = 0; i < count; i++)
{
var entry = barConfig.Slots[i];
var type = (RaptureHotbarModule.HotbarSlotType)entry.SlotType;
uint id = entry.CommandId;
if (entry.IsEmpty)
{
list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, "", 0, 0));
continue;
}
list.Add(GetSlotInfoViaScratch(type, id));
}
while (list.Count < slotCount)
list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, "", 0, 0));
return list;
}
/// <summary>Place payload on a controller bar slot (persisted in config only). Bar 1-8, slot 0-7.</summary>
public void PlacePayloadOnControllerSlot(int barIndex, int slotIndex, RaptureHotbarModule.HotbarSlotType slotType, uint commandId)
{
var barConfig = ControllerBarConfig.GetBarConfig(barIndex);
if (barConfig == null) return;
barConfig.EnsureSlotsPadded();
int s = Math.Clamp(slotIndex, 0, ControllerBarConfig.CrossSlotCount - 1);
while (barConfig.Slots.Count <= s)
barConfig.Slots.Add(new ControllerSlotData { SlotType = (int)RaptureHotbarModule.HotbarSlotType.Empty, CommandId = 0 });
barConfig.Slots[s] = new ControllerSlotData { SlotType = (int)slotType, CommandId = commandId };
ConfigurationManager.Instance?.SaveConfigurations();
}
/// <summary>Clear a controller bar slot. Bar 1-8, slot 0-7.</summary>
public bool ClearControllerSlot(int barIndex, int slotIndex)
{
var barConfig = ControllerBarConfig.GetBarConfig(barIndex);
if (barConfig == null) return false;
barConfig.EnsureSlotsPadded();
int s = Math.Clamp(slotIndex, 0, ControllerBarConfig.CrossSlotCount - 1);
if (s >= barConfig.Slots.Count) return true;
barConfig.Slots[s] = new ControllerSlotData { SlotType = (int)RaptureHotbarModule.HotbarSlotType.Empty, CommandId = 0 };
ConfigurationManager.Instance?.SaveConfigurations();
return true;
}
/// <summary>Swap two controller bar slots. Bars 1-8, slots 0-7.</summary>
public bool SwapControllerSlots(int barA, int slotA, int barB, int slotB)
{
var configA = ControllerBarConfig.GetBarConfig(barA);
var configB = ControllerBarConfig.GetBarConfig(barB);
if (configA == null || configB == null) return false;
configA.EnsureSlotsPadded();
configB.EnsureSlotsPadded();
int a = Math.Clamp(slotA, 0, ControllerBarConfig.CrossSlotCount - 1);
int b = Math.Clamp(slotB, 0, ControllerBarConfig.CrossSlotCount - 1);
if (barA == barB && a == b) return true;
if (a >= configA.Slots.Count || b >= configB.Slots.Count) return false;
var tmp = configA.Slots[a];
configA.Slots[a] = configB.Slots[b];
configB.Slots[b] = tmp;
ConfigurationManager.Instance?.SaveConfigurations();
return true;
}
/// <summary>Execute a controller bar slot by (type, id) via scratch slot. Bar 1-8, slot 0-7.</summary>
public unsafe bool ExecuteControllerSlot(int barIndex, int slotIndex)
{
var barConfig = ControllerBarConfig.GetBarConfig(barIndex);
if (barConfig == null) return false;
barConfig.EnsureSlotsPadded();
int s = Math.Clamp(slotIndex, 0, ControllerBarConfig.CrossSlotCount - 1);
if (s >= barConfig.Slots.Count) return false;
var entry = barConfig.Slots[s];
if (entry.IsEmpty) return false;
var slotType = (RaptureHotbarModule.HotbarSlotType)entry.SlotType;
uint commandId = entry.CommandId;
var module = RaptureHotbarModule.Instance();
if (module == null || !module->ModuleReady) return false;
var slotPtr = module->GetSlotById((uint)(ScratchBarIndex - 1), (uint)ScratchSlotIndex);
if (slotPtr == null) return false;
uint saveType = (uint)slotPtr->CommandType;
uint saveId = slotPtr->CommandId;
try
{
slotPtr->Set(slotType, commandId);
slotPtr->LoadIconId();
if (slotType == RaptureHotbarModule.HotbarSlotType.Item)
slotPtr->LoadCostDataForSlot(true);
module->ExecuteSlotById((uint)(ScratchBarIndex - 1), (uint)ScratchSlotIndex);
return true;
}
finally
{
slotPtr->Set((RaptureHotbarModule.HotbarSlotType)saveType, saveId);
slotPtr->LoadIconId();
}
}
/// <summary> /// <summary>
/// Gets cooldown for a hotbar slot. For Action/GeneralAction/PetAction, uses ActionManager recast API /// 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. /// (more accurate for adjusted IDs, recast groups). Falls back to slot's GetSlotActionCooldownPercentage for Items/Macros.
/// </summary> /// </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) private static unsafe (int CooldownPercent, int SecondsLeft) GetSlotCooldown(RaptureHotbarModule.HotbarSlot* slot)
{ {
if (slot == null) return (0, 0); if (slot == null) return (0, 0);
@@ -496,7 +725,23 @@ namespace HSUI.Helpers
} }
} }
/// <summary>Clear a hotbar slot. hotbarIndex 1-10, slotIndex 0-based.</summary> /// <summary>Place a drag-drop payload (game or HSUI) onto a slot. hotbarIndex 1-10, slotIndex 0-based.</summary>
public static unsafe void PlacePayloadOnSlot(int hotbarIndex, int slotIndex, RaptureHotbarModule.HotbarSlotType slotType, uint commandId)
{
var module = RaptureHotbarModule.Instance();
if (module == null || !module->ModuleReady) return;
int barIdx = Math.Clamp(hotbarIndex, 1, 10) - 1;
int slot = Math.Clamp(slotIndex, 0, 11);
ref var displayBar = ref module->StandardHotbars[barIdx];
var slotPtr = displayBar.GetHotbarSlot((uint)slot);
if (slotPtr == null) return;
slotPtr->Set(slotType, commandId);
slotPtr->LoadIconId();
if (slotType == RaptureHotbarModule.HotbarSlotType.Item)
slotPtr->LoadCostDataForSlot(true);
SetAndSaveSlotInternal(module, (uint)barIdx, (uint)slot, slotType, commandId, slotPtr);
}
public unsafe bool ClearSlot(int hotbarIndex, int slotIndex) public unsafe bool ClearSlot(int hotbarIndex, int slotIndex)
{ {
var module = RaptureHotbarModule.Instance(); var module = RaptureHotbarModule.Instance();
@@ -513,16 +758,32 @@ namespace HSUI.Helpers
return true; 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) 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); 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); 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); module->SetAndSaveSlot(barId, slotId, slotType, commandId, ignoreSharedHotbars: false, allowSaveToPvP: true);
} }
} }
+231
View File
@@ -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;
}
}
}
}
+106
View File
@@ -0,0 +1,106 @@
using System;
using System.Collections.Generic;
using Dalamud.Game.ClientState.GamePad;
using Dalamud.Game.ClientState.Keys;
using Dalamud.Plugin.Services;
using HSUI.Config;
using HSUI.Interface.GeneralElements;
namespace HSUI.Helpers
{
/// <summary>Polls controller bar keybinds and executes slots when keys/buttons are pressed. Supports combinations (e.g. L2+South).</summary>
public static class ControllerBarKeybindExecutor
{
private static readonly Dictionary<string, bool> _triggerWasDown = new Dictionary<string, bool>();
public static void Process(IFramework framework)
{
try
{
if (!ControllerHotbarsConfig.GetEffectiveControllerHotbarsEnabled())
return;
var keybindsConfig = ConfigurationManager.Instance?.GetConfigObject<ControllerBarKeybindsConfig>();
if (keybindsConfig == null)
return;
if (ActionBarsManager.Instance == null)
return;
for (int bar = 1; bar <= ControllerBarKeybindsConfig.Bars; bar++)
{
for (int slot = 0; slot < ControllerBarKeybindsConfig.SlotsPerBar; slot++)
{
string binding = keybindsConfig.GetKeybind(bar, slot);
if (string.IsNullOrEmpty(binding)) continue;
bool triggered = IsKeybindTriggered(binding);
if (triggered)
ActionBarsManager.Instance.ExecuteControllerSlot(bar, slot);
}
}
}
catch (Exception ex)
{
Plugin.Logger?.Warning($"[HSUI ControllerBarKeybinds] Process: {ex.Message}");
}
}
/// <summary>True when all modifiers are held and the trigger key/button was just pressed (edge).</summary>
private static bool IsKeybindTriggered(string binding)
{
if (string.IsNullOrEmpty(binding)) return false;
string[] parts = binding.Split('+');
for (int i = 0; i < parts.Length; i++)
parts[i] = parts[i].Trim();
if (parts.Length == 0) return false;
if (parts.Length == 1)
{
bool down = IsSingleKeybindDown(parts[0]);
if (!_triggerWasDown.TryGetValue(binding, out bool wasDown)) wasDown = false;
_triggerWasDown[binding] = down;
return down && !wasDown;
}
string triggerPart = parts[parts.Length - 1];
for (int i = 0; i < parts.Length - 1; i++)
{
if (!IsSingleKeybindDown(parts[i]))
return false;
}
bool triggerDown = IsSingleKeybindDown(triggerPart);
if (!_triggerWasDown.TryGetValue(binding, out bool triggerWasDown))
triggerWasDown = false;
_triggerWasDown[binding] = triggerDown;
return triggerDown && !triggerWasDown;
}
private static bool IsSingleKeybindDown(string part)
{
if (string.IsNullOrEmpty(part)) return false;
if (part.StartsWith("Key:", StringComparison.OrdinalIgnoreCase))
{
string vkStr = part.Substring(4).Trim();
if (Plugin.KeyState == null) return false;
if (Enum.TryParse<VirtualKey>(vkStr, true, out var vk)
&& Plugin.KeyState.IsVirtualKeyValid((int)vk))
return Plugin.KeyState[vk];
return false;
}
if (part.StartsWith("Pad:", StringComparison.OrdinalIgnoreCase))
{
string padStr = part.Substring(4).Trim();
if (Plugin.GamepadState == null) return false;
if (Enum.TryParse<GamepadButtons>(padStr, true, out var btn))
return Plugin.GamepadState.Raw(btn) > 0.5f;
return false;
}
return false;
}
}
}
+68
View File
@@ -0,0 +1,68 @@
using System;
using System.Runtime.InteropServices;
using Dalamud.Game.ClientState.GamePad;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.System.Framework;
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using HSUI.Interface.GeneralElements;
namespace HSUI.Helpers
{
/// <summary>Provides current cross hotbar trigger state (L2/R2) and game controller-mode detection for sync with game client.</summary>
public static class ControllerHotbarHelper
{
private static IGamepadState? _gamepadState;
public static void SetGamepadState(IGamepadState? gamepadState)
{
_gamepadState = gamepadState;
}
/// <summary>True when the game's Character Configuration has controller (gamepad) mode enabled. Reads the PadMode config option so bar mode follows the toggle and does not switch on input.</summary>
public static unsafe bool IsGameInControllerMode()
{
try
{
Framework* framework = Framework.Instance();
if (framework == null) return false;
int option = (int)ConfigOption.PadMode;
if (framework->SystemConfig.SystemConfigBase.UiConfig.ConfigCount <= option)
return false;
uint value = framework->SystemConfig.SystemConfigBase.UiConfig.ConfigEntry[option].Value.UInt;
// PadMode: 0 = keyboard/mouse, 1 = gamepad
return value != 0;
}
catch
{
return false;
}
}
/// <summary>Returns the current trigger combo for which cross bar should be visible. Uses L2/R2 from gamepad.</summary>
public static CrossBarTrigger GetCurrentTrigger()
{
if (_gamepadState == null)
return CrossBarTrigger.None;
try
{
// Raw returns float (analog); treat as pressed when > 0.5
bool l2 = _gamepadState.Raw(GamepadButtons.L2) > 0.5f;
bool r2 = _gamepadState.Raw(GamepadButtons.R2) > 0.5f;
if (l2 && r2)
{
// Both held - could distinguish L2 then R2 vs R2 then L2 by order; for now use L2R2
return CrossBarTrigger.L2R2;
}
if (l2) return CrossBarTrigger.L2;
if (r2) return CrossBarTrigger.R2;
return CrossBarTrigger.None;
}
catch
{
return CrossBarTrigger.None;
}
}
}
}
+71 -22
View File
@@ -142,8 +142,22 @@ namespace HSUI.Helpers
return; return;
} }
ConfigurationManager.Instance.ResetEvent -= OnConfigReset; // Restore WndProc first so left-click works again immediately after unload.
Plugin.Framework.Update -= OnFrameworkUpdate; // 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")); Plugin.Logger.Info("\t\tDisposing _requestActionHook: " + (_requestActionHook?.Address.ToString("X") ?? "null"));
_requestActionHook?.Disable(); _requestActionHook?.Disable();
@@ -151,9 +165,6 @@ namespace HSUI.Helpers
_executeSlotByIdHook?.Disable(); _executeSlotByIdHook?.Disable();
_executeSlotByIdHook?.Dispose(); _executeSlotByIdHook?.Dispose();
// give imgui the control of inputs again
RestoreWndProc();
Instance = null!; Instance = null!;
} }
#endregion #endregion
@@ -459,18 +470,31 @@ namespace HSUI.Helpers
public void OnFrameworkUpdate(IFramework framework) public void OnFrameworkUpdate(IFramework framework)
{ {
// Keep WndProc hooked when: proxy mode (for mouseover) OR we need to block game drag try
// release (so dropping on HSUI action bar doesn't execute the ability).
bool needHook = IsProxyEnabled || ShouldBlockGameDragRelease();
if (needHook && _wndProcPtr == IntPtr.Zero)
{ {
HookWndProc(); // When leaving PvP, force load PvE hotbars so HSUI bars don't keep showing PvP actions.
// Only log when we actually installed (HookWndProc can return early during init delay) ActionBarsManager.TryRestorePvEHotbarsAfterLeavePvP();
if (_wndProcPtr != IntPtr.Zero && IsActionBarDragDropDebugEnabled())
Plugin.Logger.Information("[HSUI DragDrop DBG] WndProc hook INSTALLED (needHook=true for drag-block)"); // Controller bar custom keybinds (when controller hotbars enabled)
ControllerBarKeybindExecutor.Process(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)
{
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() private static bool ShouldBlockGameDragRelease()
@@ -546,6 +570,7 @@ namespace HSUI.Helpers
_wndHandle = hWnd; _wndHandle = hWnd;
_wndProcDelegate = WndProcDetour; _wndProcDelegate = WndProcDetour;
_wndProcHandle = GCHandle.Alloc(_wndProcDelegate, GCHandleType.Normal); // Prevent GC of delegate while hooked
_wndProcPtr = Marshal.GetFunctionPointerForDelegate(_wndProcDelegate); _wndProcPtr = Marshal.GetFunctionPointerForDelegate(_wndProcDelegate);
_imguiWndProcPtr = SetWindowLongPtr(hWnd, GWL_WNDPROC, _wndProcPtr); _imguiWndProcPtr = SetWindowLongPtr(hWnd, GWL_WNDPROC, _wndProcPtr);
@@ -554,24 +579,48 @@ namespace HSUI.Helpers
Plugin.Logger.Info("\tOld WndProc: " + _imguiWndProcPtr.ToString("X")); 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\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); 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
{
if (_wndProcHandle.IsAllocated)
_wndProcHandle.Free();
_wndHandle = IntPtr.Zero; _wndHandle = IntPtr.Zero;
_imguiWndProcPtr = 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}");
} }
} }
private IntPtr _wndHandle = IntPtr.Zero; private IntPtr _wndHandle = IntPtr.Zero;
private WndProcDelegate _wndProcDelegate = null!; private WndProcDelegate _wndProcDelegate = null!;
private GCHandle _wndProcHandle; // Keeps delegate alive while WndProc is hooked; freed in RestoreWndProc
private IntPtr _wndProcPtr = IntPtr.Zero; private IntPtr _wndProcPtr = IntPtr.Zero;
private IntPtr _imguiWndProcPtr = IntPtr.Zero; private IntPtr _imguiWndProcPtr = IntPtr.Zero;
+24 -25
View File
@@ -43,35 +43,34 @@ namespace HSUI.Helpers
private void FrameworkOnOnUpdateEvent(IFramework framework) private void FrameworkOnOnUpdateEvent(IFramework framework)
{ {
var player = Plugin.ObjectTable.LocalPlayer; try
if (player is null)
{ {
return; var player = Plugin.ObjectTable.LocalPlayer;
} if (player is null)
return;
var now = ImGui.GetTime(); var now = ImGui.GetTime();
if (now - LastUpdate < PollingRate) 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) protected virtual void Dispose(bool disposing)
+16 -2
View File
@@ -22,8 +22,22 @@ namespace HSUI.Helpers
public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, uint stackCount = 0, bool hdIcon = true) public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, uint stackCount = 0, bool hdIcon = true)
{ {
GameIconLookup lookup = new GameIconLookup(iconId + stackCount, false, hdIcon); if (iconId == 0)
return Plugin.TextureProvider.GetFromGameIcon(lookup).GetWrapOrDefault(); 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) public static IDalamudTextureWrap? GetTextureFromPath(string path)
+402 -23
View File
@@ -6,12 +6,37 @@ using HSUI.Config;
using HSUI.Config.Attributes; using HSUI.Config.Attributes;
using HSUI.Interface.GeneralElements; using HSUI.Interface.GeneralElements;
using Dalamud.Bindings.ImGui; using Dalamud.Bindings.ImGui;
using FFXIVClientStructs.FFXIV.Client.Game.Object;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
namespace HSUI.Helpers namespace HSUI.Helpers
{ {
/// <summary>Colored segment for game-style tooltip formatting.</summary>
public readonly struct TooltipSegment
{
public readonly string Text;
public readonly Vector4 Color;
public TooltipSegment(string text, Vector4 color)
{
Text = text ?? "";
Color = color;
}
}
/// <summary>When showing an ID in the tooltip title, use Action for action IDs or Status for status effect IDs.</summary>
public enum TooltipIdKind
{
None = 0,
Action = 1,
Status = 2,
}
public class TooltipsHelper : IDisposable public class TooltipsHelper : IDisposable
{ {
#region Singleton #region Singleton
@@ -45,7 +70,7 @@ namespace HSUI.Helpers
} }
#endregion #endregion
private float MaxWidth => Math.Max(160, 340 * ImGuiHelpers.GlobalScale * _config.TooltipScale); private float MaxWidth => Math.Max(160, _config.TooltipMaxWidth * ImGuiHelpers.GlobalScale * _config.TooltipScale);
private float Margin => Math.Max(4, 5 * ImGuiHelpers.GlobalScale * _config.TooltipScale); private float Margin => Math.Max(4, 5 * ImGuiHelpers.GlobalScale * _config.TooltipScale);
private TooltipsConfig _config => ConfigurationManager.Instance.GetConfigObject<TooltipsConfig>(); private TooltipsConfig _config => ConfigurationManager.Instance.GetConfigObject<TooltipsConfig>();
@@ -55,18 +80,22 @@ namespace HSUI.Helpers
private string? _currentTooltipTitle = null; private string? _currentTooltipTitle = null;
private Vector2 _titleSize; private Vector2 _titleSize;
private string? _previousRawText = null; private string? _previousRawText = null;
private uint? _currentIconId = null;
private List<TooltipSegment>? _formattedSegments = null;
private Vector2 _position; private Vector2 _position;
private Vector2 _size; private Vector2 _size;
private bool _dataIsValid = false; 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, List<TooltipSegment>? formattedText = null)
{ {
ShowTooltip(text, ImGui.GetMousePos(), title, id, name); ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId, idKind, formattedText);
} }
public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "") public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None, List<TooltipSegment>? formattedText = null)
{ {
if (text == null) if (text == null)
{ {
@@ -82,6 +111,9 @@ namespace HSUI.Helpers
_previousRawText = text; _previousRawText = text;
} }
_currentIconId = iconId;
_formattedSegments = formattedText;
// calcualte title size // calcualte title size
_titleSize = Vector2.Zero; _titleSize = Vector2.Zero;
if (title != null) if (title != null)
@@ -93,7 +125,11 @@ namespace HSUI.Helpers
_currentTooltipTitle += $" ({name})"; _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 + ")"; _currentTooltipTitle += " (ID: " + id + ")";
} }
@@ -106,14 +142,42 @@ namespace HSUI.Helpers
} }
} }
// calculate text size // calculate text size (build combined text from segments for sizing)
string fontIdForText = _config.FontID ?? FontsConfig.DefaultSmallFontKey; string fontIdForText = _config.FontID ?? FontsConfig.DefaultSmallFontKey;
using (FontsManager.Instance.PushFont(fontIdForText)) using (FontsManager.Instance.PushFont(fontIdForText))
{ {
_textSize = ImGui.CalcTextSize(_currentTooltipText, false, MaxWidth); float lineHeight = ImGui.GetTextLineHeight();
if (_formattedSegments != null && _formattedSegments.Count > 0)
{
var sb = new StringBuilder();
int newlineCount = 0;
foreach (var seg in _formattedSegments)
{
sb.Append(seg.Text);
if (seg.Text == "\n") newlineCount++;
}
_textSize = ImGui.CalcTextSize(sb.ToString(), false, MaxWidth);
// Account for Dummy spacing between sections (each \n adds compactSpacing)
float compactSpacing = Math.Max(2, lineHeight * _config.TooltipLineSpacing);
_textSize.Y += newlineCount * compactSpacing;
}
else
{
_textSize = ImGui.CalcTextSize(_currentTooltipText, false, MaxWidth);
}
} }
_size = new Vector2(Math.Max(_titleSize.X, _textSize.X) + Margin * 2, _titleSize.Y + _textSize.Y + Margin * 2); float fontScale = Math.Max(0.7f, _config.TooltipFontScale);
float contentWidth = Math.Max(_titleSize.X, _textSize.X) * fontScale;
float contentHeight = (_titleSize.Y + _textSize.Y) * fontScale;
float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale * _config.TooltipIconScale;
float iconGap = _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled + Margin : 0;
// Add buffer to prevent clipping (font/scale changes, rounding, padding)
float heightBuffer = _config.TooltipHeightBuffer;
float minContentHeight = contentHeight + heightBuffer;
_size = new Vector2(
contentWidth + iconGap + Margin * 2,
Math.Max(minContentHeight, _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled + Margin * 2 : 0) + Margin * 2);
// position tooltip using the given coordinates as bottom center // position tooltip using the given coordinates as bottom center
position.X = position.X - _size.X / 2f; position.X = position.X - _size.X / 2f;
@@ -220,19 +284,67 @@ namespace HSUI.Helpers
if (string.IsNullOrEmpty(body)) if (string.IsNullOrEmpty(body))
body = "(No info)"; body = "(No info)";
uint? iconId = _worldTooltipConfig.ShowIcon ? GetWorldObjectIconId(mouseOverTarget) : null;
if (_worldTooltipConfig.DetachFromCursor) if (_worldTooltipConfig.DetachFromCursor)
{ {
ShowTooltip(body, _worldTooltipConfig.Position, name); ShowTooltip(body, _worldTooltipConfig.Position, name, 0, "", iconId);
} }
else else
{ {
ShowTooltipOnCursor(body, name); 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() public void RemoveTooltip()
{ {
_dataIsValid = false; _dataIsValid = false;
_formattedSegments = null;
}
private void DrawTooltipBody()
{
if (_formattedSegments != null && _formattedSegments.Count > 0)
{
bool afterNewline = true;
float lineHeight = ImGui.GetTextLineHeight();
float compactSpacing = Math.Max(2, lineHeight * _config.TooltipLineSpacing);
foreach (var seg in _formattedSegments)
{
if (seg.Text == "\n")
{
ImGui.Dummy(new Vector2(0, compactSpacing));
afterNewline = true;
}
else if (!string.IsNullOrEmpty(seg.Text))
{
if (!afterNewline)
ImGui.SameLine(0, 0);
string text = afterNewline ? seg.Text.TrimStart() : seg.Text;
if (!string.IsNullOrEmpty(text))
{
ImGui.TextColored(seg.Color, text);
afterNewline = false;
}
}
}
}
else
{
ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText);
}
} }
public void Draw() public void Draw()
@@ -266,6 +378,7 @@ namespace HSUI.Helpers
ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0); ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0);
ImGui.Begin("DelvUI_tooltip", windowFlags); ImGui.Begin("DelvUI_tooltip", windowFlags);
ImGui.SetWindowFontScale(_config.TooltipFontScale);
var drawList = ImGui.GetWindowDrawList(); var drawList = ImGui.GetWindowDrawList();
drawList.AddRectFilled(_position, _position + _size, _config.BackgroundColor.Base); drawList.AddRectFilled(_position, _position + _size, _config.BackgroundColor.Base);
@@ -279,45 +392,58 @@ namespace HSUI.Helpers
float globalScaleCorrection = -15 + 15 * ImGuiHelpers.GlobalScale; float globalScaleCorrection = -15 + 15 * ImGuiHelpers.GlobalScale;
string fontId = _config.FontID ?? FontsConfig.DefaultSmallFontKey; string fontId = _config.FontID ?? FontsConfig.DefaultSmallFontKey;
float wrapWidth = Math.Max(_titleSize.X, _textSize.X) + Margin; float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale * _config.TooltipIconScale;
float iconGap = (_currentIconId.HasValue && _currentIconId.Value > 0) ? iconSizeScaled + Margin : 0;
float wrapWidth = (_currentIconId.HasValue && _currentIconId.Value > 0)
? _size.X - iconGap - Margin * 2
: 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) if (_currentTooltipTitle != null)
{ {
// title // title
Vector2 cursorPos; Vector2 cursorPos;
using (FontsManager.Instance.PushFont(fontId)) 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.SetCursorPos(cursorPos);
ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection); ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
ImGui.TextColored(_config.TitleColor.Vector, _currentTooltipTitle); ImGui.TextColored(_config.TitleColor.Vector, _currentTooltipTitle);
ImGui.PopTextWrapPos(); ImGui.PopTextWrapPos();
} }
// text // text (formatted or plain)
using (FontsManager.Instance.PushFont(fontId)) 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.SetCursorPos(cursorPos);
ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection); ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText); DrawTooltipBody();
ImGui.PopTextWrapPos(); ImGui.PopTextWrapPos();
} }
} }
else else
{ {
// text // text (formatted or plain)
using (FontsManager.Instance.PushFont(fontId)) using (FontsManager.Instance.PushFont(fontId))
{ {
var cursorPos = windowMargin + new Vector2(Margin, Margin); var cursorPos = new Vector2(textBlockX, Margin);
var textWidth = _size.X - Margin * 2; var textWidth = _size.X - iconGap - Margin * 2;
ImGui.SetCursorPos(cursorPos); ImGui.SetCursorPos(cursorPos);
ImGui.PushTextWrapPos(cursorPos.X + textWidth + globalScaleCorrection); ImGui.PushTextWrapPos(cursorPos.X + textWidth + globalScaleCorrection);
ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText); DrawTooltipBody();
ImGui.PopTextWrapPos(); ImGui.PopTextWrapPos();
} }
} }
ImGui.SetWindowFontScale(1f);
ImGui.End(); ImGui.End();
ImGui.PopStyleVar(); ImGui.PopStyleVar();
@@ -326,6 +452,211 @@ namespace HSUI.Helpers
RemoveTooltip(); RemoveTooltip();
} }
/// <summary>
/// Parses action/ability description text into colored segments for game-style tooltips.
/// Adds newlines before section headers and colors: section labels (Additional Effect, Duration) green,
/// status names (e.g. Blood of the Dragon) yellow, secondary labels grey.
/// </summary>
public static List<TooltipSegment> FormatActionTooltip(string description, Vector4 textColor, Vector4 sectionLabelColor, Vector4 statusNameColor)
{
var result = new List<TooltipSegment>();
if (string.IsNullOrEmpty(description))
return result;
// Pattern: section labels to color (Additional Effect, Duration, X Effect, Maximum Charges, Blood Gauge Cost, Combo, roles)
var sectionRegex = new Regex(@"\b(Additional Effect:|Duration:|Maximum Charges:|Blood Gauge Cost:|Combo Action:|Combo Potency:|Combo Bonus:|Tank:|Melee:|Ranged:|Caster:|Healer:|[A-Za-z][A-Za-z0-9\s]+ Effect:)", RegexOptions.None);
// Pattern: "Grants X X Effect:" - captures status name X
var grantsRegex = new Regex(@"Grants\s+(.+?)\s+\1\s+Effect:", RegexOptions.Singleline);
int lastEnd = 0;
foreach (Match m in sectionRegex.Matches(description))
{
string chunk = description.Substring(lastEnd, m.Index - lastEnd).TrimEnd();
if (!string.IsNullOrEmpty(chunk))
{
// Check for "Grants StatusName" in this chunk to color status name yellow
var grantsMatch = grantsRegex.Match(chunk);
if (grantsMatch.Success)
{
string statusName = grantsMatch.Groups[1].Value.Trim();
string grantsPrefix = "Grants " + statusName;
int idx = chunk.IndexOf(grantsPrefix, StringComparison.Ordinal);
if (idx >= 0)
{
if (idx > 0)
result.Add(new TooltipSegment(chunk.Substring(0, idx), textColor));
result.Add(new TooltipSegment("Grants ", textColor));
result.Add(new TooltipSegment(statusName + " ", statusNameColor));
int after = idx + grantsPrefix.Length;
if (after < chunk.Length)
result.Add(new TooltipSegment(chunk.Substring(after), textColor));
}
else
result.Add(new TooltipSegment(chunk, textColor));
}
else
result.Add(new TooltipSegment(chunk, textColor));
}
result.Add(new TooltipSegment("\n", textColor));
result.Add(new TooltipSegment(m.Value + " ", sectionLabelColor));
// Add newline so description wraps below label like stock game (not floating beside it)
if (m.Value.IndexOf("Effect:", StringComparison.OrdinalIgnoreCase) >= 0)
result.Add(new TooltipSegment("\n", textColor));
lastEnd = m.Index + m.Length;
}
if (lastEnd < description.Length)
{
string tail = description.Substring(lastEnd).TrimStart();
if (!string.IsNullOrEmpty(tail))
{
string valuePart = "";
string notePart = "";
bool hasValue = false;
int newlineIdx = tail.IndexOf('\n');
if (newlineIdx >= 0)
{
// "2\nCannot be executed..." - value on first line, note on next
valuePart = tail.Substring(0, newlineIdx).TrimEnd();
notePart = tail.Substring(newlineIdx + 1).TrimStart();
hasValue = Regex.IsMatch(valuePart, @"^\d+[ms]?$");
}
else
{
// "2 Cannot be executed while bound." - value + space + note (no newline)
var valueNoteMatch = Regex.Match(tail, @"^(\d+[ms]?)\s+([A-Z].+)$", RegexOptions.Singleline);
if (valueNoteMatch.Success)
{
valuePart = valueNoteMatch.Groups[1].Value;
notePart = valueNoteMatch.Groups[2].Value;
hasValue = true;
}
else if (Regex.IsMatch(tail, @"^\d+[ms]?$"))
{
// Plain value only: "50" (Blood Gauge Cost), "2" (charges) - stay on same line as label
valuePart = tail;
hasValue = true;
}
}
// Add valuePart when present - section content (e.g. "Restore party HP..." for Healer, "2" for charges)
if (!string.IsNullOrEmpty(valuePart))
{
result.Add(new TooltipSegment(valuePart, textColor));
}
if (!string.IsNullOrEmpty(notePart))
{
result.Add(new TooltipSegment("\n", textColor));
result.Add(new TooltipSegment(notePart, textColor));
}
else if (!hasValue)
{
// Standalone note: "(Duration can be extended...)", "Cannot be executed...", footnotes
result.Add(new TooltipSegment("\n", textColor));
result.Add(new TooltipSegment(tail, textColor));
}
}
}
return result;
}
/// <summary>
/// Builds formatted segments from a full action tooltip body (stats + description).
/// Used when UseGameStyleFormatting is enabled.
/// Stats are placed first, then exactly one newline, then description below.
/// </summary>
public static List<TooltipSegment>? BuildFormattedActionTooltipBody(string body, TooltipsConfig config)
{
if (string.IsNullOrEmpty(body) || !config.UseGameStyleFormatting)
return null;
var result = new List<TooltipSegment>();
var textColor = config.TextColor.Vector;
var sectionColor = config.SectionLabelColor.Vector;
var statusColor = config.StatusNameColor.Vector;
var secondaryColor = config.SecondaryLabelColor.Vector;
var blocks = body.Split(new[] { "\n\n" }, StringSplitOptions.None);
int descStart = 0;
bool hasStats = false;
// Stats block: may contain "Potency: X" and "Cast: ... | Recast: ..." on separate lines
for (int i = 0; i < blocks.Length; i++)
{
string block = blocks[i].Trim();
var lines = block.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
bool blockIsStats = false;
foreach (string line in lines)
{
string part = line.Trim();
if (part.StartsWith("Potency:", StringComparison.OrdinalIgnoreCase))
{
if (hasStats) result.Add(new TooltipSegment("\n", textColor));
result.Add(new TooltipSegment("Potency:", secondaryColor));
result.Add(new TooltipSegment(" " + part.Substring(8).TrimStart(), textColor));
hasStats = true;
blockIsStats = true;
}
else if (part.Contains("Cast:") || part.Contains("Recast:"))
{
if (hasStats) result.Add(new TooltipSegment("\n", textColor));
var statsSegs = FormatActionStats(part, textColor, secondaryColor);
result.AddRange(statsSegs);
hasStats = true;
blockIsStats = true;
}
}
if (!blockIsStats)
{
descStart = i;
break;
}
descStart = i + 1;
}
// Description: exactly one newline after stats, then description with compact section spacing
string desc = string.Join("\n", blocks.Skip(descStart)).Trim();
if (!string.IsNullOrEmpty(desc))
{
if (hasStats) result.Add(new TooltipSegment("\n", textColor));
var descSegs = FormatActionTooltip(desc, textColor, sectionColor, statusColor);
result.AddRange(descSegs);
}
return result.Count > 0 ? result : null;
}
/// <summary>
/// Formats action stats (Cast, Recast, Range, Radius) as colored segments.
/// </summary>
public static List<TooltipSegment> FormatActionStats(string statsLine, Vector4 textColor, Vector4 secondaryLabelColor)
{
var result = new List<TooltipSegment>();
if (string.IsNullOrEmpty(statsLine))
return result;
// statsLine format: "Cast: Instant | Recast: 60.0s | Range: 15y | Radius: 15y"
var parts = statsLine.Split(new[] { " | " }, StringSplitOptions.None);
for (int i = 0; i < parts.Length; i++)
{
if (i > 0)
result.Add(new TooltipSegment(" | ", textColor));
int colonIdx = parts[i].IndexOf(':');
if (colonIdx >= 0)
{
result.Add(new TooltipSegment(parts[i].Substring(0, colonIdx + 1), secondaryLabelColor));
result.Add(new TooltipSegment(parts[i].Substring(colonIdx + 1), textColor));
}
else
{
result.Add(new TooltipSegment(parts[i], textColor));
}
}
return result;
}
private Vector2 ConstrainPosition(Vector2 position, Vector2 size) private Vector2 ConstrainPosition(Vector2 position, Vector2 size)
{ {
var screenSize = ImGui.GetWindowViewport().Size; var screenSize = ImGui.GetWindowViewport().Size;
@@ -363,17 +694,57 @@ namespace HSUI.Helpers
public string? FontID = null; public string? FontID = null;
[DragFloat("Tooltip Scale", min = 0.5f, max = 2f, help = "Scale the tooltip window size. Useful for large resolutions.")] [DragFloat("Tooltip Scale", min = 0.5f, max = 2f, help = "Scale the tooltip window size. Useful for large resolutions.")]
[Order(6)] [Order(5)]
public float TooltipScale = 1f; public float TooltipScale = 1f;
[Checkbox("Show Status Effects IDs")] [DragFloat("Tooltip Max Width", min = 160f, max = 600f, help = "Maximum width of the tooltip box in pixels.")]
[Order(6)]
public float TooltipMaxWidth = 340f;
[DragFloat("Line Spacing", min = 0.2f, max = 1.5f, help = "Spacing between lines and sections (1 = normal, lower = compact).")]
[Order(7)] [Order(7)]
public float TooltipLineSpacing = 0.6f;
[DragFloat("Font Scale", min = 0.7f, max = 1.5f, help = "Scale factor for tooltip font size.")]
[Order(8)]
public float TooltipFontScale = 1f;
[DragFloat("Icon Scale", min = 0.5f, max = 2f, help = "Scale factor for the ability/status icon in tooltips.")]
[Order(9)]
public float TooltipIconScale = 1f;
[DragFloat("Height Buffer", min = 0f, max = 80f, help = "Extra space at bottom of tooltip to prevent clipping. Adjust if text is cut off.")]
[Order(10)]
public float TooltipHeightBuffer = 28f;
[Checkbox("Show Status Effects IDs")]
[Order(11)]
public bool ShowStatusIDs = false; public bool ShowStatusIDs = false;
[Checkbox("Show Action ID", help = "Show action ID in hotbar and action tooltips.")]
[Order(12)]
public bool ShowActionIDs = false;
[Checkbox("Show Source Name")] [Checkbox("Show Source Name")]
[Order(10)] [Order(13)]
public bool ShowSourceName = false; public bool ShowSourceName = false;
[Checkbox("Game-style formatting", help = "Color section labels (Additional Effect, Duration) green, status names yellow, and add new lines between sections like the base game tooltips.")]
[Order(14)]
public bool UseGameStyleFormatting = true;
[ColorEdit4("Section Label Color", help = "Color for labels like 'Additional Effect:', 'Duration:'.")]
[Order(15)]
public PluginConfigColor SectionLabelColor = new PluginConfigColor(new(0f, 255f / 255f, 0f, 1f));
[ColorEdit4("Status Name Color", help = "Color for buff/status effect names like 'Blood of the Dragon'.")]
[Order(16)]
public PluginConfigColor StatusNameColor = new PluginConfigColor(new(255f / 255f, 255f / 255f, 0f, 1f));
[ColorEdit4("Secondary Label Color", help = "Color for Cast, Recast, Range, Radius labels.")]
[Order(17)]
public PluginConfigColor SecondaryLabelColor = new PluginConfigColor(new(204f / 255f, 204f / 255f, 204f / 255f, 1f));
[ColorEdit4("Background Color")] [ColorEdit4("Background Color")]
[Order(15)] [Order(15)]
public PluginConfigColor BackgroundColor = new PluginConfigColor(new(19f / 255f, 19f / 255f, 19f / 255f, 190f / 250f)); public PluginConfigColor BackgroundColor = new PluginConfigColor(new(19f / 255f, 19f / 255f, 19f / 255f, 190f / 250f));
@@ -426,8 +797,16 @@ namespace HSUI.Helpers
[Order(2, collapseWith = nameof(DetachFromCursor))] [Order(2, collapseWith = nameof(DetachFromCursor))]
public Vector2 Position = new Vector2(100, 100); 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)] [Checkbox("Show Level", spacing = true)]
[Order(5)] [Order(6)]
public bool ShowLevel = true; public bool ShowLevel = true;
[Checkbox("Show HP")] [Checkbox("Show HP")]
+7
View File
@@ -256,6 +256,13 @@ namespace HSUI.Interface
{ {
return (new List<Vector2>(), new List<Vector2>()); return (new List<Vector2>(), new List<Vector2>());
} }
/// <summary>Returns the screen-space bounding box of the element for hover detection (e.g. visibility "hide unless hovered").</summary>
public virtual (Vector2 min, Vector2 max) GetScreenBounds(Vector2 origin)
{
var basePos = origin + ParentPos();
return (basePos + MinPos, basePos + MaxPos);
}
#endregion #endregion
} }
+203 -51
View File
@@ -39,19 +39,19 @@ namespace HSUI.Interface.GeneralElements
/// <summary>When we had a game drag and the user released, suppress all slot clicks this frame (release is not a click).</summary> /// <summary>When we had a game drag and the user released, suppress all slot clicks this frame (release is not a click).</summary>
private bool _suppressSlotClicksAfterDragRelease; private bool _suppressSlotClicksAfterDragRelease;
private const string SlotPayloadType = "HSUI_HOTBAR_SLOT"; internal const string SlotPayloadType = "HSUI_HOTBAR_SLOT";
private const int SlotsPerBar = 12; private const int SlotsPerBar = 12;
private static int _imGuiDragSourceSlotId = -1; internal static int _imGuiDragSourceSlotId = -1;
private static bool _anyHotbarAcceptedDrop; internal static bool _anyHotbarAcceptedDrop;
private static int _lastOverlayFrame = -1; internal static int _lastOverlayFrame = -1;
/// <summary>Deferred clear when release-outside: set when no overlay accepted, executed next frame.</summary> /// <summary>Deferred clear when release-outside: set when no overlay accepted, executed next frame.</summary>
private static int _pendingReleaseOutsideSlotId = -1; internal static int _pendingReleaseOutsideSlotId = -1;
/// <summary>To avoid PICKUP log spam: only log when we first start dragging a new slot.</summary> /// <summary>To avoid PICKUP log spam: only log when we first start dragging a new slot.</summary>
private static int _lastLoggedPickupSlotId = -1; internal static int _lastLoggedPickupSlotId = -1;
/// <summary>Encode hotbar (1-10) and slot (0-11) into internal slot id (0-119).</summary> /// <summary>Encode hotbar (1-10) and slot (0-11) into internal slot id (0-119). Controller bars use 1-8 and 0-7.</summary>
private static int ToSlotId(int hotbarIndex, int slotIndex) internal static int ToSlotId(int hotbarIndex, int slotIndex)
{ {
int bar = Math.Clamp(hotbarIndex, 1, 10) - 1; int bar = Math.Clamp(hotbarIndex, 1, 10) - 1;
int slot = Math.Clamp(slotIndex, 0, 11); int slot = Math.Clamp(slotIndex, 0, 11);
@@ -59,14 +59,14 @@ namespace HSUI.Interface.GeneralElements
} }
/// <summary>Decode internal slot id to hotbar (1-10) and slot (0-11). Returns (-1,-1) if invalid.</summary> /// <summary>Decode internal slot id to hotbar (1-10) and slot (0-11). Returns (-1,-1) if invalid.</summary>
private static (int hotbarIndex, int slotIndex) FromSlotId(int slotId) internal static (int hotbarIndex, int slotIndex) FromSlotId(int slotId)
{ {
if (slotId < 0 || slotId >= 10 * SlotsPerBar) return (-1, -1); if (slotId < 0 || slotId >= 10 * SlotsPerBar) return (-1, -1);
return (slotId / SlotsPerBar + 1, slotId % SlotsPerBar); return (slotId / SlotsPerBar + 1, slotId % SlotsPerBar);
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
private struct SlotDragPayload internal struct SlotDragPayload
{ {
public int SlotId; public int SlotId;
} }
@@ -118,6 +118,9 @@ namespace HSUI.Interface.GeneralElements
{ {
if (!Config.Enabled || Actor == null) if (!Config.Enabled || Actor == null)
return; return;
// When controller hotbars are effectively enabled (manual or sync with game), normal hotbars are hidden
if (ControllerHotbarsConfig.GetEffectiveControllerHotbarsEnabled())
return;
if (ActionBarsManager.Instance == null) if (ActionBarsManager.Instance == null)
return; return;
@@ -216,6 +219,14 @@ namespace HSUI.Interface.GeneralElements
Vector2 labelPos = new Vector2(pos.X + size.X - labelSize.X - 2, pos.Y + size.Y - labelSize.Y - 2); 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); 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 +256,7 @@ namespace HSUI.Interface.GeneralElements
}); });
// Overlay at HIGHEST so it captures input above the bar; required for icon swap. // 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 210 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, () => AddDrawAction(StrataLevel.HIGHEST, () =>
{ {
var slots = ActionBarsManager.Instance.GetSlotData(Config.HotbarIndex, Config.SlotCount); var slots = ActionBarsManager.Instance.GetSlotData(Config.HotbarIndex, Config.SlotCount);
@@ -254,13 +265,11 @@ namespace HSUI.Interface.GeneralElements
| ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus
| ImGuiWindowFlags.NoNav; | ImGuiWindowFlags.NoNav;
ImGuiHelpers.ForceNextWindowMainViewport();
ImGui.SetNextWindowPos(topLeft);
ImGui.SetNextWindowSize(barSize);
string overlayId = $"HSUI_Hotbar{Config.HotbarIndex}_input"; 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; return;
} }
@@ -364,7 +373,9 @@ namespace HSUI.Interface.GeneralElements
if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text)) if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
{ {
string body = string.IsNullOrEmpty(text) ? title : text; string body = string.IsNullOrEmpty(text) ? title : text;
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, ""); var tooltipConfig = ConfigurationManager.Instance?.GetConfigObject<HSUI.Helpers.TooltipsConfig>();
var formatted = tooltipConfig != null ? TooltipsHelper.BuildFormattedActionTooltipBody(body, tooltipConfig) : null;
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, Helpers.TooltipIdKind.Action, formatted);
if (IsTooltipDebugEnabled()) if (IsTooltipDebugEnabled())
Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'"); Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'");
} }
@@ -386,7 +397,7 @@ namespace HSUI.Interface.GeneralElements
_lastLoggedPickupSlotId = -1; _lastLoggedPickupSlotId = -1;
} }
ImGui.End(); ImGui.EndChild();
}); });
} }
@@ -423,7 +434,9 @@ namespace HSUI.Interface.GeneralElements
if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text)) if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
{ {
string body = string.IsNullOrEmpty(text) ? title : text; string body = string.IsNullOrEmpty(text) ? title : text;
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, ""); var tooltipConfig = ConfigurationManager.Instance?.GetConfigObject<HSUI.Helpers.TooltipsConfig>();
var formatted = tooltipConfig != null ? TooltipsHelper.BuildFormattedActionTooltipBody(body, tooltipConfig) : null;
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, Helpers.TooltipIdKind.Action, formatted);
if (IsTooltipDebugEnabled()) if (IsTooltipDebugEnabled())
Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'"); Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'");
} }
@@ -486,7 +499,7 @@ namespace HSUI.Interface.GeneralElements
return true; return true;
} }
private static HotbarsConfig? GetHotbarsConfig() => internal static HotbarsConfig? GetHotbarsConfig() =>
ConfigurationManager.Instance?.GetConfigObject<HotbarsConfig>(); ConfigurationManager.Instance?.GetConfigObject<HotbarsConfig>();
private static (int Type, int Int1, int Int2, double LastTime) _lastDragNoPayloadLog; private static (int Type, int Int1, int Int2, double LastTime) _lastDragNoPayloadLog;
@@ -505,7 +518,7 @@ namespace HSUI.Interface.GeneralElements
return true; return true;
} }
private static unsafe bool IsGameDragging() internal static unsafe bool IsGameDragging()
{ {
var stage = AtkStage.Instance(); var stage = AtkStage.Instance();
if (stage == null) return false; if (stage == null) return false;
@@ -513,7 +526,7 @@ namespace HSUI.Interface.GeneralElements
return dm->IsDragging; return dm->IsDragging;
} }
private static unsafe bool TryGetSlotPayload(ImGuiPayloadPtr payload, out SlotDragPayload src) internal static unsafe bool TryGetSlotPayload(ImGuiPayloadPtr payload, out SlotDragPayload src)
{ {
if (payload.Data == null || payload.DataSize < sizeof(SlotDragPayload)) if (payload.Data == null || payload.DataSize < sizeof(SlotDragPayload))
{ {
@@ -524,7 +537,7 @@ namespace HSUI.Interface.GeneralElements
return true; return true;
} }
private static void SetSlotPayload(SlotDragPayload pl) internal static void SetSlotPayload(SlotDragPayload pl)
{ {
var type = new ImU8String(SlotPayloadType); var type = new ImU8String(SlotPayloadType);
var data = MemoryMarshal.AsBytes(MemoryMarshal.CreateSpan(ref pl, 1)); var data = MemoryMarshal.AsBytes(MemoryMarshal.CreateSpan(ref pl, 1));
@@ -596,7 +609,7 @@ namespace HSUI.Interface.GeneralElements
if (ImGui.IsMouseReleased(ImGuiMouseButton.Left)) if (ImGui.IsMouseReleased(ImGuiMouseButton.Left))
{ {
int releaseIdx = GetSlotIndexAtPosition(topLeft, barSize, slotSize, pad, Config.SlotCount, Config.GetLayoutGrid().Cols, mp, debug); 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) if (!ImGui.GetIO().KeyShift)
{ {
@@ -613,7 +626,7 @@ namespace HSUI.Interface.GeneralElements
displaySlot->Set(slotType, id); displaySlot->Set(slotType, id);
displaySlot->LoadIconId(); displaySlot->LoadIconId();
} }
module->SetAndSaveSlot(barId, (uint)releaseIdx, slotType, id); ActionBarsManager.SetAndSaveSlotInternal(module, barId, (uint)releaseIdx, slotType, id, displaySlot);
uint iconId = GetIconIdForPayload(slotType, id); uint iconId = GetIconIdForPayload(slotType, id);
if (iconId == 0) if (iconId == 0)
{ {
@@ -695,7 +708,7 @@ namespace HSUI.Interface.GeneralElements
// stale (e.g. from macro menu UI), causing wrong placements (macro drag -> GeneralAction placed). // 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. // If we never got valid payload (e.g. Macro Int2=0), skip the place.
bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty && bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty &&
(id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro); (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet);
if (hasValidPayload) if (hasValidPayload)
{ {
@@ -830,10 +843,10 @@ namespace HSUI.Interface.GeneralElements
} }
/// <summary> /// <summary>
/// Gets drag payload from game/Dalamud. When game reports Item drag, prioritize HoveredItem /// Gets drag payload from game/Dalamud. When game reports Item drag, prioritize HoveredItem.
/// (HoveredAction can be stale from previous hotbar hover). Preserves full item id including HQ flag. /// Used by ActionBarsHud and CrossBarHud for drag-drop.
/// </summary> /// </summary>
private static unsafe bool TryGetDragPayload(out RaptureHotbarModule.HotbarSlotType slotType, out uint id) internal static unsafe bool TryGetDragPayload(out RaptureHotbarModule.HotbarSlotType slotType, out uint id)
{ {
slotType = RaptureHotbarModule.HotbarSlotType.Empty; slotType = RaptureHotbarModule.HotbarSlotType.Empty;
id = 0; id = 0;
@@ -1042,6 +1055,24 @@ namespace HSUI.Interface.GeneralElements
return false; 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) private static RaptureHotbarModule.HotbarSlotType GetHotbarSlotTypeFromHoverActionKind(HoverActionKind kind)
{ {
return kind switch return kind switch
@@ -1066,9 +1097,11 @@ namespace HSUI.Interface.GeneralElements
}; };
} }
private static unsafe uint GetIconIdForPayload(RaptureHotbarModule.HotbarSlotType slotType, uint id) internal 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) if (slotType == RaptureHotbarModule.HotbarSlotType.Macro)
{ {
var macroModule = RaptureMacroModule.Instance(); var macroModule = RaptureMacroModule.Instance();
@@ -1125,7 +1158,33 @@ namespace HSUI.Interface.GeneralElements
catch { return 0; } catch { return 0; }
} }
/// <summary>Public for CrossBarHud and other consumers. Returns (title, body) for a hotbar slot.</summary>
public static (string title, string text) GetSlotTooltipPublic(ActionBarsManager.SlotInfo slot)
{
try
{
return GetSlotTooltip(slot);
}
catch
{
return ("", "");
}
}
private static unsafe (string title, string text) GetSlotTooltip(ActionBarsManager.SlotInfo slot) 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. // GeneralAction uses a different ID space: GeneralAction 7 = Teleport links to Action 5. Look up via GeneralAction sheet.
if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.GeneralAction) if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.GeneralAction)
@@ -1168,33 +1227,126 @@ namespace HSUI.Interface.GeneralElements
slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction || slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
slot.SlotType == RaptureHotbarModule.HotbarSlotType.PetAction) 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) if (row.HasValue)
{ {
string name = row.Value.Name.ToString(); string name = row.Value.Name.ToString();
string desc = ""; string desc = "";
var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(slot.ActionId);
string descRaw = ""; 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 try
{ {
var evaluated = Plugin.SeStringEvaluator.Evaluate(descSeStr.AsSpan()); var descSe = craftRow.Description;
desc = evaluated.ExtractText(); var craftDescRaw = descSe.ToDalamudString().ToString();
if (string.IsNullOrEmpty(desc)) desc = descRaw; 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 catch { /* ignore */ }
{ }
desc = descRaw; }
} else
if (!string.IsNullOrEmpty(desc)) {
desc = EncryptedStringsHelper.GetString(desc); 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); bool isCombatAction = IsCombatAction(slot.SlotType, row.Value);
int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null; int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null;
@@ -1309,13 +1461,13 @@ namespace HSUI.Interface.GeneralElements
if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.Item) if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.Item)
{ {
var row = Plugin.DataManager.GetExcelSheet<Item>()?.GetRow(slot.ActionId); uint baseItemId = slot.ActionId >= 1000000 ? slot.ActionId - 1000000 : slot.ActionId;
if (row.HasValue) if (Plugin.DataManager.GetExcelSheet<Item>()?.TryGetRow(baseItemId, out var itemRow) == true)
{ {
string name = row.Value.Name.ToString(); string name = itemRow.Name.ToString();
try try
{ {
string desc = row.Value.Description.ToDalamudString().ToString(); string desc = itemRow.Description.ToDalamudString().ToString();
if (!string.IsNullOrEmpty(desc)) if (!string.IsNullOrEmpty(desc))
desc = EncryptedStringsHelper.GetString(desc); desc = EncryptedStringsHelper.GetString(desc);
return (name, desc); return (name, desc);
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using Dalamud.Bindings.ImGui;
using HSUI.Config;
using HSUI.Config.Attributes;
using HSUI.Helpers;
namespace HSUI.Interface.GeneralElements
{
/// <summary>Stores custom keybinds for controller cross bars (8 bars × 8 slots). Format: "Key:VK_X" or "Pad:South", empty = unset.</summary>
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Keybinds", 0)]
public class ControllerBarKeybindsConfig : PluginConfigObject
{
public const int Bars = 8;
public const int SlotsPerBar = 8;
public const int TotalSlots = Bars * SlotsPerBar;
/// <summary>Index = (bar-1)*8 + slot. Value = "Key:VK_1" or "Pad:South" or "" for unset.</summary>
public List<string> KeybindStrings { get; set; } = new List<string>();
[ManualDraw]
public bool DrawOpenKeybindsButton(ref bool changed)
{
if (ImGui.Button("Setup controller bar keybinds", new Vector2(260, 28)))
{
ConfigurationManager.Instance?.OpenControllerBarKeybindsWindow();
return false;
}
if (ImGui.IsItemHovered())
ImGui.SetTooltip("Open the keybind setup window to assign keyboard or gamepad buttons to each slot on the controller cross bars. These keybinds are independent of the game's keybind settings.");
return false;
}
public new static ControllerBarKeybindsConfig DefaultConfig() => new ControllerBarKeybindsConfig();
/// <summary>Get keybind for bar 1-8, slot 0-7. Returns "" if unset.</summary>
public string GetKeybind(int bar, int slot)
{
int idx = (bar - 1) * SlotsPerBar + slot;
if (idx < 0 || idx >= TotalSlots) return "";
EnsureCapacity();
return KeybindStrings.ElementAtOrDefault(idx) ?? "";
}
/// <summary>Set keybind for bar 1-8, slot 0-7. Value format: "Key:VK_X" or "Pad:South", or "" to clear.</summary>
public void SetKeybind(int bar, int slot, string value)
{
int idx = (bar - 1) * SlotsPerBar + slot;
if (idx < 0 || idx >= TotalSlots) return;
EnsureCapacity();
KeybindStrings[idx] = value ?? "";
}
private void EnsureCapacity()
{
while (KeybindStrings.Count < TotalSlots)
KeybindStrings.Add("");
}
}
}
@@ -0,0 +1,448 @@
using System;
using System.Collections.Generic;
using System.Linq;
using HSUI.Config;
using HSUI.Config.Attributes;
using HSUI.Enums;
using HSUI.Helpers;
using HSUI.Interface;
using System.Numerics;
using Dalamud.Bindings.ImGui;
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
namespace HSUI.Interface.GeneralElements
{
/// <summary>Persisted slot content for one controller cross bar slot. Not shown in config UI.</summary>
public class ControllerSlotData
{
public int SlotType { get; set; }
public uint CommandId { get; set; }
public bool IsEmpty => SlotType == (int)RaptureHotbarModule.HotbarSlotType.Empty || (SlotType != (int)RaptureHotbarModule.HotbarSlotType.Macro && SlotType != (int)RaptureHotbarModule.HotbarSlotType.GearSet && CommandId == 0);
}
/// <summary>Which trigger combo shows this cross bar. Matches FFXIV cross hotbar sets (no trigger, L2, R2, L2+R2, R2+L2, then double-tap variants).</summary>
public enum CrossBarTrigger
{
None = 0, // Bar 1: always visible when no trigger held
L2 = 1,
R2 = 2,
L2R2 = 3, // L2 then R2
R2L2 = 4, // R2 then L2
L2Double = 5,
R2Double = 6,
L2R2Double = 7,
R2L2Double = 8,
}
/// <summary>Config for one controller cross bar (8 slots in cross layout). Slot data is stored separately from game hotbars so controller and normal bars can differ.</summary>
public class ControllerBarConfig : AnchorablePluginConfigObject
{
internal int HotbarIndex { get; set; } = 1; // 1-8
/// <summary>Persisted slot contents for this cross bar (8 slots). Not drawn in config UI. Empty slots are SlotType=0 (Empty), CommandId=0.</summary>
public List<ControllerSlotData> Slots = new List<ControllerSlotData>();
[Combo("Show when", new string[] { "No trigger", "L2", "R2", "L2 + R2", "R2 + L2", "L2 double-tap", "R2 double-tap", "L2+R2 double", "R2+L2 double" })]
[Order(18)]
public int TriggerCombo = 0; // CrossBarTrigger
[DragInt2("Slot Size", min = 24, max = 96)]
[Order(22)]
public Vector2 SlotSize = new Vector2(40, 40);
[DragInt("Slot Padding", min = 0, max = 16)]
[Order(23)]
public int SlotPadding = 2;
[Checkbox("Show Cooldown Overlay")]
[Order(24)]
public bool ShowCooldownOverlay = true;
[Checkbox("Show Cooldown Numbers")]
[Order(25)]
public bool ShowCooldownNumbers = true;
[Checkbox("Show Border")]
[Order(26)]
public bool ShowBorder = true;
[Checkbox("Show Tooltips")]
[Order(27)]
public bool ShowTooltips = true;
[Checkbox("Show Keybinds")]
[Order(28)]
public bool ShowSlotNumbers = true;
[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(31)]
public bool ShowKeypressFlash = true;
[NestedConfig("Combo Highlight", 32)]
public ComboHighlightConfig ComboHighlightConfig = new();
[NestedConfig("Visibility", 70)]
public VisibilityConfig VisibilityConfig = new VisibilityConfig();
/// <summary>Cross layout: 8 slots. Left 4 (vertical) + Right 4 (vertical). Slot indices 0-3 left, 4-7 right.</summary>
public const int CrossSlotCount = 8;
public CrossBarTrigger Trigger => (CrossBarTrigger)Math.Clamp(TriggerCombo, 0, 8);
public static ControllerBarConfig DefaultConfig(int hotbarIndex)
{
var config = new ControllerBarConfig { HotbarIndex = hotbarIndex };
ApplyDefaults(config, hotbarIndex);
return config;
}
public static void ApplyDefaults(ControllerBarConfig config, int hotbarIndex)
{
var viewport = ImGui.GetMainViewport().Size;
float yOffset = 60 + (hotbarIndex - 1) * 50;
config.Position = new Vector2(0, -viewport.Y * 0.5f + yOffset);
config.Anchor = DrawAnchor.Center;
// Two crosses side by side: 3 cells each (slot+pad), gap between
float cell = 40 + 2;
config.Size = new Vector2(3 * cell + 4 + 3 * cell, 3 * cell);
config.HotbarIndex = hotbarIndex;
}
/// <summary>Get the controller bar config for bar 1-8. Returns null if config not available.</summary>
public static ControllerBarConfig? GetBarConfig(int barIndex)
{
var cfg = ConfigurationManager.Instance;
if (cfg == null || barIndex < 1 || barIndex > 8) return null;
return barIndex switch
{
1 => cfg.GetConfigObject<ControllerBar1Config>(),
2 => cfg.GetConfigObject<ControllerBar2Config>(),
3 => cfg.GetConfigObject<ControllerBar3Config>(),
4 => cfg.GetConfigObject<ControllerBar4Config>(),
5 => cfg.GetConfigObject<ControllerBar5Config>(),
6 => cfg.GetConfigObject<ControllerBar6Config>(),
7 => cfg.GetConfigObject<ControllerBar7Config>(),
8 => cfg.GetConfigObject<ControllerBar8Config>(),
_ => null
};
}
/// <summary>Get slot data for this bar, padded to 8 entries. Caller can use index 0..7.</summary>
public void EnsureSlotsPadded()
{
while (Slots.Count < ControllerBarConfig.CrossSlotCount)
Slots.Add(new ControllerSlotData { SlotType = (int)RaptureHotbarModule.HotbarSlotType.Empty, CommandId = 0 });
}
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("General", 0)]
public class ControllerHotbarsConfig : PluginConfigObject
{
[Checkbox("Use controller hotbars", help = "When enabled (and sync below is off), normal HSUI hotbars are hidden and the cross hotbars are shown. When sync with game is on, this is ignored and bar mode follows the game.")]
[Order(1, collapseWith = null)]
public new bool Enabled = false;
[Checkbox("Sync bar mode with game client", help = "When enabled, the plugin follows the game's Character Configuration toggle (Mouse and Gamepad Mode). Controller hotbars when gamepad mode is on, normal hotbars when keyboard/mouse mode is on. The 'Use controller hotbars' checkbox is ignored while sync is on.")]
[Order(2, collapseWith = null)]
public bool SyncBarModeWithGameClient = false;
/// <summary>True when controller hotbars should be shown: either sync is on and game is in controller mode, or sync is off and Enabled is true.</summary>
public static bool GetEffectiveControllerHotbarsEnabled()
{
var config = ConfigurationManager.Instance?.GetConfigObject<ControllerHotbarsConfig>();
if (config == null) return false;
if (config.SyncBarModeWithGameClient)
return ControllerHotbarHelper.IsGameInControllerMode();
return config.Enabled;
}
[ManualDraw]
public bool DrawRestoreControllerBarsButton(ref bool changed)
{
ImGuiHelper.DrawSeparator(2, 1);
if (ImGui.Button("Restore controller bar layout", new Vector2(220, 24)))
{
RestoreControllerBarsToDefaults();
changed = true;
return true;
}
if (ImGui.IsItemHovered())
ImGui.SetTooltip("Reset positions, layout, and display settings for all 8 controller cross bars to default. Use if your controller bars are misplaced or broken.");
return false;
}
[ManualDraw]
public bool DrawCloneButton(ref bool changed)
{
ImGuiHelper.DrawSeparator(2, 1);
if (ImGui.Button("Clone layout from normal hotbars", new Vector2(240, 24)))
{
CloneLayoutFromNormalHotbars();
changed = true;
return true;
}
if (ImGui.IsItemHovered())
ImGui.SetTooltip("Copy position, size, and display settings from Hotbar 18 to the controller cross bars. Does not change actions in the slots.");
return false;
}
[ManualDraw]
public bool DrawCloneActionsButton(ref bool changed)
{
if (ImGui.Button("Copy normal hotbars 18 → controller bars", new Vector2(280, 24)))
{
CloneActionsFromNormalHotbars();
changed = true;
return true;
}
if (ImGui.IsItemHovered())
ImGui.SetTooltip("Copy slot contents from normal Hotbar 18 into controller bar storage. Use this to mirror your keyboard hotbar setup onto the controller bars. Normal and controller bars are stored separately, so this does not overwrite your normal bars.");
return false;
}
[ManualDraw]
public bool DrawCopyControllerToNormalButton(ref bool changed)
{
if (ImGui.Button("Copy controller bars → normal hotbars 18", new Vector2(280, 24)))
{
CopyControllerBarsToNormalHotbars();
changed = true;
return true;
}
if (ImGui.IsItemHovered())
ImGui.SetTooltip("Copy controller bar slot contents into normal Hotbar 18. This overwrites the current normal hotbar 18 layout with your controller bar layout.");
return false;
}
public new static ControllerHotbarsConfig DefaultConfig() => new();
private static void CloneLayoutFromNormalHotbars()
{
var cfg = ConfigurationManager.Instance;
if (cfg == null) return;
var normal = new AnchorablePluginConfigObject?[]
{
cfg.GetConfigObject<Hotbar1BarConfig>(),
cfg.GetConfigObject<Hotbar2BarConfig>(),
cfg.GetConfigObject<Hotbar3BarConfig>(),
cfg.GetConfigObject<Hotbar4BarConfig>(),
cfg.GetConfigObject<Hotbar5BarConfig>(),
cfg.GetConfigObject<Hotbar6BarConfig>(),
cfg.GetConfigObject<Hotbar7BarConfig>(),
cfg.GetConfigObject<Hotbar8BarConfig>()
};
var controller = new ControllerBarConfig?[]
{
cfg.GetConfigObject<ControllerBar1Config>(),
cfg.GetConfigObject<ControllerBar2Config>(),
cfg.GetConfigObject<ControllerBar3Config>(),
cfg.GetConfigObject<ControllerBar4Config>(),
cfg.GetConfigObject<ControllerBar5Config>(),
cfg.GetConfigObject<ControllerBar6Config>(),
cfg.GetConfigObject<ControllerBar7Config>(),
cfg.GetConfigObject<ControllerBar8Config>()
};
for (int i = 0; i < 8; i++)
{
if (normal[i] is HotbarBarConfig n && controller[i] is ControllerBarConfig c)
{
c.Position = n.Position;
c.Anchor = n.Anchor;
c.SlotSize = n.SlotSize;
c.SlotPadding = n.SlotPadding;
c.ShowCooldownOverlay = n.ShowCooldownOverlay;
c.ShowCooldownNumbers = n.ShowCooldownNumbers;
c.ShowBorder = n.ShowBorder;
c.ShowTooltips = n.ShowTooltips;
c.ShowSlotNumbers = n.ShowSlotNumbers;
c.ShowChargeCount = n.ShowChargeCount;
c.ShowComboHighlight = n.ShowComboHighlight;
c.ShowKeypressFlash = n.ShowKeypressFlash;
c.ComboHighlightConfig.Color = n.ComboHighlightConfig.Color;
c.ComboHighlightConfig.ShowGlow = n.ComboHighlightConfig.ShowGlow;
c.ComboHighlightConfig.LineStyle = n.ComboHighlightConfig.LineStyle;
c.ComboHighlightConfig.Thickness = n.ComboHighlightConfig.Thickness;
}
}
}
private static unsafe void CloneActionsFromNormalHotbars()
{
if (ActionBarsManager.Instance == null) return;
var module = RaptureHotbarModule.Instance();
if (module == null || !module->ModuleReady) return;
for (int bar = 1; bar <= 8; bar++)
{
var barConfig = ControllerBarConfig.GetBarConfig(bar);
if (barConfig == null) continue;
barConfig.EnsureSlotsPadded();
int barIdx = bar - 1;
ref var displayBar = ref module->StandardHotbars[barIdx];
for (int slot = 0; slot < ControllerBarConfig.CrossSlotCount; slot++)
{
var slotPtr = displayBar.GetHotbarSlot((uint)slot);
if (slotPtr == null) continue;
var slotType = slotPtr->IsEmpty && slotPtr->CommandType != RaptureHotbarModule.HotbarSlotType.GearSet
? RaptureHotbarModule.HotbarSlotType.Empty
: slotPtr->CommandType;
uint id = slotPtr->IsEmpty ? 0u : slotPtr->CommandId;
while (barConfig.Slots.Count <= slot)
barConfig.Slots.Add(new ControllerSlotData { SlotType = (int)RaptureHotbarModule.HotbarSlotType.Empty, CommandId = 0 });
barConfig.Slots[slot] = new ControllerSlotData { SlotType = (int)slotType, CommandId = id };
}
}
ConfigurationManager.Instance?.SaveConfigurations();
Plugin.Logger?.Information("[HSUI] Copied normal hotbars 18 to controller bar storage.");
}
private static unsafe void CopyControllerBarsToNormalHotbars()
{
if (ActionBarsManager.Instance == null) return;
var module = RaptureHotbarModule.Instance();
if (module == null || !module->ModuleReady) return;
for (int bar = 1; bar <= 8; bar++)
{
var barConfig = ControllerBarConfig.GetBarConfig(bar);
if (barConfig == null) continue;
barConfig.EnsureSlotsPadded();
int barIdx = bar - 1;
ref var displayBar = ref module->StandardHotbars[barIdx];
for (int slot = 0; slot < ControllerBarConfig.CrossSlotCount && slot < barConfig.Slots.Count; slot++)
{
var entry = barConfig.Slots[slot];
var slotType = (RaptureHotbarModule.HotbarSlotType)entry.SlotType;
uint id = entry.CommandId;
var slotPtr = displayBar.GetHotbarSlot((uint)slot);
if (slotPtr == null) continue;
slotPtr->Set(slotType, id);
slotPtr->LoadIconId();
if (slotType == RaptureHotbarModule.HotbarSlotType.Item)
slotPtr->LoadCostDataForSlot(true);
ActionBarsManager.SetAndSaveSlotInternal(module, (uint)barIdx, (uint)slot, slotType, id, slotPtr);
}
}
Plugin.Logger?.Information("[HSUI] Copied controller bar storage to normal hotbars 18.");
}
private static void RestoreControllerBarsToDefaults()
{
var cfg = ConfigurationManager.Instance;
if (cfg == null) return;
var bars = new (ControllerBarConfig? config, int index)[]
{
(cfg.GetConfigObject<ControllerBar1Config>(), 1),
(cfg.GetConfigObject<ControllerBar2Config>(), 2),
(cfg.GetConfigObject<ControllerBar3Config>(), 3),
(cfg.GetConfigObject<ControllerBar4Config>(), 4),
(cfg.GetConfigObject<ControllerBar5Config>(), 5),
(cfg.GetConfigObject<ControllerBar6Config>(), 6),
(cfg.GetConfigObject<ControllerBar7Config>(), 7),
(cfg.GetConfigObject<ControllerBar8Config>(), 8)
};
foreach (var (bar, idx) in bars)
{
if (bar == null) continue;
bar.Enabled = true;
ControllerBarConfig.ApplyDefaults(bar, idx);
bar.TriggerCombo = idx - 1; // Bar 1 = None(0), Bar 2 = L2(1), ... Bar 8 = R2L2Double(7)
bar.SlotSize = new Vector2(40, 40);
bar.SlotPadding = 2;
bar.ShowCooldownOverlay = true;
bar.ShowCooldownNumbers = true;
bar.ShowBorder = true;
bar.ShowTooltips = true;
bar.ShowSlotNumbers = true;
bar.ShowChargeCount = true;
bar.ShowComboHighlight = true;
bar.ShowKeypressFlash = true;
bar.ComboHighlightConfig = new ComboHighlightConfig();
bar.VisibilityConfig = new VisibilityConfig();
}
}
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Cross Bar 1", 0)]
public class ControllerBar1Config : ControllerBarConfig
{
public ControllerBar1Config() => HotbarIndex = 1;
public new static ControllerBar1Config DefaultConfig() { var c = new ControllerBar1Config(); ApplyDefaults(c, 1); return c; }
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Cross Bar 2", 0)]
public class ControllerBar2Config : ControllerBarConfig
{
public ControllerBar2Config() => HotbarIndex = 2;
public new static ControllerBar2Config DefaultConfig() { var c = new ControllerBar2Config(); ApplyDefaults(c, 2); return c; }
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Cross Bar 3", 0)]
public class ControllerBar3Config : ControllerBarConfig
{
public ControllerBar3Config() => HotbarIndex = 3;
public new static ControllerBar3Config DefaultConfig() { var c = new ControllerBar3Config(); ApplyDefaults(c, 3); return c; }
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Cross Bar 4", 0)]
public class ControllerBar4Config : ControllerBarConfig
{
public ControllerBar4Config() => HotbarIndex = 4;
public new static ControllerBar4Config DefaultConfig() { var c = new ControllerBar4Config(); ApplyDefaults(c, 4); return c; }
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Cross Bar 5", 0)]
public class ControllerBar5Config : ControllerBarConfig
{
public ControllerBar5Config() => HotbarIndex = 5;
public new static ControllerBar5Config DefaultConfig() { var c = new ControllerBar5Config(); ApplyDefaults(c, 5); return c; }
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Cross Bar 6", 0)]
public class ControllerBar6Config : ControllerBarConfig
{
public ControllerBar6Config() => HotbarIndex = 6;
public new static ControllerBar6Config DefaultConfig() { var c = new ControllerBar6Config(); ApplyDefaults(c, 6); return c; }
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Cross Bar 7", 0)]
public class ControllerBar7Config : ControllerBarConfig
{
public ControllerBar7Config() => HotbarIndex = 7;
public new static ControllerBar7Config DefaultConfig() { var c = new ControllerBar7Config(); ApplyDefaults(c, 7); return c; }
}
[Exportable(false)]
[Section("Controller Hotbars", true)]
[SubSection("Cross Bar 8", 0)]
public class ControllerBar8Config : ControllerBarConfig
{
public ControllerBar8Config() => HotbarIndex = 8;
public new static ControllerBar8Config DefaultConfig() { var c = new ControllerBar8Config(); ApplyDefaults(c, 8); return c; }
}
}
+510
View File
@@ -0,0 +1,510 @@
using System;
using System.Collections.Generic;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Dalamud.Game.ClientState.Objects.Types;
using HSUI.Config;
using HSUI.Enums;
using HSUI.Helpers;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility;
using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using FFXIVClientStructs.FFXIV.Component.GUI;
using static FFXIVClientStructs.FFXIV.Client.Game.ActionManager;
using LuminaAction = Lumina.Excel.Sheets.Action;
namespace HSUI.Interface.GeneralElements
{
/// <summary>Draws one controller cross hotbar (8 slots in cross layout). Visible only when controller hotbars are enabled and trigger state matches.</summary>
public class CrossBarHud : DraggableHudElement, IHudElementWithActor, IHudElementWithVisibilityConfig
{
private ControllerBarConfig Config => (ControllerBarConfig)_config;
private bool _wasDragging;
private uint _dragId;
private RaptureHotbarModule.HotbarSlotType _dragSlotType;
private int _pendingSlotIconIndex = -1;
private uint _pendingSlotIconId;
private int _pendingSlotIconFramesLeft;
private int _lastFrameDroppedOnSlot = -1;
private bool _suppressSlotClicksAfterDragRelease;
public IGameObject? Actor { get; set; }
public VisibilityConfig VisibilityConfig => Config.VisibilityConfig;
public CrossBarHud(ControllerBarConfig config, string displayName) : base(config, displayName) { }
protected override (List<Vector2>, List<Vector2>) ChildrenPositionsAndSizes()
{
var size = BarSize();
return (new List<Vector2> { Config.Position }, new List<Vector2> { size });
}
private Vector2 BarSize()
{
// Two crosses side by side: each cross is 3 cells (slot+pad); gap between crosses
float cellW = Config.SlotSize.X + Config.SlotPadding;
float cellH = Config.SlotSize.Y + Config.SlotPadding;
float gap = Config.SlotPadding * 2;
float w = 3 * cellW + gap + 3 * cellW;
float h = 3 * cellH;
return new Vector2(w, h);
}
/// <summary>Cross layout like the game: left cross (slots 0-3) = top/left/right/bottom around center; right cross (slots 4-7) same.</summary>
private Vector2 GetSlotPositionCross(int slotIndex, Vector2 slotSize, int pad)
{
float cellW = slotSize.X + pad;
float cellH = slotSize.Y + pad;
float leftCrossWidth = 3 * cellW;
float gap = pad * 2f;
if (slotIndex < 4)
{
// Left cross: 3x3 grid, slots at (1,0), (0,1), (2,1), (1,2)
int col = slotIndex switch { 0 => 1, 1 => 0, 2 => 2, _ => 1 };
int row = slotIndex switch { 0 => 0, 1 => 1, 2 => 1, _ => 2 };
return new Vector2(col * cellW, row * cellH);
}
else
{
// Right cross: same 3x3 pattern, offset by left cross + gap
int i = slotIndex - 4;
int col = i switch { 0 => 1, 1 => 0, 2 => 2, _ => 1 };
int row = i switch { 0 => 0, 1 => 1, 2 => 1, _ => 2 };
return new Vector2(leftCrossWidth + gap + col * cellW, row * cellH);
}
}
private const float DropMargin = 24f;
/// <summary>Hit test: returns slot index 0-7 if pos is over a cross slot, else -1.</summary>
private int GetSlotIndexAtPositionCross(Vector2 topLeft, Vector2 slotSize, int pad, Vector2 pos)
{
Vector2 barSize = new Vector2(
3 * (slotSize.X + pad) + pad * 2f + 3 * (slotSize.X + pad),
3 * (slotSize.Y + pad));
if (pos.X < topLeft.X || pos.X >= topLeft.X + barSize.X || pos.Y < topLeft.Y || pos.Y >= topLeft.Y + barSize.Y)
return -1;
int best = -1;
float bestDistSq = float.MaxValue;
for (int i = 0; i < ControllerBarConfig.CrossSlotCount; i++)
{
var slotOffset = GetSlotPositionCross(i, slotSize, pad);
float cx = topLeft.X + slotOffset.X + slotSize.X * 0.5f;
float cy = topLeft.Y + slotOffset.Y + slotSize.Y * 0.5f;
float dx = pos.X - cx, dy = pos.Y - cy;
float slotHalfW = slotSize.X * 0.5f + DropMargin;
float slotHalfH = slotSize.Y * 0.5f + DropMargin;
if (Math.Abs(dx) <= slotHalfW && Math.Abs(dy) <= slotHalfH)
{
float distSq = dx * dx + dy * dy;
if (distSq < bestDistSq) { bestDistSq = distSq; best = i; }
}
}
return best;
}
private unsafe void HandleDragDropCross(Vector2 topLeft, Vector2 barSize, Vector2 slotSize, int pad)
{
if (_pendingSlotIconIndex >= 0 && _pendingSlotIconFramesLeft > 0)
{
_pendingSlotIconFramesLeft--;
if (_pendingSlotIconFramesLeft <= 0)
_pendingSlotIconIndex = -1;
}
else if (_pendingSlotIconIndex >= 0)
_pendingSlotIconIndex = -1;
var stage = AtkStage.Instance();
if (stage == null) return;
var dm = (AtkDragDropManager*)Unsafe.AsPointer(ref stage->DragDropManager);
bool dragging = dm->IsDragging;
if (dragging)
{
if (ActionBarsHud.GetHotbarsConfig()?.GeneralOptions?.EnableDragDropFromGame != false &&
ActionBarsHud.TryGetDragPayload(out var slotType, out var id))
{
_dragSlotType = slotType;
_dragId = id;
_wasDragging = true;
var mp = ImGui.GetMousePos();
int idx = GetSlotIndexAtPositionCross(topLeft, slotSize, pad, mp);
if (idx >= 0)
InputsHelper.SuppressExecuteSlotByIdAfterDrop((uint)(ActionBarsManager.ScratchBarIndex - 1), (uint)ActionBarsManager.ScratchSlotIndex, 500);
if (ImGui.IsMouseReleased(ImGuiMouseButton.Left))
{
int releaseIdx = GetSlotIndexAtPositionCross(topLeft, slotSize, pad, mp);
if (releaseIdx >= 0 && slotType != RaptureHotbarModule.HotbarSlotType.Empty &&
(id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet))
{
if (!ImGui.GetIO().KeyShift)
{
try
{
ActionBarsManager.Instance?.PlacePayloadOnControllerSlot(Config.HotbarIndex, releaseIdx, slotType, id);
uint iconId = ActionBarsHud.GetIconIdForPayload(slotType, id);
if (iconId != 0)
{
_pendingSlotIconIndex = releaseIdx;
_pendingSlotIconId = iconId;
_pendingSlotIconFramesLeft = 300;
}
_lastFrameDroppedOnSlot = releaseIdx;
InputsHelper.SuppressExecuteSlotByIdAfterDrop((uint)(ActionBarsManager.ScratchBarIndex - 1), (uint)ActionBarsManager.ScratchSlotIndex, 300);
if (slotType == RaptureHotbarModule.HotbarSlotType.Action ||
slotType == RaptureHotbarModule.HotbarSlotType.GeneralAction ||
slotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
slotType == RaptureHotbarModule.HotbarSlotType.PetAction)
InputsHelper.SuppressUseActionAfterDrop(id, 300);
}
catch (Exception ex)
{
Plugin.Logger.Warning($"[HSUI CrossBar DragDrop] Drop failed: {ex.Message}");
}
}
try { dm->CancelDragDrop(true, true); }
catch { }
}
else
{
try { dm->CancelDragDrop(true, true); }
catch { }
}
_wasDragging = false;
}
}
else
{
_dragSlotType = RaptureHotbarModule.HotbarSlotType.Empty;
_dragId = 0;
_wasDragging = true;
if (ImGui.IsMouseReleased(ImGuiMouseButton.Left))
{
try { dm->CancelDragDrop(true, true); }
catch { }
_wasDragging = false;
}
}
return;
}
if (_wasDragging)
{
_suppressSlotClicksAfterDragRelease = true;
var mp = ImGui.GetMousePos();
int idx = GetSlotIndexAtPositionCross(topLeft, slotSize, pad, mp);
if (idx >= 0)
{
var slotType = _dragSlotType;
var id = _dragId;
bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty &&
(id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet);
if (hasValidPayload)
{
if (ImGui.GetIO().KeyShift)
{
try { dm->CancelDragDrop(true, true); }
catch { }
ActionBarsManager.Instance?.ClearControllerSlot(Config.HotbarIndex, idx);
_lastFrameDroppedOnSlot = idx;
_wasDragging = false;
return;
}
try
{
ActionBarsManager.Instance?.PlacePayloadOnControllerSlot(Config.HotbarIndex, idx, slotType, id);
try { dm->CancelDragDrop(true, true); }
catch { }
uint iconId = ActionBarsHud.GetIconIdForPayload(slotType, id);
if (iconId != 0)
{
_pendingSlotIconIndex = idx;
_pendingSlotIconId = iconId;
_pendingSlotIconFramesLeft = 300;
}
_lastFrameDroppedOnSlot = idx;
InputsHelper.SuppressExecuteSlotByIdAfterDrop((uint)(ActionBarsManager.ScratchBarIndex - 1), (uint)ActionBarsManager.ScratchSlotIndex, 300);
if (slotType == RaptureHotbarModule.HotbarSlotType.Action ||
slotType == RaptureHotbarModule.HotbarSlotType.GeneralAction ||
slotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
slotType == RaptureHotbarModule.HotbarSlotType.PetAction)
InputsHelper.SuppressUseActionAfterDrop(id, 300);
}
catch (Exception ex)
{
Plugin.Logger.Warning($"[HSUI CrossBar DragDrop] Drop failed: {ex.Message}");
}
}
}
_wasDragging = false;
}
}
public override void DrawChildren(Vector2 origin)
{
if (!ControllerHotbarsConfig.GetEffectiveControllerHotbarsEnabled() || Actor == null)
return;
if (ControllerHotbarHelper.GetCurrentTrigger() != Config.Trigger)
return;
if (ActionBarsManager.Instance == null)
return;
_lastFrameDroppedOnSlot = -1;
_suppressSlotClicksAfterDragRelease = false;
var barSize = BarSize();
var topLeft = Utils.GetAnchoredPosition(origin + Config.Position, barSize, Config.Anchor);
var slotSize = Config.SlotSize;
int pad = Config.SlotPadding;
bool showCd = Config.ShowCooldownOverlay;
bool showCdNumbers = Config.ShowCooldownNumbers;
bool showBorder = Config.ShowBorder;
AddDrawAction(Config.StrataLevel, () =>
{
HandleDragDropCross(topLeft, barSize, slotSize, pad);
var slots = ActionBarsManager.Instance.GetControllerSlotData(Config.HotbarIndex, ControllerBarConfig.CrossSlotCount);
void DrawBarContent(ImDrawListPtr drawList)
{
using (FontsManager.Instance.PushFont(FontsConfig.DefaultSmallFontKey))
{
for (int i = 0; i < slots.Count; i++)
{
var slot = slots[i];
uint displayIconId = slot.IconId;
bool isEmpty = slot.IsEmpty;
bool usePending = _pendingSlotIconIndex == i && _pendingSlotIconId != 0;
if (usePending)
{
displayIconId = _pendingSlotIconId;
isEmpty = false;
}
var slotOffset = GetSlotPositionCross(i, slotSize, pad);
var pos = topLeft + slotOffset;
var size = new Vector2(slotSize.X, slotSize.Y);
bool hovered = !isEmpty && ImGui.IsMouseHoveringRect(pos, pos + size);
if (isEmpty)
{
drawList.AddRectFilled(pos, pos + size, 0x22000000);
if (showBorder)
drawList.AddRect(pos, pos + size, 0xFF444444);
}
else
{
uint color = hovered ? 0xFFFFFFFF : (slot.IsUsable ? 0xFFFFFFFF : 0xAA888888);
bool isComboNext = Config.ShowComboHighlight && IsComboNextAction(slot);
DrawHelper.DrawIcon(displayIconId, pos, size, showBorder && !hovered && !isComboNext, color, drawList);
if (hovered && showBorder)
drawList.AddRect(pos, pos + size, 0xFF88CCFF, 0, ImDrawFlags.None, 2);
else if (isComboNext)
{
var ch = Config.ComboHighlightConfig;
DrawHelper.DrawComboHighlightRect(drawList, pos, pos + size,
ch.Color.Base, ch.Thickness, ch.ShowGlow, ch.LineStyle);
}
if (showCd && slot.CooldownPercent > 0 && _pendingSlotIconIndex != i)
{
float total = 100f;
float elapsed = total - slot.CooldownPercent;
DrawHelper.DrawIconCooldown(pos, size, elapsed, total, drawList);
if (showCdNumbers && slot.CooldownSecondsLeft > 0)
{
string cdText = slot.CooldownSecondsLeft.ToString();
Vector2 textSize = ImGui.CalcTextSize(cdText);
Vector2 textPos = pos + (size - textSize) * 0.5f;
DrawHelper.DrawOutlinedText(cdText, textPos, 0xFFFFFFFF, 0xFF000000, drawList, 1);
}
}
if (Config.ShowKeypressFlash)
{
float flashAlpha = InputsHelper.GetKeypressFlashAlpha(Config.HotbarIndex, i, 0.2);
if (flashAlpha > 0.001f)
{
byte a = (byte)(flashAlpha * 0.5f * 255);
drawList.AddRectFilled(pos, pos + size, (uint)(a << 24 | 0xFFFFFF));
}
}
}
if (Config.ShowSlotNumbers && !slot.IsEmpty)
{
string label = !string.IsNullOrWhiteSpace(slot.KeybindHint)
? slot.KeybindHint
: ActionBarsManager.GetDefaultKeybindLabel(Config.HotbarIndex, i);
Vector2 labelSize = ImGui.CalcTextSize(label);
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);
}
}
}
}
DrawHelper.DrawInWindow(ID + "_crossbar", topLeft, barSize, false, DrawBarContent);
});
// Overlay for click, drag-drop and tooltip
AddDrawAction(StrataLevel.HIGHEST, () =>
{
var slots = ActionBarsManager.Instance.GetControllerSlotData(Config.HotbarIndex, ControllerBarConfig.CrossSlotCount);
var flags = ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoBackground
| ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoSavedSettings
| ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus
| ImGuiWindowFlags.NoNav;
string overlayId = $"HSUI_CrossBar{Config.HotbarIndex}_input";
ImGui.SetCursorScreenPos(topLeft);
if (!ImGui.BeginChild(overlayId, barSize, false, flags))
{
ImGui.EndChild();
return;
}
int frame = ImGui.GetFrameCount();
if (frame != ActionBarsHud._lastOverlayFrame)
{
ActionBarsHud._lastOverlayFrame = frame;
ActionBarsHud._anyHotbarAcceptedDrop = false;
if (ActionBarsHud._pendingReleaseOutsideSlotId >= 0 && ActionBarsHud.GetHotbarsConfig()?.GeneralOptions?.EnableReleaseOutsideToClear != false)
{
var (bar, slot) = ActionBarsHud.FromSlotId(ActionBarsHud._pendingReleaseOutsideSlotId);
if (bar >= 1 && bar <= 8 && slot >= 0 && slot < ControllerBarConfig.CrossSlotCount)
ActionBarsManager.Instance?.ClearControllerSlot(bar, slot);
ActionBarsHud._pendingReleaseOutsideSlotId = -1;
}
}
bool acceptedDrop = false;
for (int i = 0; i < ControllerBarConfig.CrossSlotCount; i++)
{
var slotOffset = GetSlotPositionCross(i, slotSize, pad);
var slotPos = topLeft + slotOffset;
ImGui.SetCursorScreenPos(slotPos);
bool clicked = ImGui.InvisibleButton($"##{overlayId}_slot_{i}", slotSize);
bool isHovered = ImGui.IsItemHovered();
bool isActive = ImGui.IsItemActive();
bool shiftHeld = ImGui.GetIO().KeyShift;
int targetSlotId = ActionBarsHud.ToSlotId(Config.HotbarIndex, i);
if (ActionBarsHud.GetHotbarsConfig()?.GeneralOptions?.EnableShiftDragToRearrange != false && ImGui.BeginDragDropTarget())
{
var payload = ImGui.AcceptDragDropPayload(ActionBarsHud.SlotPayloadType);
if (payload != ImGuiPayloadPtr.Null && payload.IsDataType(ActionBarsHud.SlotPayloadType) && ActionBarsHud.TryGetSlotPayload(payload, out var src))
{
acceptedDrop = true;
ActionBarsHud._anyHotbarAcceptedDrop = true;
ActionBarsHud._imGuiDragSourceSlotId = -1;
ActionBarsHud._pendingReleaseOutsideSlotId = -1;
ActionBarsHud._lastLoggedPickupSlotId = -1;
if (src.SlotId != targetSlotId)
{
var (srcBar, srcSlot) = ActionBarsHud.FromSlotId(src.SlotId);
if (srcBar >= 1 && srcSlot >= 0 && srcBar <= 8 && srcSlot < ControllerBarConfig.CrossSlotCount)
ActionBarsManager.Instance?.SwapControllerSlots(srcBar, srcSlot, Config.HotbarIndex, i);
}
}
ImGui.EndDragDropTarget();
}
if (ActionBarsHud.GetHotbarsConfig()?.GeneralOptions?.EnableShiftDragToRearrange != false && !ActionBarsHud.IsGameDragging() && shiftHeld && i < slots.Count && !slots[i].IsEmpty && isActive && ImGui.IsMouseDragging(ImGuiMouseButton.Left))
{
if (ImGui.BeginDragDropSource(ImGuiDragDropFlags.None))
{
ActionBarsHud._imGuiDragSourceSlotId = targetSlotId;
ActionBarsHud.SetSlotPayload(new ActionBarsHud.SlotDragPayload { SlotId = targetSlotId });
var icon = TexturesHelper.GetTextureFromIconId(slots[i].IconId);
if (icon != null)
ImGui.Image(icon.Handle, new Vector2(32, 32));
ImGui.EndDragDropSource();
}
}
if (clicked && !acceptedDrop && !ImGui.IsMouseDragging(ImGuiMouseButton.Left) && i < slots.Count && !slots[i].IsEmpty)
{
if (_suppressSlotClicksAfterDragRelease || i == _lastFrameDroppedOnSlot)
{
_suppressSlotClicksAfterDragRelease = false;
_lastFrameDroppedOnSlot = -1;
}
else if (shiftHeld)
{
ActionBarsManager.Instance?.ClearControllerSlot(Config.HotbarIndex, i);
}
else
{
ActionBarsManager.Instance?.ExecuteControllerSlot(Config.HotbarIndex, i);
}
}
if (Config.ShowTooltips && isHovered && i < slots.Count)
{
var slot = slots[i];
if (!slot.IsEmpty)
{
var (title, text) = ActionBarsHud.GetSlotTooltipPublic(slot);
if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
{
string body = string.IsNullOrEmpty(text) ? title : text;
var tooltipConfig = ConfigurationManager.Instance?.GetConfigObject<TooltipsConfig>();
var formatted = tooltipConfig != null ? TooltipsHelper.BuildFormattedActionTooltipBody(body, tooltipConfig) : null;
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, TooltipIdKind.Action, formatted);
}
}
}
}
if (ActionBarsHud.GetHotbarsConfig()?.GeneralOptions?.EnableReleaseOutsideToClear != false && ImGui.GetIO().KeyShift && ActionBarsHud._imGuiDragSourceSlotId >= 0 &&
ImGui.IsMouseReleased(ImGuiMouseButton.Left) && !ActionBarsHud._anyHotbarAcceptedDrop)
{
ActionBarsHud._pendingReleaseOutsideSlotId = ActionBarsHud._imGuiDragSourceSlotId;
ActionBarsHud._imGuiDragSourceSlotId = -1;
ActionBarsHud._lastLoggedPickupSlotId = -1;
}
ImGui.EndChild();
});
}
private static bool IsComboNextAction(ActionBarsManager.SlotInfo slot)
{
if (slot.IsEmpty || slot.ActionId == 0) return false;
try
{
var slotType = slot.SlotType;
var actionType = slotType switch
{
RaptureHotbarModule.HotbarSlotType.Action => ActionType.Action,
RaptureHotbarModule.HotbarSlotType.GeneralAction => ActionType.GeneralAction,
RaptureHotbarModule.HotbarSlotType.CraftAction => ActionType.CraftAction,
RaptureHotbarModule.HotbarSlotType.PetAction => ActionType.PetAction,
_ => (ActionType?)null
};
if (!actionType.HasValue) return false;
return SpellHelper.Instance.IsActionHighlighted(slot.ActionId, actionType.Value);
}
catch { return false; }
}
}
}
@@ -70,6 +70,12 @@ namespace HSUI.Interface.GeneralElements
[Order(50)] [Order(50)]
public bool HideDefaultPulltimer = false; public bool HideDefaultPulltimer = false;
[Checkbox("Show HUD during dialogue and interaction", help =
"When enabled, HSUI stays visible (including hotbars and other elements) when talking to NPCs or interacting with objects.\n" +
"When disabled, only the castbar is shown during dialogue and interaction (after a short delay), matching the game's default behavior.")]
[Order(55)]
public bool ShowHudDuringDialogue = true;
[Checkbox("Use Regional Number Format", help = "When enabled, HSUI will use your system's regional format settings when showing numbers.\nWhen disabled, HSUI will use English number formatting instead.", separator = true)] [Checkbox("Use Regional Number Format", help = "When enabled, HSUI will use your system's regional format settings when showing numbers.\nWhen disabled, HSUI will use English number formatting instead.", separator = true)]
[Order(60)] [Order(60)]
public bool UseRegionalNumberFormats = true; public bool UseRegionalNumberFormats = true;
+7 -3
View File
@@ -63,15 +63,19 @@ namespace HSUI.Interface.GeneralElements
[Order(28)] [Order(28)]
public bool ShowSlotNumbers = true; public bool ShowSlotNumbers = true;
[Checkbox("Show Combo Highlight")] [Checkbox("Show Charge Count")]
[Order(29)] [Order(29)]
public bool ShowChargeCount = true;
[Checkbox("Show Combo Highlight")]
[Order(30)]
public bool ShowComboHighlight = true; public bool ShowComboHighlight = true;
[Checkbox("Show Keypress Flash")] [Checkbox("Show Keypress Flash")]
[Order(30)] [Order(31)]
public bool ShowKeypressFlash = true; public bool ShowKeypressFlash = true;
[NestedConfig("Combo Highlight", 31)] [NestedConfig("Combo Highlight", 32)]
public ComboHighlightConfig ComboHighlightConfig = new(); public ComboHighlightConfig ComboHighlightConfig = new();
[Checkbox("Debug Drag & Drop")] [Checkbox("Debug Drag & Drop")]
@@ -0,0 +1,74 @@
using HSUI.Config;
using HSUI.Config.Attributes;
using HSUI.Enums;
using System.Numerics;
namespace HSUI.Interface.GeneralElements
{
[DisableParentSettings("Position")]
[Section("Other Elements")]
[SubSection("Mouse GCD Indicator", 0)]
public class MouseGCDIndicatorConfig : MovablePluginConfigObject
{
[Checkbox("Always Show")]
[Order(3)]
public bool AlwaysShow = false;
[ColorEdit4("Background Color")]
[Order(16)]
public PluginConfigColor BackgroundColor = new PluginConfigColor(new Vector4(0f / 255f, 0f / 255f, 0f / 255f, 50f / 100f));
[ColorEdit4("Color")]
[Order(17)]
public PluginConfigColor FillColor = new PluginConfigColor(new(220f / 255f, 220f / 255f, 220f / 255f, 100f / 100f));
[Checkbox("Show Border")]
[Order(18)]
public bool ShowBorder = true;
[Checkbox("Instant GCDs only", spacing = true)]
[Order(19)]
public bool InstantGCDsOnly = false;
[Checkbox("Only show when under GCD Threshold", spacing = true)]
[Order(20)]
public bool LimitGCDThreshold = false;
[DragFloat("GCD Threshold", velocity = 0.01f)]
[Order(21, collapseWith = nameof(LimitGCDThreshold))]
public float GCDThreshold = 1.50f;
[Checkbox("Show GCD Queue Indicator", spacing = true)]
[Order(24)]
public bool ShowGCDQueueIndicator = true;
[ColorEdit4("GCD Queue Color")]
[Order(25, collapseWith = nameof(ShowGCDQueueIndicator))]
public PluginConfigColor QueueColor = new PluginConfigColor(new(13f / 255f, 207f / 255f, 31f / 255f, 100f / 100f));
[DragInt("Radius")]
[Order(35)]
public int CircleRadius = 40;
[DragInt("Thickness")]
[Order(40)]
public int CircleThickness = 10;
[DragInt("Start Angle", min = 0, max = 359)]
[Order(45)]
public int CircleStartAngle = 0;
[Checkbox("Rotate CCW")]
[Order(50)]
public bool RotateCCW = false;
[DragInt2("Cursor Center Offset", min = -64, max = 64)]
[Order(55)]
public Vector2 CursorCenterOffset = new Vector2(8, 16);
[NestedConfig("Visibility", 70)]
public VisibilityConfig VisibilityConfig = new VisibilityConfig();
public new static MouseGCDIndicatorConfig DefaultConfig() { return new MouseGCDIndicatorConfig() { Enabled = false, Strata = StrataLevel.MID_HIGH }; }
}
}
@@ -0,0 +1,140 @@
using System;
using HSUI.Helpers;
using Dalamud.Bindings.ImGui;
using System.Collections.Generic;
using System.Numerics;
using HSUI.Config;
using Dalamud.Game.ClientState.Objects.SubKinds;
using Dalamud.Game.ClientState.Objects.Types;
namespace HSUI.Interface.GeneralElements
{
public class MouseGCDIndicatorHud : DraggableHudElement, IHudElementWithActor, IHudElementWithVisibilityConfig
{
private MouseGCDIndicatorConfig Config => (MouseGCDIndicatorConfig)_config;
public VisibilityConfig VisibilityConfig => Config.VisibilityConfig;
public IGameObject? Actor { get; set; } = null;
private float _lastTotalCastTime = 0;
public MouseGCDIndicatorHud(MouseGCDIndicatorConfig config, string displayName) : base(config, displayName) { }
protected override (List<Vector2>, List<Vector2>) ChildrenPositionsAndSizes()
{
return (new List<Vector2>(), new List<Vector2>());
}
protected override void DrawDraggableArea(Vector2 origin)
{
return;
}
public override void DrawChildren(Vector2 origin)
{
if (!Config.Enabled || Actor == null || Actor is not IPlayerCharacter)
{
return;
}
GCDHelper.GetGCDInfo((IPlayerCharacter)Actor, out var elapsed, out var total);
if (!Config.AlwaysShow && total == 0)
{
_lastTotalCastTime = 0;
return;
}
if (_lastTotalCastTime == 0 && Utils.IsActorCasting(Actor))
{
_lastTotalCastTime = ((IBattleChara)Actor).TotalCastTime;
}
var scale = elapsed / total;
if (scale <= 0)
{
_lastTotalCastTime = 0;
return;
}
bool instantGCDsOnly = Config.InstantGCDsOnly && _lastTotalCastTime != 0;
bool thresholdGCDs = Config.LimitGCDThreshold && _lastTotalCastTime > Config.GCDThreshold;
if (instantGCDsOnly || thresholdGCDs)
{
if (Config.AlwaysShow)
{
elapsed = 0;
total = 0;
}
else
{
return;
}
}
Vector2 center = ImGui.GetMousePos() + Config.CursorCenterOffset;
AddDrawAction(_config.StrataLevel, () =>
{
DrawCircularIndicator(center, Config.CircleRadius, elapsed, total);
});
}
private void DrawCircularIndicator(Vector2 position, float radius, float current, float total)
{
total = Config.AlwaysShow && total == 0 ? 1 : total;
current = Config.AlwaysShow && current == 0 ? total : current;
var size = new Vector2(radius * 2);
DrawHelper.DrawInWindow(ID, position - size / 2, size, false, (drawList) =>
{
current = Math.Min(current, total);
const int segments = 100;
const float queueTime = 0.5f;
float startAngle = 0f;
float endAngle = 2f * (float)Math.PI;
float offset = (float)(-Math.PI / 2f + (Config.CircleStartAngle * (Math.PI / 180f)));
if (Config.RotateCCW)
{
startAngle *= -1;
endAngle *= -1;
}
if (Config.AlwaysShow && current == total)
{
drawList.PathArcTo(position, radius, startAngle + offset, endAngle + offset, segments);
drawList.PathStroke(Config.FillColor.Base, ImDrawFlags.None, Config.CircleThickness);
}
else
{
float progressAngle = Math.Min(current, total - (Config.ShowGCDQueueIndicator ? queueTime : 0f)) / total * endAngle;
drawList.PathArcTo(position, radius, startAngle + offset, progressAngle + offset, segments);
drawList.PathStroke(Config.FillColor.Base, ImDrawFlags.None, Config.CircleThickness);
if (Config.ShowGCDQueueIndicator && current > total - queueTime)
{
float oldAngle = progressAngle - 0.0003f * total * endAngle;
progressAngle = current / total * endAngle;
drawList.PathArcTo(position, radius, oldAngle + offset, progressAngle + offset, segments);
drawList.PathStroke(Config.QueueColor.Base, ImDrawFlags.None, Config.CircleThickness);
}
drawList.PathArcTo(position, radius, progressAngle + offset, endAngle + offset, segments);
drawList.PathStroke(Config.BackgroundColor.Base, ImDrawFlags.None, Config.CircleThickness);
}
if (Config.ShowBorder)
{
drawList.PathArcTo(position, radius - Config.CircleThickness / 2f, 0, endAngle, segments);
drawList.PathStroke(0xFF000000, ImDrawFlags.None, 1);
drawList.PathArcTo(position, radius + Config.CircleThickness / 2f, 0, endAngle, segments);
drawList.PathStroke(0xFF000000, ImDrawFlags.None, 1);
}
});
}
}
}
+24 -1
View File
@@ -1,3 +1,4 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Objects.Enums; using Dalamud.Game.ClientState.Objects.Enums;
using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.ClientState.Objects.SubKinds;
@@ -6,12 +7,17 @@ using HSUI.Config.Attributes;
using HSUI.Interface.GeneralElements; using HSUI.Interface.GeneralElements;
using HSUI.Interface.Party; using HSUI.Interface.Party;
using System.Linq; using System.Linq;
using System.Numerics;
namespace HSUI.Interface namespace HSUI.Interface
{ {
[Exportable(false)] [Exportable(false)]
public class VisibilityConfig : PluginConfigObject public class VisibilityConfig : PluginConfigObject
{ {
[Checkbox("Hide unless hovered", help = "When enabled, the element is hidden until the cursor hovers over it. Requires HUD to be locked.")]
[Order(4)]
public bool HideUnlessHovered = false;
[Checkbox("Hide outside of combat")] [Checkbox("Hide outside of combat")]
[Order(5)] [Order(5)]
public bool HideOutsideOfCombat = false; public bool HideOutsideOfCombat = false;
@@ -96,6 +102,21 @@ namespace HSUI.Interface
if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; } if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; }
if (element != null && !element.GetConfig().Enabled) { return false; } if (element != null && !element.GetConfig().Enabled) { return false; }
// Hide unless hovered: element is visible only when the cursor is over it
if (HideUnlessHovered && element is DraggableHudElement draggable)
{
Vector2 origin = ImGui.GetMainViewport().Size / 2f;
var hudOptions = ConfigurationManager.Instance?.GetConfigObject<HUDOptionsConfig>();
if (hudOptions != null && hudOptions.UseGlobalHudShift)
origin += hudOptions.HudOffset;
var (min, max) = draggable.GetScreenBounds(origin);
if (!ImGui.IsMouseHoveringRect(min, max))
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 isInIslandSanctuary = IsInIslandSanctuary();
bool isInDuty = IsInDuty() && !isInIslandSanctuary; bool isInDuty = IsInDuty() && !isInIslandSanctuary;
IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer; IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer;
@@ -127,7 +148,8 @@ namespace HSUI.Interface
if (HideOnFullHP && player != null && player.CurrentHp == player.MaxHp) { return false; } 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; } if (HideInIslandSanctuary && isInIslandSanctuary) { return false; }
@@ -140,6 +162,7 @@ namespace HSUI.Interface
{ {
Enabled = config.Enabled; Enabled = config.Enabled;
HideUnlessHovered = config.HideUnlessHovered;
HideOutsideOfCombat = config.HideOutsideOfCombat; HideOutsideOfCombat = config.HideOutsideOfCombat;
HideInCombat = config.HideInCombat; HideInCombat = config.HideInCombat;
HideInGoldSaucer = config.HideInGoldSaucer; HideInGoldSaucer = config.HideInGoldSaucer;
+37
View File
@@ -379,6 +379,11 @@ namespace HSUI.Interface
_hudElements.Add(gcdIndicatorConfig, gcdIndicator); _hudElements.Add(gcdIndicatorConfig, gcdIndicator);
_hudElementsUsingPlayer.Add(gcdIndicator); _hudElementsUsingPlayer.Add(gcdIndicator);
var mouseGcdIndicatorConfig = ConfigurationManager.Instance.GetConfigObject<MouseGCDIndicatorConfig>();
var mouseGcdIndicator = new MouseGCDIndicatorHud(mouseGcdIndicatorConfig, "Mouse GCD Indicator");
_hudElements.Add(mouseGcdIndicatorConfig, mouseGcdIndicator);
_hudElementsUsingPlayer.Add(mouseGcdIndicator);
var mpTickerConfig = ConfigurationManager.Instance.GetConfigObject<MPTickerConfig>(); var mpTickerConfig = ConfigurationManager.Instance.GetConfigObject<MPTickerConfig>();
var mpTicker = new MPTickerHud(mpTickerConfig, "MP Ticker"); var mpTicker = new MPTickerHud(mpTickerConfig, "MP Ticker");
_hudElements.Add(mpTickerConfig, mpTicker); _hudElements.Add(mpTickerConfig, mpTicker);
@@ -420,6 +425,25 @@ namespace HSUI.Interface
_hudElementsUsingPlayer.Add(barHud); _hudElementsUsingPlayer.Add(barHud);
} }
ControllerBarConfig[] controllerBarConfigs = new ControllerBarConfig[]
{
ConfigurationManager.Instance.GetConfigObject<ControllerBar1Config>(),
ConfigurationManager.Instance.GetConfigObject<ControllerBar2Config>(),
ConfigurationManager.Instance.GetConfigObject<ControllerBar3Config>(),
ConfigurationManager.Instance.GetConfigObject<ControllerBar4Config>(),
ConfigurationManager.Instance.GetConfigObject<ControllerBar5Config>(),
ConfigurationManager.Instance.GetConfigObject<ControllerBar6Config>(),
ConfigurationManager.Instance.GetConfigObject<ControllerBar7Config>(),
ConfigurationManager.Instance.GetConfigObject<ControllerBar8Config>()
};
for (int i = 0; i < controllerBarConfigs.Length; i++)
{
var barConfig = controllerBarConfigs[i];
var crossBarHud = new CrossBarHud(barConfig, $"Cross Bar {i + 1}");
_hudElements.Add(barConfig, crossBarHud);
_hudElementsUsingPlayer.Add(crossBarHud);
}
var partyCooldownsConfig = ConfigurationManager.Instance.GetConfigObject<PartyCooldownsConfig>(); var partyCooldownsConfig = ConfigurationManager.Instance.GetConfigObject<PartyCooldownsConfig>();
var partyCooldownsHud = new PartyCooldownsHud(partyCooldownsConfig, "Party Cooldowns"); var partyCooldownsHud = new PartyCooldownsHud(partyCooldownsConfig, "Party Cooldowns");
_hudElements.Add(partyCooldownsConfig, partyCooldownsHud); _hudElements.Add(partyCooldownsConfig, partyCooldownsHud);
@@ -552,6 +576,15 @@ namespace HSUI.Interface
return false; return false;
} }
// When "Show HUD during dialogue" is on, keep HSUI visible during NPC dialogue and object interaction
// even if the game hides the parameter bar
var hudOptions = ConfigurationManager.Instance?.GetConfigObject<HUDOptionsConfig>();
if (hudOptions?.ShowHudDuringDialogue == true &&
(Plugin.Condition[ConditionFlag.OccupiedInQuestEvent] || Plugin.Condition[ConditionFlag.OccupiedInEvent]))
{
return true;
}
AtkUnitBase* parameterWidget = (AtkUnitBase*)Plugin.GameGui.GetAddonByName("_ParameterWidget", 1).Address; AtkUnitBase* parameterWidget = (AtkUnitBase*)Plugin.GameGui.GetAddonByName("_ParameterWidget", 1).Address;
AtkUnitBase* fadeMiddleWidget = (AtkUnitBase*)Plugin.GameGui.GetAddonByName("FadeMiddle", 1).Address; AtkUnitBase* fadeMiddleWidget = (AtkUnitBase*)Plugin.GameGui.GetAddonByName("FadeMiddle", 1).Address;
@@ -563,6 +596,10 @@ namespace HSUI.Interface
protected bool ShouldOnlyShowCastbar() protected bool ShouldOnlyShowCastbar()
{ {
var hudOptions = ConfigurationManager.Instance?.GetConfigObject<HUDOptionsConfig>();
if (hudOptions?.ShowHudDuringDialogue == true)
return false;
// when in quest dialogs and events, hide everything except castbars // when in quest dialogs and events, hide everything except castbars
// this includes talking to npcs or interacting with quest related stuff // this includes talking to npcs or interacting with quest related stuff
if (Plugin.Condition[ConditionFlag.OccupiedInQuestEvent] || if (Plugin.Condition[ConditionFlag.OccupiedInQuestEvent] ||
-4
View File
@@ -45,10 +45,6 @@ namespace HSUI.Interface.GeneralElements
[Order(21)] [Order(21)]
public bool AlwaysShowTargetNameplate = true; public bool AlwaysShowTargetNameplate = true;
[Checkbox("In PvP, show only enemy player nameplates", spacing = true, help = "When in Frontlines, Rival Wings, or Crystal Conflict, hide ally player nameplates (party, alliance, teammates) and show only enemy players. Uses Enemy nameplate styling for PvP enemies.")]
[Order(22)]
public bool PvPShowOnlyEnemyPlayers = false;
public int RaycastFlag() => OcclusionType == NameplatesOcclusionType.WallsAndObjects ? 0x2000 : 0x4000; public int RaycastFlag() => OcclusionType == NameplatesOcclusionType.WallsAndObjects ? 0x2000 : 0x4000;
} }
-17
View File
@@ -128,23 +128,6 @@ namespace HSUI.Interface.Nameplates
return _playerHud; return _playerHud;
} }
// In PvP, optionally show only enemy player nameplates (hide allies)
if (Config.PvPShowOnlyEnemyPlayers && Plugin.ClientState.IsPvP)
{
if (data.GameObject is ICharacter character)
{
if ((character.StatusFlags & StatusFlags.PartyMember) != 0 ||
(character.StatusFlags & StatusFlags.AllianceMember) != 0 ||
(character.StatusFlags & StatusFlags.Friend) != 0)
{
return null; // Hide party, alliance, and friend nameplates
}
}
// Other players: show only hostile (enemy team), hide allies
if (data.GameObject == null) { return null; }
return Utils.IsHostile(data.GameObject) ? _enemyHud : null;
}
if (data.GameObject is ICharacter character2) if (data.GameObject is ICharacter character2)
{ {
if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember
+34 -25
View File
@@ -280,34 +280,18 @@ namespace HSUI.Interface.Party
bool anyChanged = false; bool anyChanged = false;
ref var mainGroup = ref gm->MainGroup; 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++) for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++)
{ {
int count = 0; int count = 0;
var list = new List<IPartyFramesMember>(); 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++;
}
// GroupManager stores our party in _partyMembers, not GetAllianceMemberByGroupAndIndex.
// When group 2 is empty, it's our alliance—populate from GetPartyMemberByIndex.
if (count == 0 && allianceIdx == 2)
{ {
// Our party: _partyMembers via GetPartyMemberByIndex
for (int slot = 0; slot < 8; slot++) for (int slot = 0; slot < 8; slot++)
{ {
var pm = mainGroup.GetPartyMemberByIndex(slot); var pm = mainGroup.GetPartyMemberByIndex(slot);
@@ -327,6 +311,29 @@ namespace HSUI.Interface.Party
count++; 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]) if (count != _lastMemberCounts[allianceIdx])
{ {
@@ -340,9 +347,11 @@ namespace HSUI.Interface.Party
int ourIdx = 0; int ourIdx = 0;
for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++) for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
{ {
PartyMember* pm = allianceIdx == 2 PartyMember* pm;
? mainGroup.GetPartyMemberByIndex(slot) if (allianceIdx == 2)
: mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot); pm = mainGroup.GetPartyMemberByIndex(slot);
else
pm = mainGroup.GetAllianceMemberByIndex(allianceIdx * 8 + slot);
if (pm == null || pm->EntityId == 0) continue; if (pm == null || pm->EntityId == 0) continue;
if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember) if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember)
pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob); pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
@@ -283,10 +283,14 @@ namespace HSUI.Interface.Party
// tooltip // tooltip
if (Config.ShowTooltips) if (Config.ShowTooltips)
{ {
uint? iconId = hoveringCooldown.Data.IconId > 0 ? hoveringCooldown.Data.IconId : null;
TooltipsHelper.Instance.ShowTooltipOnCursor( TooltipsHelper.Instance.ShowTooltipOnCursor(
hoveringCooldown.TooltipText(), hoveringCooldown.TooltipText(),
hoveringCooldown.Data.Name, hoveringCooldown.Data.Name,
hoveringCooldown.Data.ActionId hoveringCooldown.Data.ActionId,
"",
iconId,
HSUI.Helpers.TooltipIdKind.Action
); );
} }
} }
@@ -304,10 +304,14 @@ namespace HSUI.Interface.PartyCooldowns
pos = origin + new Vector2(pos.X - size.Y + 1, pos.Y); pos = origin + new Vector2(pos.X - size.Y + 1, pos.Y);
if (Config.ShowTooltips && ImGui.IsMouseHoveringRect(pos, pos + _barConfig.Size)) if (Config.ShowTooltips && ImGui.IsMouseHoveringRect(pos, pos + _barConfig.Size))
{ {
uint? iconId = cooldown.Data.IconId > 0 ? cooldown.Data.IconId : null;
TooltipsHelper.Instance.ShowTooltipOnCursor( TooltipsHelper.Instance.ShowTooltipOnCursor(
cooldown.TooltipText(), cooldown.TooltipText(),
cooldown.Data.Name, cooldown.Data.Name,
cooldown.Data.ActionId cooldown.Data.ActionId,
"",
iconId,
HSUI.Helpers.TooltipIdKind.Action
); );
} }
@@ -468,11 +468,14 @@ namespace HSUI.Interface.StatusEffects
// tooltip // tooltip
if (Config.ShowTooltips) if (Config.ShowTooltips)
{ {
uint? iconId = data.Data.Icon > 0 ? data.Data.Icon : null;
TooltipsHelper.Instance.ShowTooltipOnCursor( TooltipsHelper.Instance.ShowTooltipOnCursor(
EncryptedStringsHelper.GetString(data.Data.Description.ToDalamudString().ToString()), EncryptedStringsHelper.GetString(data.Data.Description.ToDalamudString().ToString()),
EncryptedStringsHelper.GetString(data.Data.Name.ToString()), EncryptedStringsHelper.GetString(data.Data.Name.ToString()),
data.Status.StatusId, data.Status.StatusId,
GetStatusActorName(data.Status) GetStatusActorName(data.Status),
iconId,
HSUI.Helpers.TooltipIdKind.Status
); );
} }
+13 -1
View File
@@ -43,6 +43,8 @@ namespace HSUI
public static IAddonLifecycle AddonLifecycle { get; private set; } = null!; public static IAddonLifecycle AddonLifecycle { get; private set; } = null!;
public static IChatGui Chat { get; private set; } = null!; public static IChatGui Chat { get; private set; } = null!;
public static ISeStringEvaluator SeStringEvaluator { get; private set; } = null!; public static ISeStringEvaluator SeStringEvaluator { get; private set; } = null!;
public static IKeyState? KeyState { get; private set; }
public static IGamepadState? GamepadState { get; private set; }
public static ISharedImmediateTexture? BannerTexture; public static ISharedImmediateTexture? BannerTexture;
@@ -78,7 +80,9 @@ namespace HSUI
ITextureProvider textureProvider, ITextureProvider textureProvider,
IAddonLifecycle addonLifecycle, IAddonLifecycle addonLifecycle,
IChatGui chat, IChatGui chat,
ISeStringEvaluator seStringEvaluator) ISeStringEvaluator seStringEvaluator,
IGamepadState? gamepadState = null,
IKeyState? keyState = null)
{ {
BuddyList = buddyList; BuddyList = buddyList;
ClientState = clientState; ClientState = clientState;
@@ -100,6 +104,8 @@ namespace HSUI
AddonLifecycle = addonLifecycle; AddonLifecycle = addonLifecycle;
Chat = chat; Chat = chat;
SeStringEvaluator = seStringEvaluator; SeStringEvaluator = seStringEvaluator;
KeyState = keyState;
GamepadState = gamepadState;
if (pluginInterface.AssemblyLocation.DirectoryName != null) if (pluginInterface.AssemblyLocation.DirectoryName != null)
{ {
@@ -134,8 +140,10 @@ namespace HSUI
PartyCooldownsManager.Initialize(); PartyCooldownsManager.Initialize();
PullTimerHelper.Initialize(); PullTimerHelper.Initialize();
ActionBarsManager.Initialize(); ActionBarsManager.Initialize();
ControllerHotbarHelper.SetGamepadState(GamepadState);
TextTagsHelper.Initialize(); TextTagsHelper.Initialize();
TooltipsHelper.Initialize(); TooltipsHelper.Initialize();
ActionChatLinkHelper.Initialize();
PetRenamerHelper.Initialize(); PetRenamerHelper.Initialize();
HonorificHelper.Initialize(); HonorificHelper.Initialize();
WotsitHelper.Initialize(); WotsitHelper.Initialize();
@@ -437,6 +445,9 @@ namespace HSUI
{ {
if (!disposing) return; 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 // Stop UI callbacks first so no Draw/OpenConfigUi runs during teardown
try try
{ {
@@ -479,6 +490,7 @@ namespace HSUI
TryDispose("ProfilesManager", () => ProfilesManager.Instance?.Dispose()); TryDispose("ProfilesManager", () => ProfilesManager.Instance?.Dispose());
TryDispose("SpellHelper", () => SpellHelper.Instance?.Dispose()); TryDispose("SpellHelper", () => SpellHelper.Instance?.Dispose());
TryDispose("TooltipsHelper", () => TooltipsHelper.Instance?.Dispose()); TryDispose("TooltipsHelper", () => TooltipsHelper.Instance?.Dispose());
TryDispose("ActionChatLinkHelper", () => ActionChatLinkHelper.Instance?.Dispose());
TryDispose("HonorificHelper", () => HonorificHelper.Instance?.Dispose()); TryDispose("HonorificHelper", () => HonorificHelper.Instance?.Dispose());
TryDispose("PetRenamerHelper", () => PetRenamerHelper.Instance?.Dispose()); TryDispose("PetRenamerHelper", () => PetRenamerHelper.Instance?.Dispose());
TryDispose("WotsitHelper", () => WotsitHelper.Instance?.Dispose()); TryDispose("WotsitHelper", () => WotsitHelper.Instance?.Dispose());
+73
View File
@@ -1,3 +1,76 @@
# 1.0.8.18
- **Visibility**: "Hide unless hovered" — per-element option in Visibility to hide any UI element unless the cursor is over it (requires HUD locked).
# 1.0.8.17
- **Controller Hotbars**: Add 8 cross bars (L2/R2 style) separate from normal hotbars 1-8. Controller bar slot data stored in config (not game StandardHotbars) so layouts can differ per mode. Drag-and-drop on controller bars: from game, shift+drag rearrange, release outside to clear. Independent keybinds with modifier+trigger combinations (e.g. L2+South). Optional sync bar mode with game client (Character Config Mouse/Gamepad toggle). Clone/copy actions: normal hotbars ↔ controller bars. Restore controller bar layout button.
# 1.0.8.16
- **HUD Options**: "Show HUD during dialogue and interaction" — when enabled, hotbars and the rest of HSUI stay visible when talking to NPCs or interacting with objects (default on). When disabled, only the castbar is shown during dialogue after a short delay.
# 1.0.8.15
- **Tooltips**: Game-style formatting with section labels, tail alignment, and config options. TooltipSegment and colored formatting (section labels green, status names yellow). Sections: Additional Effect, Duration, Maximum Charges, Blood Gauge Cost, Combo, role labels. Tail text left-aligned on own line; section values stay on same line as labels. Config: Use Game-style formatting, Section/Status/Secondary colors, Tooltip Max Width, Line Spacing, Font Scale, Icon Scale, Height Buffer slider.
# 1.0.8.14
- **Mouse GCD Indicator**: New HUD element (Other Elements → Mouse GCD Indicator) — circular GCD ring drawn around the cursor. Configurable radius, thickness, colors, queue indicator, and cursor center offset so the ring aligns with the cursor graphic.
# 1.0.8.13
- **Hotbars**: Fixed item tooltips not showing — use TryGetRow for Item sheet and base item ID so tooltip no longer fails for some items.
# 1.0.8.12
- **Hotbars**: Fixed item icons not drawing on hotbar — game encodes HQ items as iconId + 1000000; now use iconId % 1000000 and itemHq flag so item icons (including HQ) display correctly.
# 1.0.8.11
- **Hotbars**: Fixed tooltip crash — Lumina GetRow can throw for invalid/transitional row IDs (e.g. during inventory drag-drop); GetSlotTooltip now catches and returns empty instead of crashing.
# 1.0.8.10
- **Hotbars**: Fixed crash when dragging items from inventory to hotbar — GetFromGameIcon can throw for invalid/unsupported icon IDs; now handled gracefully.
- **Build**: Release builds no longer emit PDBs to avoid local path leakage in user crash logs.
# 1.0.8.9
- **Hotbars**: Gearset on slot now persists — do not treat slot as empty when CommandType is GearSet (gearset index 0 uses CommandId 0). Use CommandType/CommandId for GearSet display and resolve icon when IconId is still 0.
# 1.0.8.8
- **Hotbars**: Only refresh icon via LoadIconId() for GearSet slots so drag-and-drop of gearsets onto the bar works again.
- **Hotbars**: Allow gearset index 0 (top-most gearset in list) — drop validation and icon lookup now accept id 0 for GearSet type.
# 1.0.8.7
- **Hotbars**: Fixed Gearset/Job Gear Set icon clearing when the first equipment slot in the gearset changes — call LoadIconId() before reading slot IconId so the game populates the icon from the gearset (e.g. job icon).
# 1.0.8.6
- **Hotbars**: Fixed crafting action tooltips showing the action name instead of the full description — use CraftAction.Description directly instead of ActionTransient, which returns the name for crafting actions.
# 1.0.8.5
- **Hotbars**: Fixed other HSUI elements disappearing when hovering over hotbar icons — overlay is now a child of the main HUD window instead of a separate window.
# 1.0.8.4
- **Alliance Frames**: Fixed frames 1 and 2 not showing in alliance raids — populate other alliances via flat GetAllianceMemberByIndex (indices 07, 815) 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 slots 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 # 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. - **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 -24
View File
@@ -1,24 +1 @@
[ [{"Author":"Knack117","Name":"HSUI","Punchline":"A modern HUD replacement built for customization.","Description":"HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.","Changelog":"1.0.8.18: Visibility \"Hide unless hovered\" option. 1.0.8.17: Controller hotbars (cross layout, separate storage, sync with game). 1.0.8.16: Show HUD during dialogue and interaction. 1.0.8.15: Tooltips game-style formatting. 1.0.8.14: Mouse GCD Indicator. 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. 1.0.8.10: Hotbar crash fix when dragging inventory items. 1.0.8.9: Gearset persists on slot. 1.0.8.8: Gearset drag-drop fix. 1.0.8.7: Fixed Gearset icon clearing. 1.0.8.6: Crafting action tooltips full description. 1.0.8.4: Alliance Frames 1 and 2 fix; 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.18","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.18/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.18/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.18/latest.zip","LastUpdate":"1762238400"}]
{
"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": "World Object Tooltip: hover over players/NPCs/objects for name, level, HP, job, FC tag, distance; optional detach-from-cursor. PvP nameplates: GC icons, Role/Job icon. Main Actions tooltips. Alliance frame fixes.",
"InternalName": "HSUI",
"AssemblyVersion": "1.0.5.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.5.0/latest.zip",
"IsHide": false,
"IsTestingExclusive": false,
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.5.0/latest.zip",
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.5.0/latest.zip",
"LastUpdate": "1738368000"
}
]