Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 048f6451c8 | |||
| d30f42d4c8 | |||
| 80f45f5a31 |
+3
-3
@@ -9,9 +9,9 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<AssemblyName>HSUI</AssemblyName>
|
||||
<AssemblyVersion>1.0.3.0</AssemblyVersion>
|
||||
<FileVersion>1.0.3.0</FileVersion>
|
||||
<InformationalVersion>1.0.3.0</InformationalVersion>
|
||||
<AssemblyVersion>1.0.5.0</AssemblyVersion>
|
||||
<FileVersion>1.0.5.0</FileVersion>
|
||||
<InformationalVersion>1.0.5.0</InformationalVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"Author": "Knack117",
|
||||
"Name": "HSUI",
|
||||
"InternalName": "HSUI",
|
||||
"AssemblyVersion": "1.0.3.0",
|
||||
"AssemblyVersion": "1.0.5.0",
|
||||
"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",
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
using Dalamud.Game.ClientState.Objects.SubKinds;
|
||||
using Dalamud.Game.ClientState.Objects.Types;
|
||||
using Dalamud.Interface;
|
||||
using Dalamud.Interface.Utility;
|
||||
using HSUI.Config;
|
||||
@@ -6,6 +8,7 @@ using HSUI.Interface.GeneralElements;
|
||||
using Dalamud.Bindings.ImGui;
|
||||
using System;
|
||||
using System.Numerics;
|
||||
using System.Text;
|
||||
|
||||
namespace HSUI.Helpers
|
||||
{
|
||||
@@ -124,6 +127,109 @@ namespace HSUI.Helpers
|
||||
Plugin.Logger.Information($"[HSUI Tooltip DBG] ShowTooltip: title='{title}' textLen={text?.Length ?? 0} textPreview='{(text != null && text.Length > 80 ? text[..80] + "..." : text ?? "")}' pos=({_position.X:F0},{_position.Y:F0})");
|
||||
}
|
||||
|
||||
private WorldObjectTooltipConfig? _worldTooltipConfig;
|
||||
|
||||
/// <summary>
|
||||
/// Shows a tooltip for the game object the mouse is hovering over in the 3D world.
|
||||
/// Call this each frame before Draw().
|
||||
/// </summary>
|
||||
public void ShowWorldObjectTooltip()
|
||||
{
|
||||
try
|
||||
{
|
||||
_worldTooltipConfig ??= ConfigurationManager.Instance.GetConfigObject<WorldObjectTooltipConfig>();
|
||||
if (_worldTooltipConfig == null || !_worldTooltipConfig.Enabled)
|
||||
return;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Config not ready yet or not found - silently skip
|
||||
if (_config.DebugTooltips)
|
||||
Plugin.Logger.Warning($"[HSUI Tooltip] WorldObjectTooltipConfig not available: {ex.Message}");
|
||||
return;
|
||||
}
|
||||
|
||||
IGameObject? mouseOverTarget = Plugin.TargetManager.MouseOverTarget;
|
||||
if (mouseOverTarget == null)
|
||||
return;
|
||||
|
||||
// Don't show tooltip for ourselves
|
||||
if (mouseOverTarget.GameObjectId == Plugin.ObjectTable.LocalPlayer?.GameObjectId)
|
||||
return;
|
||||
|
||||
string name = mouseOverTarget.Name.ToString();
|
||||
if (string.IsNullOrEmpty(name))
|
||||
name = "Unknown";
|
||||
|
||||
var sb = new StringBuilder();
|
||||
|
||||
// Free Company tag for players
|
||||
if (_worldTooltipConfig.ShowTitle && mouseOverTarget is IPlayerCharacter player)
|
||||
{
|
||||
string fcTag = player.CompanyTag.ToString();
|
||||
if (!string.IsNullOrEmpty(fcTag))
|
||||
sb.AppendLine($"«{fcTag}»");
|
||||
}
|
||||
|
||||
// Level
|
||||
if (_worldTooltipConfig.ShowLevel && mouseOverTarget is ICharacter charLevel)
|
||||
{
|
||||
byte level = charLevel.Level;
|
||||
if (level > 0)
|
||||
sb.AppendLine($"Level {level}");
|
||||
}
|
||||
|
||||
// Job (for players)
|
||||
if (_worldTooltipConfig.ShowJob && mouseOverTarget is IPlayerCharacter playerJob)
|
||||
{
|
||||
uint jobId = playerJob.ClassJob.RowId;
|
||||
if (jobId > 0 && JobsHelper.JobNames.TryGetValue(jobId, out string? jobName))
|
||||
sb.AppendLine($"Job: {jobName}");
|
||||
}
|
||||
|
||||
// HP
|
||||
if (_worldTooltipConfig.ShowHP && mouseOverTarget is ICharacter charHp)
|
||||
{
|
||||
uint currentHp = charHp.CurrentHp;
|
||||
uint maxHp = charHp.MaxHp;
|
||||
if (maxHp > 0)
|
||||
{
|
||||
float pct = (float)currentHp / maxHp * 100f;
|
||||
sb.AppendLine($"HP: {currentHp:N0} / {maxHp:N0} ({pct:F0}%)");
|
||||
}
|
||||
}
|
||||
|
||||
// Distance
|
||||
if (_worldTooltipConfig.ShowDistance)
|
||||
{
|
||||
var localPlayer = Plugin.ObjectTable.LocalPlayer;
|
||||
if (localPlayer != null)
|
||||
{
|
||||
float dist = Vector3.Distance(localPlayer.Position, mouseOverTarget.Position);
|
||||
sb.AppendLine($"Distance: {dist:F1}y");
|
||||
}
|
||||
}
|
||||
|
||||
// Object ID (debug)
|
||||
if (_worldTooltipConfig.ShowObjectId)
|
||||
{
|
||||
sb.AppendLine($"ID: {mouseOverTarget.GameObjectId}");
|
||||
}
|
||||
|
||||
string body = sb.ToString().TrimEnd('\r', '\n');
|
||||
if (string.IsNullOrEmpty(body))
|
||||
body = "(No info)";
|
||||
|
||||
if (_worldTooltipConfig.DetachFromCursor)
|
||||
{
|
||||
ShowTooltip(body, _worldTooltipConfig.Position, name);
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowTooltipOnCursor(body, name);
|
||||
}
|
||||
}
|
||||
|
||||
public void RemoveTooltip()
|
||||
{
|
||||
_dataIsValid = false;
|
||||
@@ -305,4 +411,43 @@ namespace HSUI.Helpers
|
||||
Thickness = thickness;
|
||||
}
|
||||
}
|
||||
|
||||
[Section("Misc")]
|
||||
[SubSection("World Tooltip", 0)]
|
||||
public class WorldObjectTooltipConfig : PluginConfigObject
|
||||
{
|
||||
public new static WorldObjectTooltipConfig DefaultConfig() { return new WorldObjectTooltipConfig(); }
|
||||
|
||||
[Checkbox("Detach from Cursor", spacing = true)]
|
||||
[Order(1)]
|
||||
public bool DetachFromCursor = false;
|
||||
|
||||
[DragFloat2("Position (when detached)", min = -4000f, max = 4000f)]
|
||||
[Order(2, collapseWith = nameof(DetachFromCursor))]
|
||||
public Vector2 Position = new Vector2(100, 100);
|
||||
|
||||
[Checkbox("Show Level", spacing = true)]
|
||||
[Order(5)]
|
||||
public bool ShowLevel = true;
|
||||
|
||||
[Checkbox("Show HP")]
|
||||
[Order(10)]
|
||||
public bool ShowHP = true;
|
||||
|
||||
[Checkbox("Show Job (Players)")]
|
||||
[Order(15)]
|
||||
public bool ShowJob = true;
|
||||
|
||||
[Checkbox("Show FC Tag (Players)")]
|
||||
[Order(20)]
|
||||
public bool ShowTitle = false;
|
||||
|
||||
[Checkbox("Show Distance")]
|
||||
[Order(25)]
|
||||
public bool ShowDistance = true;
|
||||
|
||||
[Checkbox("Show Object ID")]
|
||||
[Order(30)]
|
||||
public bool ShowObjectId = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,6 +94,27 @@ namespace HSUI.Helpers
|
||||
return plateType >= 4 && plateType <= 11;
|
||||
}
|
||||
|
||||
/// <summary>Returns Grand Company icon ID (Maelstrom, Flames, or Adders) for enemy players in PvP Frontline.
|
||||
/// Nameplate color types 4, 5, 6 map to the three teams. Returns null when not a PvP enemy team (4–6).
|
||||
/// Use iconOverrides for custom IDs: [0]=team1(plate4), [1]=team2(plate5), [2]=team3(plate6). Non-zero overrides default.</summary>
|
||||
public static unsafe uint? GrandCompanyIconIdForPvPEnemy(IGameObject? obj, (int t1, int t2, int t3)? iconOverrides = null)
|
||||
{
|
||||
if (obj == null || !Plugin.ClientState.IsPvP) return null;
|
||||
StructsGameObject* gameObject = (StructsGameObject*)obj.Address;
|
||||
byte plateType = gameObject->GetNamePlateColorType();
|
||||
if (plateType < 4 || plateType > 6) return null;
|
||||
|
||||
// 62601=Maelstrom, 62602=Twin Adder, 62603=Immortal Flames
|
||||
uint iconId = plateType switch
|
||||
{
|
||||
4 => iconOverrides.HasValue && iconOverrides.Value.t1 > 0 ? (uint)iconOverrides.Value.t1 : 62601u,
|
||||
5 => iconOverrides.HasValue && iconOverrides.Value.t2 > 0 ? (uint)iconOverrides.Value.t2 : 62602u,
|
||||
6 => iconOverrides.HasValue && iconOverrides.Value.t3 > 0 ? (uint)iconOverrides.Value.t3 : 62603u,
|
||||
_ => 0
|
||||
};
|
||||
return iconId > 0 ? iconId : null;
|
||||
}
|
||||
|
||||
public static unsafe float ActorShieldValue(IGameObject? actor)
|
||||
{
|
||||
if (actor == null || actor is not ICharacter)
|
||||
|
||||
@@ -1327,6 +1327,34 @@ namespace HSUI.Interface.GeneralElements
|
||||
}
|
||||
}
|
||||
|
||||
if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.MainCommand ||
|
||||
slot.SlotType == RaptureHotbarModule.HotbarSlotType.ExtraCommand)
|
||||
{
|
||||
if (Plugin.DataManager.GetExcelSheet<MainCommand>()?.TryGetRow(slot.ActionId, out var mcRow) == true)
|
||||
{
|
||||
string name = mcRow.Name.ToString();
|
||||
string desc = "";
|
||||
try
|
||||
{
|
||||
string descRaw = mcRow.Description.ToDalamudString().ToString();
|
||||
if (!string.IsNullOrEmpty(descRaw))
|
||||
{
|
||||
try
|
||||
{
|
||||
var evaluated = Plugin.SeStringEvaluator.Evaluate(mcRow.Description.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 ?? "");
|
||||
}
|
||||
}
|
||||
|
||||
return (slot.SlotType.ToString(), "");
|
||||
}
|
||||
|
||||
|
||||
@@ -129,6 +129,29 @@ namespace HSUI.Interface.GeneralElements
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Shows Grand Company icon (Maelstrom, Flames, or Adders) on enemy player nameplates in PvP Frontline.</summary>
|
||||
public class NameplateCompanyIconConfig : NameplateIconConfig
|
||||
{
|
||||
[DragInt("Icon ID Team 1 (plateType 4)", min = 0, max = 999999)]
|
||||
[Order(19)]
|
||||
public int IconIdTeam1;
|
||||
|
||||
[DragInt("Icon ID Team 2 (plateType 5)", min = 0, max = 999999)]
|
||||
[Order(20)]
|
||||
public int IconIdTeam2;
|
||||
|
||||
[DragInt("Icon ID Team 3 (plateType 6)", min = 0, max = 999999)]
|
||||
[Order(21)]
|
||||
public int IconIdTeam3;
|
||||
|
||||
public NameplateCompanyIconConfig() : base() { }
|
||||
|
||||
public NameplateCompanyIconConfig(Vector2 position, Vector2 size, DrawAnchor anchor, DrawAnchor frameAnchor)
|
||||
: base(position, size, anchor, frameAnchor)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
public class NameplateRoleJobIconConfig : RoleJobIconConfig
|
||||
{
|
||||
public NameplateRoleJobIconConfig() : base() { }
|
||||
|
||||
@@ -522,6 +522,9 @@ namespace HSUI.Interface
|
||||
DraggablesHelper.DrawElements(origin, _hudHelper, _hudElements.Values, _jobHud, _selectedElement);
|
||||
}
|
||||
|
||||
// world object tooltip (mouseover in 3D world)
|
||||
TooltipsHelper.Instance.ShowWorldObjectTooltip();
|
||||
|
||||
// tooltip
|
||||
TooltipsHelper.Instance.Draw();
|
||||
|
||||
|
||||
@@ -550,6 +550,53 @@ namespace HSUI.Interface.Nameplates
|
||||
|
||||
}
|
||||
|
||||
// company icon (PvP Frontline: Maelstrom, Flames, Adders)
|
||||
var gcIconOverrides = (Config.CompanyIconConfig.IconIdTeam1, Config.CompanyIconConfig.IconIdTeam2, Config.CompanyIconConfig.IconIdTeam3);
|
||||
if (Config.CompanyIconConfig.Enabled && Utils.GrandCompanyIconIdForPvPEnemy(data.GameObject, gcIconOverrides) is uint gcIconId)
|
||||
{
|
||||
anchor = anchors.GetAnchor(Config.CompanyIconConfig.NameplateLabelAnchor, Config.CompanyIconConfig.PrioritizeHealthBarAnchor);
|
||||
anchor = anchor ?? new NameplateAnchor(data.ScreenPosition, Vector2.Zero);
|
||||
|
||||
var pos = Utils.GetAnchoredPosition(_config.Position + anchor.Value.Position, -anchor.Value.Size, Config.CompanyIconConfig.FrameAnchor);
|
||||
var iconPos = Utils.GetAnchoredPosition(pos + Config.CompanyIconConfig.Position, Config.CompanyIconConfig.Size, Config.CompanyIconConfig.Anchor);
|
||||
|
||||
drawActions.Add((Config.CompanyIconConfig.StrataLevel, () =>
|
||||
{
|
||||
DrawHelper.DrawInWindow(_config.ID + "_enemyCompanyIcon", iconPos, Config.CompanyIconConfig.Size, false, (drawList) =>
|
||||
{
|
||||
DrawHelper.DrawIcon(gcIconId, iconPos, Config.CompanyIconConfig.Size, false, alpha, drawList);
|
||||
});
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
// role/job icon (enemy players only; has ClassJob)
|
||||
if (Config.RoleIconConfig.Enabled && data.GameObject is IPlayerCharacter playerCharacter)
|
||||
{
|
||||
uint jobId = playerCharacter.ClassJob.RowId;
|
||||
uint iconId = Config.RoleIconConfig.UseRoleIcons
|
||||
? JobsHelper.RoleIconIDForJob(jobId, Config.RoleIconConfig.UseSpecificDPSRoleIcons)
|
||||
: JobsHelper.IconIDForJob(jobId, (uint)Config.RoleIconConfig.Style);
|
||||
|
||||
if (iconId > 0)
|
||||
{
|
||||
anchor = anchors.GetAnchor(Config.RoleIconConfig.NameplateLabelAnchor, Config.RoleIconConfig.PrioritizeHealthBarAnchor);
|
||||
anchor = anchor ?? new NameplateAnchor(data.ScreenPosition, Vector2.Zero);
|
||||
|
||||
var pos = Utils.GetAnchoredPosition(_config.Position + anchor.Value.Position, -anchor.Value.Size, Config.RoleIconConfig.FrameAnchor);
|
||||
var iconPos = Utils.GetAnchoredPosition(pos + Config.RoleIconConfig.Position, Config.RoleIconConfig.Size, Config.RoleIconConfig.Anchor);
|
||||
|
||||
drawActions.Add((Config.RoleIconConfig.StrataLevel, () =>
|
||||
{
|
||||
DrawHelper.DrawInWindow(_config.ID + "_enemyRoleJobIcon", iconPos, Config.RoleIconConfig.Size, false, (drawList) =>
|
||||
{
|
||||
DrawHelper.DrawIcon(iconId, iconPos, Config.RoleIconConfig.Size, false, alpha, drawList);
|
||||
});
|
||||
}
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
return drawActions;
|
||||
}
|
||||
|
||||
|
||||
@@ -45,6 +45,10 @@ namespace HSUI.Interface.GeneralElements
|
||||
[Order(21)]
|
||||
public bool AlwaysShowTargetNameplate = true;
|
||||
|
||||
[Checkbox("In PvP, show only enemy player nameplates", spacing = true, help = "When in Frontlines, Rival Wings, or Crystal Conflict, hide ally player nameplates (party, alliance, teammates) and show only enemy players. Uses Enemy nameplate styling for PvP enemies.")]
|
||||
[Order(22)]
|
||||
public bool PvPShowOnlyEnemyPlayers = false;
|
||||
|
||||
public int RaycastFlag() => OcclusionType == NameplatesOcclusionType.WallsAndObjects ? 0x2000 : 0x4000;
|
||||
}
|
||||
|
||||
@@ -490,6 +494,24 @@ namespace HSUI.Interface.GeneralElements
|
||||
)
|
||||
{ PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
|
||||
|
||||
[NestedConfig("Company Icon (PvP)", 46, collapsingHeader = false)]
|
||||
public NameplateCompanyIconConfig CompanyIconConfig = new NameplateCompanyIconConfig(
|
||||
new Vector2(-5, 0),
|
||||
new Vector2(24, 24),
|
||||
DrawAnchor.Right,
|
||||
DrawAnchor.Left
|
||||
)
|
||||
{ PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
|
||||
|
||||
[NestedConfig("Role/Job Icon (enemy players)", 47)]
|
||||
public NameplateRoleJobIconConfig RoleIconConfig = new NameplateRoleJobIconConfig(
|
||||
new Vector2(-35, 0),
|
||||
new Vector2(24, 24),
|
||||
DrawAnchor.Right,
|
||||
DrawAnchor.Left
|
||||
)
|
||||
{ PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
|
||||
|
||||
[NestedConfig("Debuffs", 50)]
|
||||
public EnemyNameplateStatusEffectsListConfig DebuffsConfig = null!;
|
||||
|
||||
|
||||
@@ -128,17 +128,34 @@ namespace HSUI.Interface.Nameplates
|
||||
return _playerHud;
|
||||
}
|
||||
|
||||
// In PvP, optionally show only enemy player nameplates (hide allies)
|
||||
if (Config.PvPShowOnlyEnemyPlayers && Plugin.ClientState.IsPvP)
|
||||
{
|
||||
if (data.GameObject is ICharacter character)
|
||||
{
|
||||
if ((character.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember
|
||||
if ((character.StatusFlags & StatusFlags.PartyMember) != 0 ||
|
||||
(character.StatusFlags & StatusFlags.AllianceMember) != 0 ||
|
||||
(character.StatusFlags & StatusFlags.Friend) != 0)
|
||||
{
|
||||
return null; // Hide party, alliance, and friend nameplates
|
||||
}
|
||||
}
|
||||
// Other players: show only hostile (enemy team), hide allies
|
||||
if (data.GameObject == null) { return null; }
|
||||
return Utils.IsHostile(data.GameObject) ? _enemyHud : null;
|
||||
}
|
||||
|
||||
if (data.GameObject is ICharacter character2)
|
||||
{
|
||||
if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember
|
||||
{
|
||||
return _partyMemberHud;
|
||||
}
|
||||
else if ((character.StatusFlags & StatusFlags.AllianceMember) != 0) // AllianceMember
|
||||
else if ((character2.StatusFlags & StatusFlags.AllianceMember) != 0) // AllianceMember
|
||||
{
|
||||
return _allianceMemberHud;
|
||||
}
|
||||
else if ((character.StatusFlags & StatusFlags.Friend) != 0) // Friend
|
||||
else if ((character2.StatusFlags & StatusFlags.Friend) != 0) // Friend
|
||||
{
|
||||
return _friendsHud;
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ namespace HSUI.Interface.Party
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>Gets the alliance letter (A/B/C) for an internal group index. Uses member EntityId matching to CrossRealm when GroupManager/CrossRealm use different orderings.</summary>
|
||||
/// <summary>Gets the alliance letter (A/B/C) for an internal group index. GroupManager ordering can differ from game display; use LocalPlayerGroupIndex to map when CrossRealm member data is unavailable.</summary>
|
||||
public bool TryGetAllianceLetter(int allianceIndex, out string letter)
|
||||
{
|
||||
letter = "";
|
||||
@@ -154,13 +154,27 @@ namespace HSUI.Interface.Party
|
||||
var info = InfoProxyCrossRealm.Instance();
|
||||
if (info != null && info->GroupCount >= 3)
|
||||
{
|
||||
// Get first member EntityId from our group (works for both GroupManager and CrossRealm data)
|
||||
// Check if CrossRealm has member data - when empty, we're in-instance using GroupManager (indices differ from InfoProxy)
|
||||
bool crossRealmHasData = false;
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
if (info->CrossRealmGroups[i].GroupMemberCount > 0)
|
||||
{
|
||||
crossRealmHasData = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (crossRealmHasData)
|
||||
{
|
||||
// CrossRealm populated: use EntityId lookup or direct lookup
|
||||
uint matchEntityId = 0;
|
||||
if (_allianceMembers[allianceIndex].Count > 0)
|
||||
matchEntityId = _allianceMembers[allianceIndex][0].ObjectId;
|
||||
|
||||
// Find which CrossRealm group contains this member - they may use different ordering than GroupManager
|
||||
for (int crIdx = 0; crIdx < 3 && matchEntityId != 0; crIdx++)
|
||||
if (matchEntityId != 0)
|
||||
{
|
||||
for (int crIdx = 0; crIdx < 3; crIdx++)
|
||||
{
|
||||
var crGroup = info->CrossRealmGroups[crIdx];
|
||||
for (int j = 0; j < crGroup.GroupMemberCount; j++)
|
||||
@@ -176,8 +190,8 @@ namespace HSUI.Interface.Party
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Direct lookup when CrossRealm index matches ours (e.g. both use same ordering)
|
||||
var group = info->CrossRealmGroups[allianceIndex];
|
||||
if (group.GroupMemberCount > 0)
|
||||
{
|
||||
@@ -189,7 +203,6 @@ namespace HSUI.Interface.Party
|
||||
}
|
||||
}
|
||||
|
||||
// GetGroupIndex(displayLetter) returns internal index - find which letter maps to our index
|
||||
for (byte d = 0; d < 3; d++)
|
||||
{
|
||||
if (InfoProxyCrossRealm.GetGroupIndex(d) == allianceIndex)
|
||||
@@ -200,7 +213,13 @@ namespace HSUI.Interface.Party
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback when no CrossRealm data (PvP, in-instance)
|
||||
// CrossRealm empty (in-instance with GroupManager): use direct GM-index mapping.
|
||||
// GroupManager alliance index 0=A, 1=B, 2=C in the game's party list display order.
|
||||
letter = ((char)('A' + allianceIndex)).ToString();
|
||||
return true;
|
||||
}
|
||||
|
||||
// Fallback when no CrossRealm/InfoProxy data (PvP edge cases)
|
||||
letter = ((char)('A' + allianceIndex)).ToString();
|
||||
return true;
|
||||
}
|
||||
@@ -265,6 +284,7 @@ namespace HSUI.Interface.Party
|
||||
{
|
||||
int count = 0;
|
||||
var list = new List<IPartyFramesMember>();
|
||||
|
||||
for (int slot = 0; slot < 8; slot++)
|
||||
{
|
||||
var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
|
||||
@@ -283,6 +303,31 @@ namespace HSUI.Interface.Party
|
||||
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)
|
||||
{
|
||||
for (int slot = 0; slot < 8; slot++)
|
||||
{
|
||||
var pm = mainGroup.GetPartyMemberByIndex(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])
|
||||
{
|
||||
_allianceMembers[allianceIdx].Clear();
|
||||
@@ -295,7 +340,9 @@ namespace HSUI.Interface.Party
|
||||
int ourIdx = 0;
|
||||
for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
|
||||
{
|
||||
var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
|
||||
PartyMember* pm = allianceIdx == 2
|
||||
? mainGroup.GetPartyMemberByIndex(slot)
|
||||
: mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, 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);
|
||||
@@ -372,6 +419,34 @@ namespace HSUI.Interface.Party
|
||||
else
|
||||
Plugin.Logger.Information($"[Alliance] Display slot {slot}: no data");
|
||||
}
|
||||
|
||||
// Letter-resolution path debug: which code path is used and why
|
||||
bool crossRealmHasData = false;
|
||||
if (info != null && info->GroupCount >= 3)
|
||||
{
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
if (info->CrossRealmGroups[i].GroupMemberCount > 0)
|
||||
{
|
||||
crossRealmHasData = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
Plugin.Logger.Information($"[Alliance] crossRealmHasData={crossRealmHasData} → {(crossRealmHasData ? "EntityId/GetGroupIndex path" : "LocalPlayerGroupIndex path")}");
|
||||
|
||||
int dbgPlayerIdx = inst.PlayerAllianceIndex;
|
||||
byte dbgLocalDisplayIdx = info != null ? info->LocalPlayerGroupIndex : (byte)255;
|
||||
Plugin.Logger.Information($"[Alliance] LocalPlayerGroupIndex mapping: playerIdx={dbgPlayerIdx} localDisplayIdx={dbgLocalDisplayIdx} (0=A,1=B,2=C for our alliance)");
|
||||
Plugin.Logger.Information($"[Alliance] Formula: displayIndex = (gmIndex - playerIdx + localDisplayIdx + 3) % 3");
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
int displayIndex = (i - dbgPlayerIdx + dbgLocalDisplayIdx + 3) % 3;
|
||||
char computedLetter = displayIndex >= 0 && displayIndex < 3 ? (char)('A' + displayIndex) : '?';
|
||||
string ours = i == dbgPlayerIdx ? " (OURS)" : "";
|
||||
Plugin.Logger.Information($"[Alliance] GM[{i}] → displayIndex=({i}-{dbgPlayerIdx}+{dbgLocalDisplayIdx}+3)%3={displayIndex} → letter '{computedLetter}'{ours}");
|
||||
}
|
||||
|
||||
Plugin.Logger.Information("=== End Alliance Debug ===");
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
# 1.0.5.0
|
||||
- **World Object Tooltip**: Hover over players, NPCs, or objects in the world to see a tooltip with name, level, HP, job (players), FC tag (optional), distance, and object ID. Enable in Misc → World Tooltip; optional detach-from-cursor with fixed position.
|
||||
|
||||
# 1.0.4.0
|
||||
- **PvP nameplates**: Grand Company icons on enemy nameplates (Maelstrom, Twin Adder, Immortal Flames — icon IDs 62601, 62602, 62603). Configurable icon IDs in Nameplates → Enemies → Company Icon (PvP) if you need to override.
|
||||
- **PvP nameplates**: Role/Job icon on enemy player nameplates — enable in Nameplates → Enemies → Role/Job Icon (enemy players); supports job or role style like player nameplates.
|
||||
- **Hotbars**: Main Actions and Extra Commands now show correct tooltip name and description from the MainCommand sheet (fixes "Main Action" / "Main Action" generic text).
|
||||
- **Alliance Frames**: Further label fixes and debug output for alliance letter mapping.
|
||||
|
||||
# 1.0.3.0
|
||||
- **Alliance Frames**: Fixed alliance letter labels (A/B/C) — correct display when player is in any alliance (A, B, or C); EntityId matching for proper letter resolution when GroupManager and CrossRealm use different orderings; improved PlayerAllianceIndex detection.
|
||||
- **Alliance Frames**: PvP support — frames now display in Frontlines and Rival Wings.
|
||||
|
||||
+6
-5
@@ -4,9 +4,9 @@
|
||||
"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": "Alliance Frames: Fixed A/B/C labels when player in any alliance; PvP support. Hotbars: Shared bar persistence. Config: Save on teleport. Debug: /hsui_alliance_debug.",
|
||||
"Changelog": "World Object Tooltip: hover over players/NPCs/objects for name, level, HP, job, FC tag, distance; optional detach-from-cursor. PvP nameplates: GC icons, Role/Job icon. Main Actions tooltips. Alliance frame fixes.",
|
||||
"InternalName": "HSUI",
|
||||
"AssemblyVersion": "1.0.3.0",
|
||||
"AssemblyVersion": "1.0.5.0",
|
||||
"RepoUrl": "https://github.com/Knack117/HSUI",
|
||||
"ApplicableVersion": "any",
|
||||
"Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
|
||||
@@ -14,10 +14,11 @@
|
||||
"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.3.0/latest.zip",
|
||||
"DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.5.0/latest.zip",
|
||||
"IsHide": false,
|
||||
"IsTestingExclusive": false,
|
||||
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.3.0/latest.zip",
|
||||
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.3.0/latest.zip"
|
||||
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.5.0/latest.zip",
|
||||
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.5.0/latest.zip",
|
||||
"LastUpdate": "1738368000"
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user