Merge pull request #337 from ascclemens/pf

Expose ContentIdLower for PF listings
This commit is contained in:
goaaats 2021-04-27 17:00:50 +02:00 committed by GitHub
commit 4af25292da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -35,7 +35,7 @@ namespace Dalamud.Game.Internal.Gui.Structs {
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
private readonly byte[] header2; private readonly byte[] header2;
private readonly uint unknownInt1; internal readonly uint contentIdLower;
private readonly ushort unknownShort1; private readonly ushort unknownShort1;
private readonly ushort unknownShort2; private readonly ushort unknownShort2;
@ -123,6 +123,10 @@ namespace Dalamud.Game.Internal.Gui.Structs {
/// </summary> /// </summary>
public uint Id { get; } public uint Id { get; }
/// <summary> /// <summary>
/// The lower bits of the player's content ID.
/// </summary>
public uint ContentIdLower { get; }
/// <summary>
/// The name of the player hosting this listing. /// The name of the player hosting this listing.
/// </summary> /// </summary>
public SeString Name { get; } public SeString Name { get; }
@ -256,6 +260,7 @@ namespace Dalamud.Game.Internal.Gui.Structs {
this.jobsPresent = listing.jobsPresent; this.jobsPresent = listing.jobsPresent;
Id = listing.id; Id = listing.id;
ContentIdLower = listing.contentIdLower;
Name = seStringManager.Parse(listing.name.TakeWhile(b => b != 0).ToArray()); Name = seStringManager.Parse(listing.name.TakeWhile(b => b != 0).ToArray());
Description = seStringManager.Parse(listing.description.TakeWhile(b => b != 0).ToArray()); Description = seStringManager.Parse(listing.description.TakeWhile(b => b != 0).ToArray());
World = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.world)); World = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.world));