Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 KnackAtNite
|
5ffbdd0b51 | ||
|
KnackAtNite
|
280004bdb0 | ||
|
KnackAtNite
|
d8da154e72 | ||
|
KnackAtNite
|
db6e91afd1 | ||
|
KnackAtNite
|
01426d3c30 |
+3
-3
@@ -9,9 +9,9 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<AssemblyName>HSUI</AssemblyName>
|
||||
<AssemblyVersion>1.0.8.5</AssemblyVersion>
|
||||
<FileVersion>1.0.8.5</FileVersion>
|
||||
<InformationalVersion>1.0.8.5</InformationalVersion>
|
||||
<AssemblyVersion>1.0.8.9</AssemblyVersion>
|
||||
<FileVersion>1.0.8.9</FileVersion>
|
||||
<InformationalVersion>1.0.8.9</InformationalVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"Author": "Knack117",
|
||||
"Name": "HSUI",
|
||||
"InternalName": "HSUI",
|
||||
"AssemblyVersion": "1.0.8.5",
|
||||
"AssemblyVersion": "1.0.8.9",
|
||||
"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",
|
||||
"RepoUrl": "https://github.com/Knack117/HSUI",
|
||||
|
||||
@@ -116,16 +116,35 @@ namespace HSUI.Helpers
|
||||
continue;
|
||||
}
|
||||
|
||||
if (slot->IsEmpty)
|
||||
// GearSet with id 0 is valid (first gearset); the game's IsEmpty (CommandId == 0) would wrongly treat it as empty.
|
||||
bool isEmpty = slot->IsEmpty && slot->CommandType != RaptureHotbarModule.HotbarSlotType.GearSet;
|
||||
if (isEmpty)
|
||||
{
|
||||
list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
|
||||
continue;
|
||||
}
|
||||
|
||||
bool usable = slot->IsSlotUsable(slot->ApparentSlotType, slot->ApparentActionId);
|
||||
// Use CommandType/CommandId for GearSet so we handle gearset 0 and slots not yet synced to Apparent*.
|
||||
var slotType = slot->CommandType == RaptureHotbarModule.HotbarSlotType.GearSet
|
||||
? RaptureHotbarModule.HotbarSlotType.GearSet
|
||||
: slot->ApparentSlotType;
|
||||
uint actionId = slot->CommandType == RaptureHotbarModule.HotbarSlotType.GearSet
|
||||
? slot->CommandId
|
||||
: slot->ApparentActionId;
|
||||
|
||||
// For GearSet slots, refresh IconId from the gearset (e.g. job icon from first equipment slot).
|
||||
if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet)
|
||||
slot->LoadIconId();
|
||||
|
||||
bool usable = slot->IsSlotUsable(slotType, actionId);
|
||||
uint iconId = slot->IconId;
|
||||
uint actionId = slot->ApparentActionId;
|
||||
var slotType = slot->ApparentSlotType;
|
||||
// GearSet 0 or just-dropped: game may not have synced Apparent* so IconId can be 0; resolve for display.
|
||||
if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet && iconId == 0)
|
||||
{
|
||||
int resolved = slot->GetIconIdForSlot(slotType, actionId);
|
||||
if (resolved > 0)
|
||||
iconId = (uint)resolved;
|
||||
}
|
||||
|
||||
(int pct, int secsLeft) = GetSlotCooldown(slot);
|
||||
(int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
|
||||
|
||||
@@ -602,7 +602,7 @@ namespace HSUI.Interface.GeneralElements
|
||||
if (ImGui.IsMouseReleased(ImGuiMouseButton.Left))
|
||||
{
|
||||
int releaseIdx = GetSlotIndexAtPosition(topLeft, barSize, slotSize, pad, Config.SlotCount, Config.GetLayoutGrid().Cols, mp, debug);
|
||||
if (releaseIdx >= 0 && slotType != RaptureHotbarModule.HotbarSlotType.Empty && (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro))
|
||||
if (releaseIdx >= 0 && slotType != RaptureHotbarModule.HotbarSlotType.Empty && (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet))
|
||||
{
|
||||
if (!ImGui.GetIO().KeyShift)
|
||||
{
|
||||
@@ -701,7 +701,7 @@ namespace HSUI.Interface.GeneralElements
|
||||
// stale (e.g. from macro menu UI), causing wrong placements (macro drag -> GeneralAction placed).
|
||||
// If we never got valid payload (e.g. Macro Int2=0), skip the place.
|
||||
bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty &&
|
||||
(id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro);
|
||||
(id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet);
|
||||
|
||||
if (hasValidPayload)
|
||||
{
|
||||
@@ -1092,7 +1092,9 @@ namespace HSUI.Interface.GeneralElements
|
||||
|
||||
private static unsafe uint GetIconIdForPayload(RaptureHotbarModule.HotbarSlotType slotType, uint id)
|
||||
{
|
||||
if (id == 0) return 0;
|
||||
// id 0 is valid for GearSet (first gearset in list) and Macro; don't short-circuit for those
|
||||
if (id == 0 && slotType != RaptureHotbarModule.HotbarSlotType.GearSet && slotType != RaptureHotbarModule.HotbarSlotType.Macro)
|
||||
return 0;
|
||||
if (slotType == RaptureHotbarModule.HotbarSlotType.Macro)
|
||||
{
|
||||
var macroModule = RaptureMacroModule.Instance();
|
||||
@@ -1196,21 +1198,63 @@ namespace HSUI.Interface.GeneralElements
|
||||
LuminaAction? actionRow = null;
|
||||
|
||||
var actionSheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
|
||||
var actionRowOpt = actionSheet?.GetRow(slot.ActionId);
|
||||
if (actionRowOpt.HasValue)
|
||||
if (actionSheet != null)
|
||||
{
|
||||
actionRow = actionRowOpt.Value;
|
||||
}
|
||||
else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
|
||||
{
|
||||
// Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
|
||||
const uint CraftActionToActionOffset = 100000;
|
||||
uint mappedId = slot.ActionId + CraftActionToActionOffset;
|
||||
var mappedRow = actionSheet?.GetRow(mappedId);
|
||||
if (mappedRow.HasValue)
|
||||
if (actionSheet.TryGetRow(slot.ActionId, out var actionRowOpt))
|
||||
{
|
||||
actionIdForLookup = mappedId;
|
||||
actionRow = mappedRow.Value;
|
||||
actionRow = actionRowOpt;
|
||||
}
|
||||
else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
|
||||
{
|
||||
// Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
|
||||
const uint CraftActionToActionOffset = 100000;
|
||||
uint mappedId = slot.ActionId + CraftActionToActionOffset;
|
||||
if (actionSheet.TryGetRow(mappedId, out var mappedRow))
|
||||
{
|
||||
actionIdForLookup = mappedId;
|
||||
actionRow = mappedRow;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// CraftAction fallback: when Action sheet lookup failed, try CraftAction sheet directly (hotbar stores CraftAction row ID).
|
||||
if (!actionRow.HasValue && slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
|
||||
{
|
||||
var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
|
||||
if (craftSheet != null && craftSheet.TryGetRow(slot.ActionId, out var craftRow))
|
||||
{
|
||||
try
|
||||
{
|
||||
var nameSe = craftRow.Name;
|
||||
string name = nameSe.ToString();
|
||||
if (string.IsNullOrWhiteSpace(name))
|
||||
name = nameSe.ToDalamudString().ToString();
|
||||
if (!string.IsNullOrWhiteSpace(name))
|
||||
{
|
||||
// CraftAction sheet has its own Description column with the full text
|
||||
string desc = "";
|
||||
try
|
||||
{
|
||||
var descSe = craftRow.Description;
|
||||
var descRaw = descSe.ToDalamudString().ToString();
|
||||
if (!string.IsNullOrEmpty(descRaw))
|
||||
{
|
||||
try
|
||||
{
|
||||
var evaluated = Plugin.SeStringEvaluator.Evaluate(descSe.AsSpan());
|
||||
desc = evaluated.ExtractText();
|
||||
if (string.IsNullOrEmpty(desc)) desc = descRaw;
|
||||
}
|
||||
catch { desc = descRaw; }
|
||||
if (!string.IsNullOrEmpty(desc))
|
||||
desc = EncryptedStringsHelper.GetString(desc);
|
||||
}
|
||||
}
|
||||
catch { /* ignore */ }
|
||||
return (name, desc);
|
||||
}
|
||||
}
|
||||
catch { /* ignore */ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1219,28 +1263,57 @@ namespace HSUI.Interface.GeneralElements
|
||||
{
|
||||
string name = row.Value.Name.ToString();
|
||||
string desc = "";
|
||||
var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(actionIdForLookup);
|
||||
string descRaw = "";
|
||||
if (descRow.HasValue)
|
||||
// For CraftAction, use CraftAction.Description; ActionTransient returns the name instead of the full description
|
||||
if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
|
||||
{
|
||||
try
|
||||
var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
|
||||
if (craftSheet != null && craftSheet.TryGetRow(actionIdForLookup, out var craftRow))
|
||||
{
|
||||
var descSeStr = descRow.Value.Description;
|
||||
descRaw = descRow.Value.Description.ToDalamudString().ToString();
|
||||
try
|
||||
{
|
||||
var evaluated = Plugin.SeStringEvaluator.Evaluate(descSeStr.AsSpan());
|
||||
desc = evaluated.ExtractText();
|
||||
if (string.IsNullOrEmpty(desc)) desc = descRaw;
|
||||
var descSe = craftRow.Description;
|
||||
var craftDescRaw = descSe.ToDalamudString().ToString();
|
||||
if (!string.IsNullOrEmpty(craftDescRaw))
|
||||
{
|
||||
try
|
||||
{
|
||||
var evaluated = Plugin.SeStringEvaluator.Evaluate(descSe.AsSpan());
|
||||
desc = evaluated.ExtractText();
|
||||
if (string.IsNullOrEmpty(desc)) desc = craftDescRaw;
|
||||
}
|
||||
catch { desc = craftDescRaw; }
|
||||
if (!string.IsNullOrEmpty(desc))
|
||||
desc = EncryptedStringsHelper.GetString(desc);
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
desc = descRaw;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(desc))
|
||||
desc = EncryptedStringsHelper.GetString(desc);
|
||||
catch { /* ignore */ }
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var descSheet = Plugin.DataManager.GetExcelSheet<ActionTransient>();
|
||||
if (descSheet != null && descSheet.TryGetRow(actionIdForLookup, out var descRow))
|
||||
{
|
||||
try
|
||||
{
|
||||
var descSeStr = descRow.Description;
|
||||
descRaw = descRow.Description.ToDalamudString().ToString();
|
||||
try
|
||||
{
|
||||
var evaluated = Plugin.SeStringEvaluator.Evaluate(descSeStr.AsSpan());
|
||||
desc = evaluated.ExtractText();
|
||||
if (string.IsNullOrEmpty(desc)) desc = descRaw;
|
||||
}
|
||||
catch
|
||||
{
|
||||
desc = descRaw;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(desc))
|
||||
desc = EncryptedStringsHelper.GetString(desc);
|
||||
}
|
||||
catch { /* ignore */ }
|
||||
}
|
||||
catch { /* ignore */ }
|
||||
}
|
||||
bool isCombatAction = IsCombatAction(slot.SlotType, row.Value);
|
||||
int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null;
|
||||
|
||||
@@ -1,3 +1,16 @@
|
||||
# 1.0.8.9
|
||||
- **Hotbars**: Gearset on slot now persists — do not treat slot as empty when CommandType is GearSet (gearset index 0 uses CommandId 0). Use CommandType/CommandId for GearSet display and resolve icon when IconId is still 0.
|
||||
|
||||
# 1.0.8.8
|
||||
- **Hotbars**: Only refresh icon via LoadIconId() for GearSet slots so drag-and-drop of gearsets onto the bar works again.
|
||||
- **Hotbars**: Allow gearset index 0 (top-most gearset in list) — drop validation and icon lookup now accept id 0 for GearSet type.
|
||||
|
||||
# 1.0.8.7
|
||||
- **Hotbars**: Fixed Gearset/Job Gear Set icon clearing when the first equipment slot in the gearset changes — call LoadIconId() before reading slot IconId so the game populates the icon from the gearset (e.g. job icon).
|
||||
|
||||
# 1.0.8.6
|
||||
- **Hotbars**: Fixed crafting action tooltips showing the action name instead of the full description — use CraftAction.Description directly instead of ActionTransient, which returns the name for crafting actions.
|
||||
|
||||
# 1.0.8.5
|
||||
- **Hotbars**: Fixed other HSUI elements disappearing when hovering over hotbar icons — overlay is now a child of the main HUD window instead of a separate window.
|
||||
|
||||
|
||||
+1
-24
@@ -1,24 +1 @@
|
||||
[
|
||||
{
|
||||
"Author": "Knack117",
|
||||
"Name": "HSUI",
|
||||
"Punchline": "A modern HUD replacement built for customization.",
|
||||
"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.",
|
||||
"Changelog": "1.0.8.2: Charge icons stay lit until all charges spent. 1.0.8.1: Do not grey out action icons until all charges spent.",
|
||||
"InternalName": "HSUI",
|
||||
"AssemblyVersion": "1.0.8.2",
|
||||
"RepoUrl": "https://github.com/Knack117/HSUI",
|
||||
"ApplicableVersion": "any",
|
||||
"Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
|
||||
"CategoryTags": ["UI"],
|
||||
"DalamudApiLevel": 14,
|
||||
"IconUrl": "https://raw.githubusercontent.com/Knack117/HSUI/main/Media/Images/icon.png",
|
||||
"ImageUrls": [],
|
||||
"DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
|
||||
"IsHide": false,
|
||||
"IsTestingExclusive": false,
|
||||
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
|
||||
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
|
||||
"LastUpdate": "1770007214"
|
||||
}
|
||||
]
|
||||
[{"Author":"Knack117","Name":"HSUI","Punchline":"A modern HUD replacement built for customization.","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.","Changelog":"1.0.8.9: Gearset persists on slot (fix CommandId 0 treated as empty). 1.0.8.8: Gearset drag-drop fix; allow first gearset (index 0) on bar. 1.0.8.7: Fixed Gearset/Job Gear Set icon clearing when first equipment slot changes. 1.0.8.6: Crafting action tooltips now show full description instead of action name. 1.0.8.4: Alliance Frames 1 and 2 fix in raids; crafting action tooltips; Hide in duty no longer hides alliance frames. 1.0.8.3: Fix left-click staying broken after disable. 1.0.8.2: Charge icons stay lit until all charges spent.","InternalName":"HSUI","AssemblyVersion":"1.0.8.9","RepoUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI","ApplicableVersion":"any","Tags":["UI","HUD","Unit Frames","Nameplates","Party Frames","Hotbars"],"CategoryTags":["UI"],"DalamudApiLevel":14,"IconUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/raw/branch/main/Media/Images/icon.png","ImageUrls":[],"DownloadLinkInstall":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.9/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.9/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.9/latest.zip","LastUpdate":"1739318400"}]
|
||||
|
||||
Reference in New Issue
Block a user