Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 KnackAtNite
|
9391ef1451 | ||
|
KnackAtNite
|
3b5ddbe2f9 |
+3
-3
@@ -9,9 +9,9 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<AssemblyName>HSUI</AssemblyName>
|
||||
<AssemblyVersion>1.0.8.3</AssemblyVersion>
|
||||
<FileVersion>1.0.8.3</FileVersion>
|
||||
<InformationalVersion>1.0.8.3</InformationalVersion>
|
||||
<AssemblyVersion>1.0.8.4</AssemblyVersion>
|
||||
<FileVersion>1.0.8.4</FileVersion>
|
||||
<InformationalVersion>1.0.8.4</InformationalVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"Author": "Knack117",
|
||||
"Name": "HSUI",
|
||||
"InternalName": "HSUI",
|
||||
"AssemblyVersion": "1.0.8.3",
|
||||
"AssemblyVersion": "1.0.8.4",
|
||||
"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",
|
||||
|
||||
@@ -1194,12 +1194,34 @@ namespace HSUI.Interface.GeneralElements
|
||||
slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
|
||||
slot.SlotType == RaptureHotbarModule.HotbarSlotType.PetAction)
|
||||
{
|
||||
var row = Plugin.DataManager.GetExcelSheet<LuminaAction>()?.GetRow(slot.ActionId);
|
||||
uint actionIdForLookup = slot.ActionId;
|
||||
LuminaAction? actionRow = null;
|
||||
|
||||
var actionSheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
|
||||
var actionRowOpt = actionSheet?.GetRow(slot.ActionId);
|
||||
if (actionRowOpt.HasValue)
|
||||
{
|
||||
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)
|
||||
{
|
||||
actionIdForLookup = mappedId;
|
||||
actionRow = mappedRow.Value;
|
||||
}
|
||||
}
|
||||
|
||||
var row = actionRow;
|
||||
if (row.HasValue)
|
||||
{
|
||||
string name = row.Value.Name.ToString();
|
||||
string desc = "";
|
||||
var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(slot.ActionId);
|
||||
var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(actionIdForLookup);
|
||||
string descRaw = "";
|
||||
if (descRow.HasValue)
|
||||
{
|
||||
|
||||
@@ -96,6 +96,9 @@ namespace HSUI.Interface
|
||||
if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; }
|
||||
if (element != null && !element.GetConfig().Enabled) { return false; }
|
||||
|
||||
// Alliance frames only matter in alliance raids (duty). HideInDuty would hide them exactly when needed.
|
||||
bool isAllianceFrames = element != null && element.GetType() == typeof(AllianceFramesHud);
|
||||
|
||||
bool isInIslandSanctuary = IsInIslandSanctuary();
|
||||
bool isInDuty = IsInDuty() && !isInIslandSanctuary;
|
||||
IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer;
|
||||
@@ -127,7 +130,8 @@ namespace HSUI.Interface
|
||||
|
||||
if (HideOnFullHP && player != null && player.CurrentHp == player.MaxHp) { return false; }
|
||||
|
||||
if (HideInDuty && isInDuty) { return false; }
|
||||
// Alliance frames only matter in alliance raids (duty). Skip HideInDuty for them.
|
||||
if (HideInDuty && isInDuty && !isAllianceFrames) { return false; }
|
||||
|
||||
if (HideInIslandSanctuary && isInIslandSanctuary) { return false; }
|
||||
|
||||
|
||||
@@ -280,34 +280,18 @@ namespace HSUI.Interface.Party
|
||||
bool anyChanged = false;
|
||||
ref var mainGroup = ref gm->MainGroup;
|
||||
|
||||
// GroupManager layout: _allianceMembers flat array (indices 0-19) has groups 0 and 1.
|
||||
// Group 2 (our party) is stored in _partyMembers. GetAllianceMemberByGroupAndIndex(0/1, slot)
|
||||
// returns empty in-instance for some game versions; use GetAllianceMemberByIndex with flat
|
||||
// indices: group 0 = indices 0-7, group 1 = indices 8-15.
|
||||
for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++)
|
||||
{
|
||||
int count = 0;
|
||||
var list = new List<IPartyFramesMember>();
|
||||
|
||||
for (int slot = 0; slot < 8; slot++)
|
||||
{
|
||||
var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
|
||||
if (pm == null || pm->EntityId == 0) continue;
|
||||
var pfMember = new PartyFramesMember(
|
||||
pm->EntityId,
|
||||
count,
|
||||
count,
|
||||
EnmityLevel.Last,
|
||||
PartyMemberStatus.None,
|
||||
ReadyCheckStatus.None,
|
||||
false,
|
||||
false
|
||||
);
|
||||
pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
|
||||
list.Add(pfMember);
|
||||
count++;
|
||||
}
|
||||
|
||||
// GroupManager stores our party in _partyMembers, not GetAllianceMemberByGroupAndIndex.
|
||||
// When group 2 is empty, it's our alliance—populate from GetPartyMemberByIndex.
|
||||
if (count == 0 && allianceIdx == 2)
|
||||
if (allianceIdx == 2)
|
||||
{
|
||||
// Our party: _partyMembers via GetPartyMemberByIndex
|
||||
for (int slot = 0; slot < 8; slot++)
|
||||
{
|
||||
var pm = mainGroup.GetPartyMemberByIndex(slot);
|
||||
@@ -327,6 +311,29 @@ namespace HSUI.Interface.Party
|
||||
count++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Other alliances: _allianceMembers flat indices. Group 0 = 0-7, group 1 = 8-15.
|
||||
int baseIdx = allianceIdx * 8;
|
||||
for (int slot = 0; slot < 8; slot++)
|
||||
{
|
||||
var pm = mainGroup.GetAllianceMemberByIndex(baseIdx + slot);
|
||||
if (pm == null || pm->EntityId == 0) continue;
|
||||
var pfMember = new PartyFramesMember(
|
||||
pm->EntityId,
|
||||
count,
|
||||
count,
|
||||
EnmityLevel.Last,
|
||||
PartyMemberStatus.None,
|
||||
ReadyCheckStatus.None,
|
||||
false,
|
||||
false
|
||||
);
|
||||
pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
|
||||
list.Add(pfMember);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
||||
if (count != _lastMemberCounts[allianceIdx])
|
||||
{
|
||||
@@ -340,9 +347,11 @@ namespace HSUI.Interface.Party
|
||||
int ourIdx = 0;
|
||||
for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
|
||||
{
|
||||
PartyMember* pm = allianceIdx == 2
|
||||
? mainGroup.GetPartyMemberByIndex(slot)
|
||||
: mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
|
||||
PartyMember* pm;
|
||||
if (allianceIdx == 2)
|
||||
pm = mainGroup.GetPartyMemberByIndex(slot);
|
||||
else
|
||||
pm = mainGroup.GetAllianceMemberByIndex(allianceIdx * 8 + slot);
|
||||
if (pm == null || pm->EntityId == 0) continue;
|
||||
if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember)
|
||||
pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
# 1.0.8.4
|
||||
- **Alliance Frames**: Fixed frames 1 and 2 not showing in alliance raids — populate other alliances via flat GetAllianceMemberByIndex (indices 0–7, 8–15) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance.
|
||||
- **Alliance Frames**: Visibility "Hide in duty" no longer hides alliance frames (they are only relevant in duty).
|
||||
- **Hotbars**: Crafting job action tooltips now display — fallback Action sheet lookup when hotbar stores CraftAction row ID.
|
||||
|
||||
# 1.0.8.3
|
||||
- **Fix**: Left-click no longer sometimes stays broken after disabling HSUI. WndProc is restored at the very start of plugin teardown so the game window gets normal input back even if disposal fails later.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user