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
parent 78b37a3f15
commit c49d22d867
1 changed files with 17 additions and 0 deletions
@@ -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));