Pilzinsel64/PlayerTags
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Pilz.Dalamud

Browse Source
This commit is contained in:
Pascal
2023-04-05 10:17:48 +02:00
parent e12d447344
commit 78b7edf0df
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs
View File

@@ -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);

14
Pilz.Dalamud/ActivityContexts/ZoneType.cs
View File

@@ -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
}
}