Skip to content

Commit 309d2bc

Browse files
AtmoOmenAtmoOmen
committed
Merge remote-tracking branch 'upstream/main'
2 parents f8f8dca + 4b93dbe commit 309d2bc

6 files changed

Lines changed: 96 additions & 105 deletions

File tree

‎FFXIVClientStructs/FFXIV/Client/Graphics/Render/Model.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public unsafe partial struct Model {
2828
[FieldOffset(0xAC)] public uint EnabledAttributeIndexMask;
2929
[FieldOffset(0xC8)] public uint EnabledShapeKeyIndexMask;
3030

31-
[FieldOffset(0xE8)] public uint SlotIndex;
31+
[FieldOffset(0x118)] public uint SlotIndex;
3232

3333
public ReadOnlySpan<Pointer<Material>> MaterialsSpan
3434
=> new(Materials, MaterialCount);

‎FFXIVClientStructs/FFXIV/Client/UI/AddonPartyList.cs‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,44 @@ namespace FFXIVClientStructs.FFXIV.Client.UI;
88
[Addon("_PartyList")]
99
[GenerateInterop]
1010
[Inherits<AtkUnitBase>]
11-
[StructLayout(LayoutKind.Explicit, Size = 0x1590)]
11+
[StructLayout(LayoutKind.Explicit, Size = 0x16A0)]
1212
public unsafe partial struct AddonPartyList {
1313
[FieldOffset(0x238), FixedSizeArray] internal FixedSizeArray8<PartyListMemberStruct> _partyMembers;
1414
[FieldOffset(0xA38), FixedSizeArray] internal FixedSizeArray8<PartyListMemberStruct> _trustMembers;
1515
[FieldOffset(0x1238)] public PartyListMemberStruct Chocobo;
1616
[FieldOffset(0x1338)] public PartyListMemberStruct Pet;
17+
//[FieldOffset(0x1438)] private PartyListMemberStruct ??; // new in 7.5
1718

18-
[FieldOffset(0x1438), FixedSizeArray] internal FixedSizeArray8<uint> _partyClassJobIconId;
19-
[FieldOffset(0x1458), FixedSizeArray] internal FixedSizeArray7<uint> _trustClassJobIconId;
20-
[FieldOffset(0x1474)] public uint ChocoboIconId;
21-
[FieldOffset(0x1478)] public uint PetIconId;
19+
[FieldOffset(0x1538), FixedSizeArray] internal FixedSizeArray8<uint> _partyClassJobIconId;
20+
[FieldOffset(0x1558), FixedSizeArray] internal FixedSizeArray7<uint> _trustClassJobIconId;
21+
22+
[FieldOffset(0x1580)] public uint PetIconId;
2223

23-
[FieldOffset(0x1510), FixedSizeArray] internal FixedSizeArray17<short> _edited; // 0X11 if edited? Need comfirm
24+
[FieldOffset(0x15C4)] public uint ChocoboIconId;
2425

25-
[FieldOffset(0x1538)] public AtkResNode* PartyListAtkResNode;
26-
[FieldOffset(0x1540)] public AtkNineGridNode* BackgroundNineGridNode;
27-
[FieldOffset(0x1548)] public AtkTextNode* PartyTypeTextNode; // Solo Light/Full Party
28-
[FieldOffset(0x1550)] public AtkResNode* LeaderMarkResNode;
29-
[FieldOffset(0x1558)] public AtkResNode* MpBarSpecialResNode;
30-
[FieldOffset(0x1560)] public AtkTextNode* MpBarSpecialTextNode;
26+
[FieldOffset(0x161C), FixedSizeArray] internal FixedSizeArray19<short> _edited; // 0X11 if edited? Need comfirm
3127

32-
[FieldOffset(0x1568)] public int MemberCount;
33-
[FieldOffset(0x156C)] public int TrustCount;
34-
[FieldOffset(0x1570)] public int EnmityLeaderIndex; // Starts from 0 (-1 if no leader)
35-
[FieldOffset(0x1574)] public int HideWhenSolo;
28+
[FieldOffset(0x1648)] public AtkResNode* PartyListAtkResNode;
29+
[FieldOffset(0x1650)] public AtkNineGridNode* BackgroundNineGridNode;
30+
[FieldOffset(0x1658)] public AtkTextNode* PartyTypeTextNode; // Solo Light/Full Party
31+
[FieldOffset(0x1660)] public AtkResNode* LeaderMarkResNode;
32+
[FieldOffset(0x1668)] public AtkResNode* MpBarSpecialResNode;
33+
[FieldOffset(0x1670)] public AtkTextNode* MpBarSpecialTextNode;
3634

37-
[FieldOffset(0x1578)] public int HoveredIndex;
38-
[FieldOffset(0x157C)] public int TargetedIndex;
35+
[FieldOffset(0x1678)] public int MemberCount;
36+
[FieldOffset(0x167C)] public int TrustCount;
37+
[FieldOffset(0x1680)] public int EnmityLeaderIndex; // Starts from 0 (-1 if no leader)
38+
[FieldOffset(0x1684)] public int HideWhenSolo;
3939

40-
[FieldOffset(0x1580)] private int Unknown1580;
41-
[FieldOffset(0x1584)] private int Unknown1584;
42-
[FieldOffset(0x1588)] private byte Unknown1588;
40+
[FieldOffset(0x1688)] public int HoveredIndex;
41+
[FieldOffset(0x168C)] public int TargetedIndex;
4342

44-
[FieldOffset(0x158A)] public byte PetCount; // or PetSummoned?
45-
[FieldOffset(0x158B)] public byte ChocoboCount; // or ChocoboSummoned?
43+
[FieldOffset(0x1690)] private int Unknown1690;
44+
[FieldOffset(0x1694)] private int Unknown1694;
45+
[FieldOffset(0x1698)] private byte Unknown1698;
46+
47+
[FieldOffset(0x169A)] public byte PetCount; // or PetSummoned?
48+
[FieldOffset(0x169B)] public byte ChocoboCount; // or ChocoboSummoned?
4649

4750
[GenerateInterop]
4851
[StructLayout(LayoutKind.Explicit, Size = 0x100)]

‎FFXIVClientStructs/FFXIV/Client/UI/AddonSatisfactionSupply.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@ namespace FFXIVClientStructs.FFXIV.Client.UI;
88
[Addon("SatisfactionSupply")]
99
[GenerateInterop]
1010
[Inherits<AtkUnitBase>]
11-
[StructLayout(LayoutKind.Explicit, Size = 0x688)]
11+
[StructLayout(LayoutKind.Explicit, Size = 0x690)]
1212
public unsafe partial struct AddonSatisfactionSupply {
1313
[FieldOffset(0x23C)] public int HoveredElementIndex; // Index 0-2 of the last hovered turn in element
1414

15-
[FieldOffset(0x320), FixedSizeArray] internal FixedSizeArray3<AddonDeliveryItemInfo> _deliveryInfo;
15+
[FieldOffset(0x2C8), FixedSizeArray] internal FixedSizeArray3<AddonDeliveryItemInfo> _deliveryInfo;
1616
}
1717

1818
[StructLayout(LayoutKind.Explicit, Size = 0x68)]
1919
public struct AddonDeliveryItemInfo {
20-
[FieldOffset(0x00)] public uint ItemId;
21-
22-
// The rest of this array are pointers to various other blocks of memory it seems.
23-
// These pointers don't seem to be vfuncs
20+
[FieldOffset(0x60)] public uint ItemId;
2421
}

‎FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentWKSHud.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public unsafe partial struct AgentWKSHud {
1212

1313
public readonly bool IsReady => Info != null && Info->State == 3;
1414

15-
[StructLayout(LayoutKind.Explicit, Size = 0x270)]
15+
[StructLayout(LayoutKind.Explicit, Size = 0x798)]
1616
public unsafe partial struct HudInfo {
1717
[FieldOffset(0)] public byte State; // 1/2 = fetching data for current zone, 3 = ready
1818

@@ -24,7 +24,7 @@ public unsafe partial struct HudInfo {
2424
[FieldOffset(0x1C)] public int ZoneCreditsItemId;
2525
[FieldOffset(0x20)] public int ZoneCreditsIcon;
2626

27-
[FieldOffset(0x40)] public Utf8String CosmoCreditsText;
28-
[FieldOffset(0xA8)] public Utf8String ZoneCreditsText;
27+
[FieldOffset(0x568)] public Utf8String CosmoCreditsText;
28+
[FieldOffset(0x5D0)] public Utf8String ZoneCreditsText;
2929
}
3030
}

‎FFXIVClientStructs/FFXIV/Shader/CustomizeParameter.cs‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,59 +2,50 @@
22

33
namespace FFXIVClientStructs.FFXIV.Shader;
44

5-
[StructLayout(LayoutKind.Explicit, Size = 0x90)]
5+
[StructLayout(LayoutKind.Explicit, Size = 0x70)]
66
public struct CustomizeParameter {
77
/// <summary>
88
/// XYZ : Skin diffuse color, as squared RGB.
99
/// W : Muscle tone.
1010
/// </summary>
1111
[FieldOffset(0x0)]
1212
public Vector4 SkinColor;
13-
/// <summary>
14-
/// XYZ : Skin specular color, as squared RGB.
15-
/// </summary>
16-
[FieldOffset(0x10)]
17-
public Vector4 SkinFresnelValue0;
1813

1914
/// <summary>
2015
/// XYZ : Lip diffuse color, as squared RGB.
2116
/// W : Lip opacity.
2217
/// </summary>
23-
[FieldOffset(0x20)]
18+
[FieldOffset(0x10)]
2419
public Vector4 LipColor;
2520

2621
/// <summary>
2722
/// XYZ : Hair primary color, as squared RGB.
2823
/// </summary>
29-
[FieldOffset(0x30)]
24+
[FieldOffset(0x20)]
3025
public Vector3 MainColor;
31-
/// <summary>
32-
/// XYZ : Hair specular color, as squared RGB.
33-
/// </summary>
34-
[FieldOffset(0x40)]
35-
public Vector3 HairFresnelValue0;
26+
3627
/// <summary>
3728
/// XYZ : Hair highlight color, as squared RGB.
3829
/// </summary>
39-
[FieldOffset(0x50)]
30+
[FieldOffset(0x30)]
4031
public Vector3 MeshColor;
4132

4233
/// <summary>
4334
/// XYZ : Left eye color, as squared RGB.
4435
/// W : Face paint (UV2) U multiplier.
4536
/// </summary>
46-
[FieldOffset(0x60)]
37+
[FieldOffset(0x40)]
4738
public Vector4 LeftColor;
4839
/// <summary>
4940
/// XYZ : Right eye color, as squared RGB.
5041
/// W : Face paint (UV2) U offset.
5142
/// </summary>
52-
[FieldOffset(0x70)]
43+
[FieldOffset(0x50)]
5344
public Vector4 RightColor;
5445

5546
/// <summary>
5647
/// XYZ : Race feature color, as squared RGB.
5748
/// </summary>
58-
[FieldOffset(0x80)]
49+
[FieldOffset(0x60)]
5950
public Vector3 OptionColor;
6051
}

0 commit comments

Comments
 (0)