Pilz.NET/Pilz.Dalamud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

some minor fixes

Browse Source
This commit is contained in:
Pascal
2022-11-15 21:29:17 +01:00
parent ec1fe03361
commit efea1c3d04
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Pilz.Dalamud/Nameplates/Tools/NameplateUpdateFactory.cs
View File

@@ -23,26 +23,30 @@ namespace Pilz.Dalamud.Nameplates.Tools
}
}
public static bool ApplyStatusIconWithPrio(ref int statusIcon, int newStatusIcon, StringChange stringChange, ActivityContext activityContext, StatusIconPriorizer priorizer)
public static bool ApplyStatusIconWithPrio(ref int statusIcon, int newStatusIcon, StringChange stringChange, ActivityContext activityContext, StatusIconPriorizer priorizer, bool moveIconToNameplateIfPossible)
{
var isPrio = priorizer.IsPriorityIcon(statusIcon, activityContext);
bool? isPrio = null;
var fontIcon = StatusIconFontConverter.GetBitmapFontIconFromStatusIcon((StatusIcons)statusIcon);
if (!isPrio)
if (moveIconToNameplateIfPossible)
{
var fontIcon = StatusIconFontConverter.GetBitmapFontIconFromStatusIcon((StatusIcons)statusIcon);
if (fontIcon != null)
{
// Set new font icon as string change
var iconPayload = new IconPayload(fontIcon.Value);
stringChange.Payloads.Insert(0, iconPayload);
// Use new status icon as status icon
statusIcon = newStatusIcon;
// If we moved it, we don't need it as icon anymore, yay :D
isPrio = false;
}
}
return isPrio;
isPrio ??= priorizer.IsPriorityIcon(statusIcon, activityContext);
if (!isPrio.Value)
statusIcon = newStatusIcon;
return isPrio.Value;
}
}
}

18
Pilz.Dalamud/Nameplates/Tools/StatusIconPriorizerSettings.cs
View File

@@ -65,6 +65,12 @@ namespace Pilz.Dalamud.Nameplates.Tools
StatusIcons.PartyMember, // Party Member
StatusIcons.RolePlaying, // Role Playing
StatusIcons.GroupPose, // Group Pose
StatusIcons.Mentor,
StatusIcons.MentorCrafting,
StatusIcons.MentorPvE,
StatusIcons.MentorPvP,
StatusIcons.Returner,
StatusIcons.NewAdventurer,
});
var setInDuty = GetConditionSet(StatusIconPriorizerConditionSets.InDuty);
@@ -74,6 +80,12 @@ namespace Pilz.Dalamud.Nameplates.Tools
StatusIcons.ViewingCutscene, // Viewing Cutscene
StatusIcons.Idle, // Idle
StatusIcons.GroupPose, // Group Pose
StatusIcons.Mentor,
StatusIcons.MentorCrafting,
StatusIcons.MentorPvE,
StatusIcons.MentorPvP,
StatusIcons.Returner,
StatusIcons.NewAdventurer,
});
var setInForay = GetConditionSet(StatusIconPriorizerConditionSets.InForay);
@@ -86,6 +98,12 @@ namespace Pilz.Dalamud.Nameplates.Tools
StatusIcons.ViewingCutscene, // Viewing Cutscene
StatusIcons.Idle, // Idle
StatusIcons.GroupPose, // Group Pose
StatusIcons.Mentor,
StatusIcons.MentorCrafting,
StatusIcons.MentorPvE,
StatusIcons.MentorPvP,
StatusIcons.Returner,
StatusIcons.NewAdventurer,
});
}
}

6
Pilz.Dalamud/Pilz.Dalamud.csproj
View File

@@ -23,9 +23,9 @@
<PackageProjectUrl>https://github.com/Pilzinsel64/Pilz.Dalamud</PackageProjectUrl>
<RepositoryUrl>https://github.com/Pilzinsel64/Pilz.Dalamud</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<FileVersion>0.1.0.0</FileVersion>
<AssemblyVersion>0.1.0.0</AssemblyVersion>
<Version>0.1.0</Version>
<FileVersion>0.1.1.0</FileVersion>
<AssemblyVersion>0.1.1.0</AssemblyVersion>
<Version>0.1.1</Version>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>