ZoneType is now a Flag
This commit is contained in:
@@ -73,11 +73,11 @@ namespace Pilz.Dalamud.ActivityContexts
|
|||||||
// Check for ZoneType
|
// Check for ZoneType
|
||||||
newZoneType = memberType switch
|
newZoneType = memberType switch
|
||||||
{
|
{
|
||||||
2 => ZoneType.Dungeon,
|
2 => ZoneType.Doungen,
|
||||||
3 => ZoneType.Raid,
|
3 => ZoneType.Raid,
|
||||||
4 => ZoneType.AllianceRaid,
|
4 => ZoneType.AllianceRaid,
|
||||||
127 => ZoneType.Foray,
|
127 => ZoneType.Foray,
|
||||||
_ => ZoneType.Dungeon,
|
_ => ZoneType.Doungen,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,14 +8,15 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace Pilz.Dalamud.ActivityContexts
|
namespace Pilz.Dalamud.ActivityContexts
|
||||||
{
|
{
|
||||||
[JsonConverter(typeof(StringEnumConverter))]
|
[Flags, JsonConverter(typeof(StringEnumConverter))]
|
||||||
public enum ZoneType
|
public enum ZoneType
|
||||||
{
|
{
|
||||||
Overworld,
|
Overworld = 1,
|
||||||
Dungeon,
|
Doungen = 2,
|
||||||
Raid,
|
Raid = 4,
|
||||||
AllianceRaid,
|
AllianceRaid = 8,
|
||||||
Foray,
|
Foray = 16,
|
||||||
Pvp
|
Pvp = 32,
|
||||||
|
Everywhere = int.MaxValue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ namespace Pilz.Dalamud.Nameplates.EventArgs
|
|||||||
}
|
}
|
||||||
|
|
||||||
public SafeNameplateObject SafeNameplateObject { get; set; }
|
public SafeNameplateObject SafeNameplateObject { get; set; }
|
||||||
public SeString Title { get; set; }
|
public SeString Title { get; internal set; }
|
||||||
public SeString Name { get; set; }
|
public SeString Name { get; internal set; }
|
||||||
public SeString FreeCompany { get; set; }
|
public SeString FreeCompany { get; set; }
|
||||||
|
|
||||||
public bool IsTitleAboveName
|
public bool IsTitleAboveName
|
||||||
|
|||||||
Reference in New Issue
Block a user