ZoneType is now a Flag
This commit is contained in:
@@ -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,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user