Fix PartyFinderListing DutyCategory (#1887)

* Change Category from byte to ushort

* adjust doc comment
This commit is contained in:
Infi 2024-07-03 18:38:25 +02:00 committed by GitHub
parent 583c007253
commit 8607d2f034
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 52 additions and 23 deletions

View file

@ -22,9 +22,9 @@ internal unsafe struct PartyFinderPacketListing
internal ulong ContentId; internal ulong ContentId;
private fixed byte padding4[4]; 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 ushort Duty;
internal byte DutyType; internal byte DutyType;

View file

@ -3,56 +3,85 @@ namespace Dalamud.Game.Gui.PartyFinder.Types;
/// <summary> /// <summary>
/// Category flags for the <see cref="PartyFinderGui"/> class. /// Category flags for the <see cref="PartyFinderGui"/> class.
/// </summary> /// </summary>
public enum DutyCategory public enum DutyCategory : ushort
{ {
/// <summary> /// <summary>
/// The duty category. /// The none category.
/// </summary> /// </summary>
Duty = 0, None = 0,
/// <summary>
/// The duty roulette category.
/// </summary>
DutyRoulette = 1 << 1,
/// <summary>
/// The dungeons category.
/// </summary>
Dungeon = 1 << 2,
/// <summary>
/// The guildhests category.
/// </summary>
Guildhest = 1 << 3,
/// <summary>
/// The trials category.
/// </summary>
Trial = 1 << 4,
/// <summary>
/// The raids category.
/// </summary>
Raid = 1 << 5,
/// <summary>
/// The high-end duty category.
/// </summary>
HighEndDuty = 1 << 6,
/// <summary>
/// The pvp category.
/// </summary>
PvP = 1 << 7,
/// <summary> /// <summary>
/// The gold saucer category. /// The gold saucer category.
/// </summary> /// </summary>
GoldSaucer = 1 << 0, GoldSaucer = 1 << 8,
/// <summary> /// <summary>
/// The fate category. /// The FATEs category.
/// </summary> /// </summary>
Fates = 1 << 1, Fate = 1 << 9,
/// <summary> /// <summary>
/// The treasure hunt category. /// The treasure hunts category.
/// </summary> /// </summary>
TreasureHunt = 1 << 2, TreasureHunt = 1 << 10,
/// <summary> /// <summary>
/// The hunt category. /// The hunts category.
/// </summary> /// </summary>
TheHunt = 1 << 3, TheHunt = 1 << 11,
/// <summary> /// <summary>
/// The gathering forays category. /// The gathering forays category.
/// </summary> /// </summary>
GatheringForays = 1 << 4, GatheringForay = 1 << 12,
/// <summary> /// <summary>
/// The deep dungeons category. /// The deep dungeons category.
/// </summary> /// </summary>
DeepDungeons = 1 << 5, DeepDungeon = 1 << 13,
/// <summary>
/// The adventuring forays category.
/// </summary>
[Obsolete("Adventuring Forays have been renamed to Field Operations")]
AdventuringForays = 1 << 6,
/// <summary> /// <summary>
/// The field operations category. /// The field operations category.
/// </summary> /// </summary>
FieldOperations = 1 << 6, FieldOperation = 1 << 14,
/// <summary> /// <summary>
/// The variant and criterion dungeons category. /// The variant and criterion dungeons category.
/// </summary> /// </summary>
VariantAndCriterionDungeons = 1 << 7, VariantAndCriterionDungeon = 1 << 15,
} }

View file

@ -56,7 +56,7 @@ public interface IPartyFinderListing
uint Id { get; } uint Id { get; }
/// <summary> /// <summary>
/// Gets the lower bits of the player's content ID. /// Gets the player's unique content ID.
/// </summary> /// </summary>
ulong ContentId { get; } ulong ContentId { get; }