Don't grey out action icons until all charges are spent

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-02-07 01:24:04 -05:00
parent 11e30309c4
commit eba2a33649
+3 -17
View File
@@ -127,25 +127,11 @@ 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);
// For charge-based actions, don't grey out the icon until all charges are spent
if (maxCharges > 1 && currentCharges > 0)
usable = true;
list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
}