Skip to content

Commit 9f00971

Browse files
HaselnussbomberHaselnussbomber
committed
Update PvPProfile
1 parent 6ec0f32 commit 9f00971

File tree

2 files changed

+38
-39
lines changed

2 files changed

+38
-39
lines changed

‎FFXIVClientStructs/FFXIV/Client/Game/UI/PvPProfile.cs‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.UI;
22

33
// Client::Game::UI::PvPProfile
44
[GenerateInterop]
5-
[StructLayout(LayoutKind.Explicit, Size = 0x7C)]
5+
[StructLayout(LayoutKind.Explicit, Size = 0x84)]
66
public unsafe partial struct PvPProfile {
77
[StaticAddress("48 8D 0D ?? ?? ?? ?? 0F B6 78 31", 3)]
88
public static partial PvPProfile* Instance();
@@ -16,43 +16,42 @@ public unsafe partial struct PvPProfile {
1616
[FieldOffset(0x11)] public byte RankTwinAdder;
1717
[FieldOffset(0x12)] public byte RankImmortalFlames;
1818

19-
[FieldOffset(0x1E)] public byte Series;
20-
[FieldOffset(0x1F)] public byte SeriesCurrentRank;
21-
[FieldOffset(0x20)] public byte SeriesClaimedRank;
22-
23-
[FieldOffset(0x22)] public ushort SeriesExperience;
24-
[FieldOffset(0x24)] public byte PreviousSeriesClaimedRank;
25-
[FieldOffset(0x25)] public byte PreviousSeriesRank;
26-
27-
[FieldOffset(0x28)] public uint FrontlineTotalMatches;
28-
[FieldOffset(0x2C)] public uint FrontlineTotalFirstPlace;
29-
[FieldOffset(0x30)] public uint FrontlineTotalSecondPlace;
30-
[FieldOffset(0x34)] public uint FrontlineTotalThirdPlace;
31-
[FieldOffset(0x38)] public ushort FrontlineWeeklyMatches;
32-
[FieldOffset(0x3A)] public ushort FrontlineWeeklyFirstPlace;
33-
[FieldOffset(0x3C)] public ushort FrontlineWeeklySecondPlace;
34-
[FieldOffset(0x3E)] public ushort FrontlineWeeklyThirdPlace;
35-
36-
[FieldOffset(0x41)] public byte CrystallineConflictSeason;
37-
[FieldOffset(0x42)] public ushort CrystallineConflictCasualMatches;
38-
[FieldOffset(0x44)] public ushort CrystallineConflictCasualMatchesWon;
39-
[FieldOffset(0x46)] public ushort CrystallineConflictRankedMatches;
40-
[FieldOffset(0x48)] public ushort CrystallineConflictRankedMatchesWon;
41-
42-
[FieldOffset(0x4E)] public ushort CrystallineConflictCurrentCrystalCredit;
43-
[FieldOffset(0x50)] public ushort CrystallineConflictHighestCrystalCredit;
44-
45-
[FieldOffset(0x54)] public byte CrystallineConflictCurrentRank;
46-
[FieldOffset(0x55)] public byte CrystallineConflictHighestRank;
47-
[FieldOffset(0x56)] public byte CrystallineConflictCurrentRiser;
48-
[FieldOffset(0x57)] public byte CrystallineConflictHighestRiser;
49-
[FieldOffset(0x58)] public byte CrystallineConflictCurrentRisingStars;
50-
[FieldOffset(0x59)] public byte CrystallineConflictHighestRisingStars;
51-
52-
[FieldOffset(0x6C)] public uint RivalWingsTotalMatches;
53-
[FieldOffset(0x70)] public uint RivalWingsTotalMatchesWon;
54-
[FieldOffset(0x74)] public uint RivalWingsWeeklyMatches;
55-
[FieldOffset(0x78)] public uint RivalWingsWeeklyMatchesWon;
19+
[FieldOffset(0x24)] public byte Series;
20+
[FieldOffset(0x25)] public byte SeriesCurrentRank;
21+
[FieldOffset(0x26)] public byte SeriesClaimedRank;
22+
23+
[FieldOffset(0x28)] public ushort SeriesExperience;
24+
[FieldOffset(0x2A)] public byte PreviousSeriesClaimedRank;
25+
[FieldOffset(0x2B)] public byte PreviousSeriesRank;
26+
[FieldOffset(0x2C)] public uint FrontlineTotalMatches;
27+
[FieldOffset(0x30)] public uint FrontlineTotalFirstPlace;
28+
[FieldOffset(0x34)] public uint FrontlineTotalSecondPlace;
29+
[FieldOffset(0x38)] public uint FrontlineTotalThirdPlace;
30+
[FieldOffset(0x3C)] public ushort FrontlineWeeklyMatches;
31+
[FieldOffset(0x3E)] public ushort FrontlineWeeklyFirstPlace;
32+
[FieldOffset(0x40)] public ushort FrontlineWeeklySecondPlace;
33+
[FieldOffset(0x42)] public ushort FrontlineWeeklyThirdPlace;
34+
35+
[FieldOffset(0x45)] public byte CrystallineConflictSeason;
36+
[FieldOffset(0x46)] public ushort CrystallineConflictCasualMatches;
37+
[FieldOffset(0x48)] public ushort CrystallineConflictCasualMatchesWon;
38+
[FieldOffset(0x4A)] public ushort CrystallineConflictRankedMatches;
39+
[FieldOffset(0x4C)] public ushort CrystallineConflictRankedMatchesWon;
40+
41+
[FieldOffset(0x52)] public ushort CrystallineConflictCurrentCrystalCredit;
42+
[FieldOffset(0x54)] public ushort CrystallineConflictHighestCrystalCredit;
43+
44+
[FieldOffset(0x58)] public byte CrystallineConflictCurrentRank;
45+
[FieldOffset(0x59)] public byte CrystallineConflictHighestRank;
46+
[FieldOffset(0x5A)] public byte CrystallineConflictCurrentRiser;
47+
[FieldOffset(0x5B)] public byte CrystallineConflictHighestRiser;
48+
[FieldOffset(0x5C)] public byte CrystallineConflictCurrentRisingStars;
49+
[FieldOffset(0x5D)] public byte CrystallineConflictHighestRisingStars;
50+
51+
[FieldOffset(0x70)] public uint RivalWingsTotalMatches;
52+
[FieldOffset(0x74)] public uint RivalWingsTotalMatchesWon;
53+
[FieldOffset(0x78)] public uint RivalWingsWeeklyMatches;
54+
[FieldOffset(0x7C)] public uint RivalWingsWeeklyMatchesWon;
5655

5756
/// <summary>Gets the current PvP rank for the active Grand Company.</summary>
5857
[MemberFunction("E8 ?? ?? ?? ?? 3A 47 4F")]

‎FFXIVClientStructs/FFXIV/Client/Game/UI/UIState.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public unsafe partial struct UIState {
2626
[FieldOffset(0x1620)] public Cabinet Cabinet;
2727
[FieldOffset(0x16A8)] public Achievement Achievement; // 7.2: size +0x1E8
2828
[FieldOffset(0x1E90)] public Buddy Buddy; // 7.2: size +0x870
29-
[FieldOffset(0x428C)] public PvPProfile PvPProfile; // 7.2: something shifted inside, size +0x08
29+
[FieldOffset(0x428C)] public PvPProfile PvPProfile;
3030
[FieldOffset(0x4310)] internal void* Unk4310; // some UI timer for PvP Results?!
3131
[FieldOffset(0x4318)] public ContentsNote ContentsNote;
3232
[FieldOffset(0x43D0)] public RelicNote RelicNote;

0 commit comments

Comments
 (0)