v1.0.3.0: Alliance frames fixes, PvP support, shared hotbar persistence, config save on teleport
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -576,82 +576,85 @@ namespace HSUI.Interface.Party
|
||||
}
|
||||
));
|
||||
|
||||
// name
|
||||
bool drawName = ShouldDrawName(character, showingRaise, showingInvuln);
|
||||
if (drawName)
|
||||
if (_configs.HealthBar.ShowLabels)
|
||||
{
|
||||
drawActions.Add((_configs.HealthBar.NameLabelConfig.StrataLevel, () =>
|
||||
// name
|
||||
bool drawName = ShouldDrawName(character, showingRaise, showingInvuln);
|
||||
if (drawName)
|
||||
{
|
||||
bool? playerName = null;
|
||||
if (character == null || character.ObjectKind == ObjectKind.Player)
|
||||
drawActions.Add((_configs.HealthBar.NameLabelConfig.StrataLevel, () =>
|
||||
{
|
||||
playerName = true;
|
||||
bool? playerName = null;
|
||||
if (character == null || character.ObjectKind == ObjectKind.Player)
|
||||
{
|
||||
playerName = true;
|
||||
}
|
||||
|
||||
_nameLabelHud.Draw(Position, _configs.HealthBar.Size, character, Member.Name, isPlayerName: playerName);
|
||||
}
|
||||
|
||||
_nameLabelHud.Draw(Position, _configs.HealthBar.Size, character, Member.Name, isPlayerName: playerName);
|
||||
));
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
// health label
|
||||
if (Member.MaxHP > 0)
|
||||
{
|
||||
drawActions.Add((_configs.HealthBar.HealthLabelConfig.StrataLevel, () =>
|
||||
// health label
|
||||
if (Member.MaxHP > 0)
|
||||
{
|
||||
_healthLabelHud.Draw(Position, _configs.HealthBar.Size, character, null, Member.HP, Member.MaxHP);
|
||||
drawActions.Add((_configs.HealthBar.HealthLabelConfig.StrataLevel, () =>
|
||||
{
|
||||
_healthLabelHud.Draw(Position, _configs.HealthBar.Size, character, null, Member.HP, Member.MaxHP);
|
||||
}
|
||||
));
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
// order
|
||||
if (character == null || character?.ObjectKind != ObjectKind.BattleNpc)
|
||||
{
|
||||
string str = char.ConvertFromUtf32(0xE090 + Member.Order).ToString();
|
||||
|
||||
drawActions.Add((_configs.HealthBar.OrderNumberConfig.StrataLevel, () =>
|
||||
// order
|
||||
if (character == null || character?.ObjectKind != ObjectKind.BattleNpc)
|
||||
{
|
||||
_configs.HealthBar.OrderNumberConfig.SetText(str);
|
||||
_orderLabelHud.Draw(Position, _configs.HealthBar.Size, character);
|
||||
}
|
||||
));
|
||||
}
|
||||
string str = char.ConvertFromUtf32(0xE090 + Member.Order).ToString();
|
||||
|
||||
// status
|
||||
string? statusString = StringForStatus(Member.Status);
|
||||
if (PlayerStatus.Enabled && PlayerStatus.Label.Enabled && statusString != null)
|
||||
{
|
||||
drawActions.Add((PlayerStatus.Label.StrataLevel, () =>
|
||||
drawActions.Add((_configs.HealthBar.OrderNumberConfig.StrataLevel, () =>
|
||||
{
|
||||
_configs.HealthBar.OrderNumberConfig.SetText(str);
|
||||
_orderLabelHud.Draw(Position, _configs.HealthBar.Size, character);
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
// status
|
||||
string? statusString = StringForStatus(Member.Status);
|
||||
if (PlayerStatus.Enabled && PlayerStatus.Label.Enabled && statusString != null)
|
||||
{
|
||||
PlayerStatus.Label.SetText(statusString);
|
||||
_statusLabelHud.Draw(Position, _configs.HealthBar.Size);
|
||||
drawActions.Add((PlayerStatus.Label.StrataLevel, () =>
|
||||
{
|
||||
PlayerStatus.Label.SetText(statusString);
|
||||
_statusLabelHud.Draw(Position, _configs.HealthBar.Size);
|
||||
}
|
||||
));
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
// raise label
|
||||
if (showingRaise)
|
||||
{
|
||||
float duration = Math.Abs(Member.RaiseTime!.Value);
|
||||
|
||||
drawActions.Add((RaiseTracker.Icon.NumericLabel.StrataLevel, () =>
|
||||
// raise label
|
||||
if (showingRaise)
|
||||
{
|
||||
RaiseTracker.Icon.NumericLabel.SetValue(duration);
|
||||
_raiseLabelHud.Draw(Position, _configs.HealthBar.Size);
|
||||
float duration = Math.Abs(Member.RaiseTime!.Value);
|
||||
|
||||
drawActions.Add((RaiseTracker.Icon.NumericLabel.StrataLevel, () =>
|
||||
{
|
||||
RaiseTracker.Icon.NumericLabel.SetValue(duration);
|
||||
_raiseLabelHud.Draw(Position, _configs.HealthBar.Size);
|
||||
}
|
||||
));
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
// invuln label
|
||||
if (showingInvuln)
|
||||
{
|
||||
float duration = Math.Abs(Member.InvulnStatus!.InvulnTime);
|
||||
|
||||
drawActions.Add((InvulnTracker.Icon.NumericLabel.StrataLevel, () =>
|
||||
// invuln label
|
||||
if (showingInvuln)
|
||||
{
|
||||
InvulnTracker.Icon.NumericLabel.SetValue(duration);
|
||||
_invulnLabelHud.Draw(Position, _configs.HealthBar.Size);
|
||||
float duration = Math.Abs(Member.InvulnStatus!.InvulnTime);
|
||||
|
||||
drawActions.Add((InvulnTracker.Icon.NumericLabel.StrataLevel, () =>
|
||||
{
|
||||
InvulnTracker.Icon.NumericLabel.SetValue(duration);
|
||||
_invulnLabelHud.Draw(Position, _configs.HealthBar.Size);
|
||||
}
|
||||
));
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
return drawActions;
|
||||
|
||||
Reference in New Issue
Block a user