From 5371079ea5164e7976617cba01a628aa85988b73 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Mon, 3 Apr 2023 09:53:44 +0200 Subject: [PATCH] ZoneType is now a Flag --- .../ActivityContexts/ActivityContextManager.cs | 4 ++-- Pilz.Dalamud/ActivityContexts/ZoneType.cs | 15 ++++++++------- ...ddonNamePlate_SetPlayerNameManagedEventArgs.cs | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs b/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs index 79ec984..5ba94f3 100644 --- a/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs +++ b/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs @@ -73,11 +73,11 @@ namespace Pilz.Dalamud.ActivityContexts // Check for ZoneType newZoneType = memberType switch { - 2 => ZoneType.Dungeon, + 2 => ZoneType.Doungen, 3 => ZoneType.Raid, 4 => ZoneType.AllianceRaid, 127 => ZoneType.Foray, - _ => ZoneType.Dungeon, + _ => ZoneType.Doungen, }; } } diff --git a/Pilz.Dalamud/ActivityContexts/ZoneType.cs b/Pilz.Dalamud/ActivityContexts/ZoneType.cs index 1964a88..aa40d28 100644 --- a/Pilz.Dalamud/ActivityContexts/ZoneType.cs +++ b/Pilz.Dalamud/ActivityContexts/ZoneType.cs @@ -8,14 +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, - Pvp + Overworld = 1, + Doungen = 2, + Raid = 4, + AllianceRaid = 8, + Foray = 16, + Pvp = 32, + Everywhere = int.MaxValue } } diff --git a/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs b/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs index 494bdd1..e85d2ff 100644 --- a/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs +++ b/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs @@ -17,8 +17,8 @@ namespace Pilz.Dalamud.Nameplates.EventArgs } public SafeNameplateObject SafeNameplateObject { get; set; } - public SeString Title { get; set; } - public SeString Name { get; set; } + public SeString Title { get; internal set; } + public SeString Name { get; internal set; } public SeString FreeCompany { get; set; } public bool IsTitleAboveName