diff --git a/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs b/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs index 107d28cfb..9c39e4f97 100644 --- a/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs +++ b/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs @@ -22,9 +22,9 @@ internal unsafe struct PartyFinderPacketListing internal ulong ContentId; private fixed byte padding4[4]; - internal byte Category; + internal ushort Category; - private fixed byte padding5[3]; + private fixed byte padding5[2]; internal ushort Duty; internal byte DutyType; diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs index 33010a379..75d79fef6 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs @@ -3,56 +3,85 @@ namespace Dalamud.Game.Gui.PartyFinder.Types; /// /// Category flags for the class. /// -public enum DutyCategory +public enum DutyCategory : ushort { /// - /// The duty category. + /// The none category. /// - Duty = 0, + None = 0, + + /// + /// The duty roulette category. + /// + DutyRoulette = 1 << 1, + + /// + /// The dungeons category. + /// + Dungeon = 1 << 2, + + /// + /// The guildhests category. + /// + Guildhest = 1 << 3, + + /// + /// The trials category. + /// + Trial = 1 << 4, + + /// + /// The raids category. + /// + Raid = 1 << 5, + + /// + /// The high-end duty category. + /// + HighEndDuty = 1 << 6, + + /// + /// The pvp category. + /// + PvP = 1 << 7, /// /// The gold saucer category. /// - GoldSaucer = 1 << 0, + GoldSaucer = 1 << 8, /// - /// The fate category. + /// The FATEs category. /// - Fates = 1 << 1, + Fate = 1 << 9, /// - /// The treasure hunt category. + /// The treasure hunts category. /// - TreasureHunt = 1 << 2, + TreasureHunt = 1 << 10, /// - /// The hunt category. + /// The hunts category. /// - TheHunt = 1 << 3, + TheHunt = 1 << 11, /// /// The gathering forays category. /// - GatheringForays = 1 << 4, + GatheringForay = 1 << 12, /// /// The deep dungeons category. /// - DeepDungeons = 1 << 5, - - /// - /// The adventuring forays category. - /// - [Obsolete("Adventuring Forays have been renamed to Field Operations")] - AdventuringForays = 1 << 6, + DeepDungeon = 1 << 13, /// /// The field operations category. /// - FieldOperations = 1 << 6, + FieldOperation = 1 << 14, /// /// The variant and criterion dungeons category. /// - VariantAndCriterionDungeons = 1 << 7, + VariantAndCriterionDungeon = 1 << 15, } diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs index 436a9d32e..3461841ab 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs @@ -56,7 +56,7 @@ public interface IPartyFinderListing uint Id { get; } /// - /// Gets the lower bits of the player's content ID. + /// Gets the player's unique content ID. /// ulong ContentId { get; }