Pilzinsel64/PlayerTags
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use gray color at text formatting applying

Browse Source
This commit is contained in:
Pascal
2022-11-16 07:30:21 +01:00
parent 17fff4449b
commit 14bb07f7ab
4 changed files with 16 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
PlayerTags/Features/NameplateTagTargetFeature.cs
View File

@@ -114,31 +114,8 @@ namespace PlayerTags.Features
var beforeTitleBytes = args.Title.Encode();
var iconID = args.IconId;
var generalOptions = m_PluginConfiguration.GeneralOptions[ActivityContextManager.CurrentActivityContext.ActivityType];
var applyTags = false;
var grayOut = false;
if (args.PlayerCharacter != null)
{
if (args.PlayerCharacter.IsDead)
{
switch (generalOptions.NameplateDeadPlayerHandling)
{
case DeadPlayerHandling.Include:
applyTags = true;
break;
case DeadPlayerHandling.GrayOut:
grayOut = true;
break;
}
}
else
applyTags = true;
}
if (applyTags)
AddTagsToNameplate(args.PlayerCharacter, args.Name, args.Title, args.FreeCompany, ref iconID, generalOptions);
else if(grayOut)
GrayOutNameplate(args.PlayerCharacter, args.Name, args.Title, args.FreeCompany, ref iconID);
AddTagsToNameplate(args.PlayerCharacter, args.Name, args.Title, args.FreeCompany, ref iconID, generalOptions);
args.IconId = iconID;
@@ -200,7 +177,7 @@ namespace PlayerTags.Features
int? newStatusIcon = null;
NameplateChanges nameplateChanges = GenerateEmptyNameplateChanges(name, title, freeCompany);
if (gameObject is PlayerCharacter playerCharacter)
if (gameObject is PlayerCharacter playerCharacter && (!playerCharacter.IsDead || generalOptions.NameplateDeadPlayerHandling != DeadPlayerHandling.Ignore))
{
var classJob = playerCharacter.ClassJob;
var classJobGameData = classJob?.GameData;
@@ -258,6 +235,12 @@ namespace PlayerTags.Features
if (gameObject is PlayerCharacter playerCharacter1)
{
ushort? colorOverwrite = null;
// Use gray color if player is dead
if (playerCharacter1.IsDead && generalOptions.NameplateDeadPlayerHandling == DeadPlayerHandling.GrayOut)
colorOverwrite = 3;
// An additional step to apply text color to additional locations
Identity identity = m_PluginData.GetIdentity(playerCharacter1);
foreach (var customTagId in identity.CustomTagIds)
@@ -274,27 +257,12 @@ namespace PlayerTags.Features
{
var destStrings = new[] { name, title, freeCompany };
var isTextColorApplied = new[] { tag.IsTextColorAppliedToNameplateName, tag.IsTextColorAppliedToNameplateTitle, tag.IsTextColorAppliedToNameplateFreeCompany };
ApplyTextFormatting(gameObject, tag, new[] { name, title, freeCompany }, isTextColorApplied, null);
ApplyTextFormatting(gameObject, tag, new[] { name, title, freeCompany }, isTextColorApplied, null,
overwriteTextColor: colorOverwrite);
}
}
}
protected void GrayOutNameplate(GameObject gameObject, SeString name, SeString title, SeString freeCompany, ref int statusIcon)
{
if (gameObject is PlayerCharacter playerCharacter)
{
NameplateChanges nameplateChanges = GenerateEmptyNameplateChanges(name, title, freeCompany);
foreach (NameplateElements element in Enum.GetValues<NameplateElements>())
{
nameplateChanges.GetChange(element, StringPosition.Before).Payloads.Add(new UIForegroundPayload(3));
nameplateChanges.GetChange(element, StringPosition.After).Payloads.Add(new UIForegroundPayload(0));
}
ApplyNameplateChanges(nameplateChanges);
}
}
protected void ApplyNameplateChanges(NameplateChanges nameplateChanges)
{
var props = new NameplateChangesProps

7
PlayerTags/Features/TagTargetFeature.cs
View File

@@ -223,7 +223,7 @@ namespace PlayerTags.Features
StringUpdateFactory.ApplyStringChanges(props);
}
protected void ApplyTextFormatting(GameObject gameObject, Tag tag, SeString[] destStrings, InheritableValue<bool>[] textColorApplied, List<Payload> preferedPayloads)
protected void ApplyTextFormatting(GameObject gameObject, Tag tag, SeString[] destStrings, InheritableValue<bool>[] textColorApplied, List<Payload> preferedPayloads, ushort? overwriteTextColor = null)
{
if (IsTagVisible(tag, gameObject))
{
@@ -239,11 +239,12 @@ namespace PlayerTags.Features
void applyTextColor(SeString destPayload, InheritableValue<bool> enableFlag, InheritableValue<ushort> colorValue)
{
var colorToUse = overwriteTextColor ?? colorValue?.InheritedValue;
if (shouldApplyFormattingPayloads(destPayload)
&& enableFlag.InheritedValue != null
&& enableFlag.InheritedValue.Value
&& colorValue.InheritedValue != null)
applyTextFormattingPayloads(destPayload, new UIForegroundPayload(colorValue.InheritedValue.Value), new UIForegroundPayload(0));
&& colorToUse != null)
applyTextFormattingPayloads(destPayload, new UIForegroundPayload(colorToUse.Value), new UIForegroundPayload(0));
}
//void applyTextGlowColor(SeString destPayload, InheritableValue<bool> enableFlag, InheritableValue<ushort> colorValue)

2
PlayerTags/Resources/Strings.Designer.cs generated
View File

@@ -223,7 +223,7 @@ namespace PlayerTags.Resources {
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Gray out the nameplate of dead players and don&apos;t apply any tag for. ähnelt.
/// Sucht eine lokalisierte Zeichenfolge, die Apply any tag but gray out the nameplate. ähnelt.
/// </summary>
public static string Loc_DeadPlayerHandling_GrayOut_Description {
get {

2
PlayerTags/Resources/Strings.resx
View File

@@ -805,7 +805,7 @@ Use this if you want to to have every option under your control or just want to
<value>Handling for dead players</value>
</data>
<data name="Loc_DeadPlayerHandling_GrayOut_Description" xml:space="preserve">
<value>Gray out the nameplate of dead players and don't apply any tag for.</value>
<value>Apply any tag but gray out the nameplate.</value>
</data>
<data name="Loc_DeadPlayerHandling_Ignore_Description" xml:space="preserve">
<value>Don't process dead players and don't apply any tag for.</value>