From e12d44734478c5b1f65661246342ff11c8a0a413 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Wed, 5 Apr 2023 10:12:35 +0200 Subject: [PATCH 1/2] update Pilz.Dalamud --- .../AddonNamePlate_SetPlayerNameManagedEventArgs.cs | 6 +++--- Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs | 8 ++++++++ Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs | 9 +++++++++ Pilz.Dalamud/Pilz.Dalamud.csproj | 7 ++++++- Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs | 4 ++-- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs b/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs index 494bdd1..511ff28 100644 --- a/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs +++ b/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs @@ -17,9 +17,9 @@ namespace Pilz.Dalamud.Nameplates.EventArgs } public SafeNameplateObject SafeNameplateObject { get; set; } - public SeString Title { get; set; } - public SeString Name { get; set; } - public SeString FreeCompany { get; set; } + public SeString Title { get; internal set; } + public SeString Name { get; internal set; } + public SeString FreeCompany { get; internal set; } public bool IsTitleAboveName { diff --git a/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs b/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs index b33c372..3accdbb 100644 --- a/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs +++ b/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Pilz.Dalamud.Nameplates.EventArgs; using Pilz.Dalamud.Tools.Strings; namespace Pilz.Dalamud.Nameplates.Tools @@ -18,6 +19,13 @@ namespace Pilz.Dalamud.Nameplates.Tools changes.Add(NameplateElements.FreeCompany, new()); } + public NameplateChanges(AddonNamePlate_SetPlayerNameManagedEventArgs eventArgs) : this() + { + GetProps(NameplateElements.Title).Destination = eventArgs.Title; + GetProps(NameplateElements.Name).Destination = eventArgs.Name; + GetProps(NameplateElements.FreeCompany).Destination = eventArgs.FreeCompany; + } + /// /// Gets the properties with the changes of an element of your choice where you can add your payloads to a change and setup some options. /// diff --git a/Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs b/Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs index 56f7017..201bcf5 100644 --- a/Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs +++ b/Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs @@ -12,5 +12,14 @@ namespace Pilz.Dalamud.Nameplates.Tools /// All the changes to the nameplate that should be made. /// public NameplateChanges Changes { get; set; } + + public NameplateChangesProps() + { + } + + public NameplateChangesProps(NameplateChanges changes) : this() + { + Changes = changes; + } } } diff --git a/Pilz.Dalamud/Pilz.Dalamud.csproj b/Pilz.Dalamud/Pilz.Dalamud.csproj index 262ee3e..5e4ce86 100644 --- a/Pilz.Dalamud/Pilz.Dalamud.csproj +++ b/Pilz.Dalamud/Pilz.Dalamud.csproj @@ -21,9 +21,10 @@ False Pilzinsel64 https://github.com/Pilzinsel64/Pilz.Dalamud + README.md https://github.com/Pilzinsel64/Pilz.Dalamud git - 0.2.0 + 0.3.1 True @@ -58,4 +59,8 @@ + + + + diff --git a/Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs b/Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs index ab3423a..3c240f5 100644 --- a/Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs +++ b/Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs @@ -98,14 +98,14 @@ namespace Pilz.Dalamud.Tools.Strings if (tagPosition == StringPosition.Before) { var significantPayloads = payloads.Where(payload => payload is TextPayload || payload is IconPayload); - if (significantPayloads.Last() is TextPayload) + if (significantPayloads.LastOrDefault() is TextPayload) payloads.Add(getNewTextPayload()); } // Decide whether to add a space to the beginning else if (tagPosition == StringPosition.After) { var significantPayloads = payloads.Where(payload => payload is TextPayload || payload is IconPayload); - if (significantPayloads.First() is TextPayload) + if (significantPayloads.FirstOrDefault() is TextPayload) payloads.Insert(0, getNewTextPayload()); } } From 78b7edf0df23aad2670ebe1af7b4d1032989c474 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Wed, 5 Apr 2023 10:17:48 +0200 Subject: [PATCH 2/2] update Pilz.Dalamud --- .../ActivityContextManager.cs | 36 ++++++++++--------- Pilz.Dalamud/ActivityContexts/ZoneType.cs | 14 ++++---- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs b/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs index bf218d6..5ba94f3 100644 --- a/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs +++ b/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs @@ -54,28 +54,32 @@ namespace Pilz.Dalamud.ActivityContexts } else { - // Check for ActivityContext if (content.PvP) + { newActivityContext = ActivityType.PvpDuty; + newZoneType = ZoneType.Pvp; + } else + { newActivityContext = ActivityType.PveDuty; - // Find correct member type - var memberType = content.ContentMemberType.Row; - if (content.RowId == 16 || content.RowId == 15) - memberType = 2; // Praetorium and Castrum Meridianum - else if (content.RowId == 735 || content.RowId == 778) - memberType = 127; // Bozja + // Find correct member type + var memberType = content.ContentMemberType.Row; + if (content.RowId == 16 || content.RowId == 15) + memberType = 2; // Praetorium and Castrum Meridianum + else if (content.RowId == 735 || content.RowId == 778) + memberType = 127; // Bozja - // Check for ZoneType - newZoneType = memberType switch - { - 2 => ZoneType.Dungeon, - 3 => ZoneType.Raid, - 4 => ZoneType.AllianceRaid, - 127 => ZoneType.Foray, - _ => ZoneType.Dungeon, - }; + // Check for ZoneType + newZoneType = memberType switch + { + 2 => ZoneType.Doungen, + 3 => ZoneType.Raid, + 4 => ZoneType.AllianceRaid, + 127 => ZoneType.Foray, + _ => ZoneType.Doungen, + }; + } } CurrentActivityContext = new(newActivityContext, newZoneType); diff --git a/Pilz.Dalamud/ActivityContexts/ZoneType.cs b/Pilz.Dalamud/ActivityContexts/ZoneType.cs index 6800511..aa40d28 100644 --- a/Pilz.Dalamud/ActivityContexts/ZoneType.cs +++ b/Pilz.Dalamud/ActivityContexts/ZoneType.cs @@ -8,13 +8,15 @@ using System.Threading.Tasks; namespace Pilz.Dalamud.ActivityContexts { - [JsonConverter(typeof(StringEnumConverter))] + [Flags, JsonConverter(typeof(StringEnumConverter))] public enum ZoneType { - Overworld, - Dungeon, - Raid, - AllianceRaid, - Foray + Overworld = 1, + Doungen = 2, + Raid = 4, + AllianceRaid = 8, + Foray = 16, + Pvp = 32, + Everywhere = int.MaxValue } }