Alliance frames, crafting tooltips, visibility: fix display and tooltips

- Alliance Frames: Populate other alliances (A/B) via GetAllianceMemberByIndex flat indices (0-7, 8-15) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance; keep own party from GetPartyMemberByIndex.
- Alliance Frames: Visibility: do not apply HideInDuty to Alliance Frames so they show in alliance raids when visibility rules are enabled.
- Hotbars: Crafting action tooltips: fallback Action sheet lookup with +100000 offset when hotbar stores CraftAction row ID.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-02-07 22:34:10 -05:00
parent 57d1bc5c0f
commit 3b5ddbe2f9
3 changed files with 63 additions and 28 deletions
+34 -25
View File
@@ -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);