Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 11e30309c4 | |||
| c49d22d867 |
+3
-3
@@ -9,9 +9,9 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyName>HSUI</AssemblyName>
|
<AssemblyName>HSUI</AssemblyName>
|
||||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
<AssemblyVersion>1.0.8.1</AssemblyVersion>
|
||||||
<FileVersion>1.0.8.0</FileVersion>
|
<FileVersion>1.0.8.1</FileVersion>
|
||||||
<InformationalVersion>1.0.8.0</InformationalVersion>
|
<InformationalVersion>1.0.8.1</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"Author": "Knack117",
|
"Author": "Knack117",
|
||||||
"Name": "HSUI",
|
"Name": "HSUI",
|
||||||
"InternalName": "HSUI",
|
"InternalName": "HSUI",
|
||||||
"AssemblyVersion": "1.0.8.0",
|
"AssemblyVersion": "1.0.8.1",
|
||||||
"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",
|
||||||
|
|||||||
@@ -127,6 +127,23 @@ namespace HSUI.Helpers
|
|||||||
uint actionId = slot->ApparentActionId;
|
uint actionId = slot->ApparentActionId;
|
||||||
var slotType = slot->ApparentSlotType;
|
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 pct, int secsLeft) = GetSlotCooldown(slot);
|
||||||
(int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
|
(int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
|
||||||
list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
|
list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
|
||||||
|
|||||||
Reference in New Issue
Block a user