From c49d22d8679db2c30702776ac31919dd47ffd375 Mon Sep 17 00:00:00 2001 From: Knack117 Date: Tue, 3 Feb 2026 22:51:37 -0500 Subject: [PATCH] Action bars: use GetAdjustedActionId for Action slot display (combo/HSRCombos) Co-authored-by: Cursor --- Helpers/ActionBarsManager.cs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Helpers/ActionBarsManager.cs b/Helpers/ActionBarsManager.cs index 0334975..d87a187 100644 --- a/Helpers/ActionBarsManager.cs +++ b/Helpers/ActionBarsManager.cs @@ -127,6 +127,23 @@ namespace HSUI.Helpers uint actionId = slot->ApparentActionId; var slotType = slot->ApparentSlotType; + // Resolve adjusted action for Action type (combo/continuation replacement, e.g. HSRCombos / XIVCombo) + // so HSUI bars show the correct icon and action for the current combo step. + if (slotType == RaptureHotbarModule.HotbarSlotType.Action && actionId != 0) + { + var actionManager = Instance(); + if (actionManager != null) + { + uint effectiveId = actionManager->GetAdjustedActionId(actionId); + if (effectiveId != actionId) + { + actionId = effectiveId; + // Use effective action id as icon (matches most actions); tooltip path will resolve correct icon by ActionId + iconId = effectiveId; + } + } + } + (int pct, int secsLeft) = GetSlotCooldown(slot); (int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId); list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));