add PvP as additional ZoneType

This commit is contained in:
2023-01-15 14:24:28 +01:00
parent ea9732b81f
commit 753dabfcd1
2 changed files with 22 additions and 17 deletions

View File

@@ -54,28 +54,32 @@ namespace Pilz.Dalamud.ActivityContexts
} }
else else
{ {
// Check for ActivityContext
if (content.PvP) if (content.PvP)
{
newActivityContext = ActivityType.PvpDuty; newActivityContext = ActivityType.PvpDuty;
newZoneType = ZoneType.Pvp;
}
else else
{
newActivityContext = ActivityType.PveDuty; newActivityContext = ActivityType.PveDuty;
// Find correct member type // Find correct member type
var memberType = content.ContentMemberType.Row; var memberType = content.ContentMemberType.Row;
if (content.RowId == 16 || content.RowId == 15) if (content.RowId == 16 || content.RowId == 15)
memberType = 2; // Praetorium and Castrum Meridianum memberType = 2; // Praetorium and Castrum Meridianum
else if (content.RowId == 735 || content.RowId == 778) else if (content.RowId == 735 || content.RowId == 778)
memberType = 127; // Bozja memberType = 127; // Bozja
// Check for ZoneType // Check for ZoneType
newZoneType = memberType switch newZoneType = memberType switch
{ {
2 => ZoneType.Dungeon, 2 => ZoneType.Dungeon,
3 => ZoneType.Raid, 3 => ZoneType.Raid,
4 => ZoneType.AllianceRaid, 4 => ZoneType.AllianceRaid,
127 => ZoneType.Foray, 127 => ZoneType.Foray,
_ => ZoneType.Dungeon, _ => ZoneType.Dungeon,
}; };
}
} }
CurrentActivityContext = new(newActivityContext, newZoneType); CurrentActivityContext = new(newActivityContext, newZoneType);

View File

@@ -15,6 +15,7 @@ namespace Pilz.Dalamud.ActivityContexts
Dungeon, Dungeon,
Raid, Raid,
AllianceRaid, AllianceRaid,
Foray Foray,
Pvp
} }
} }