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>
This commit is contained in:
@@ -13,6 +13,14 @@ using System.Text;
|
||||
|
||||
namespace HSUI.Helpers
|
||||
{
|
||||
/// <summary>When showing an ID in the tooltip title, use Action for action IDs or Status for status effect IDs.</summary>
|
||||
public enum TooltipIdKind
|
||||
{
|
||||
None = 0,
|
||||
Action = 1,
|
||||
Status = 2,
|
||||
}
|
||||
|
||||
public class TooltipsHelper : IDisposable
|
||||
{
|
||||
#region Singleton
|
||||
@@ -65,12 +73,12 @@ namespace HSUI.Helpers
|
||||
|
||||
private const float IconSize = 24f;
|
||||
|
||||
public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null)
|
||||
public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None)
|
||||
{
|
||||
ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId);
|
||||
ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId, idKind);
|
||||
}
|
||||
|
||||
public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null)
|
||||
public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None)
|
||||
{
|
||||
if (text == null)
|
||||
{
|
||||
@@ -99,7 +107,11 @@ namespace HSUI.Helpers
|
||||
_currentTooltipTitle += $" ({name})";
|
||||
}
|
||||
|
||||
if (_config.ShowStatusIDs)
|
||||
bool showId = id != 0 && (
|
||||
(idKind == TooltipIdKind.Action && _config.ShowActionIDs) ||
|
||||
(idKind == TooltipIdKind.Status && _config.ShowStatusIDs) ||
|
||||
(idKind == TooltipIdKind.None && _config.ShowStatusIDs));
|
||||
if (showId)
|
||||
{
|
||||
_currentTooltipTitle += " (ID: " + id + ")";
|
||||
}
|
||||
@@ -407,6 +419,10 @@ namespace HSUI.Helpers
|
||||
[Order(7)]
|
||||
public bool ShowStatusIDs = false;
|
||||
|
||||
[Checkbox("Show Action ID", help = "Show action ID in hotbar and action tooltips.")]
|
||||
[Order(8)]
|
||||
public bool ShowActionIDs = false;
|
||||
|
||||
[Checkbox("Show Source Name")]
|
||||
[Order(10)]
|
||||
public bool ShowSourceName = false;
|
||||
|
||||
Reference in New Issue
Block a user