7.2

Author: wozaiha

CExporter/Exporter.cs

@@ -471,6 +471,7 @@ private static ProcessedField ProcessVirtualParameter(Type parameter, int i, Par
             if (!type.IsStruct() || type.IsEnum) return null;
             if (type.IsInStructList(_structs) || (overrideType?.IsInStructList(_structs) ?? false)) return null;
             var vtable = type.GetField("VirtualTable", ExporterStatics.BindingFlags)?.FieldType;
+            var vtableSize = 0;
             ProcessedVirtualFunction[]? virtualFunctions = null;
             if (vtable != null) {
                 vtable = vtable.GetElementType()!;
@@ -487,6 +488,7 @@ private static ProcessedField ProcessVirtualParameter(Type parameter, int i, Par
                         VirtualFunctionParameters = f.FieldType.GetFunctionPointerParameterTypes().Select((p, i) => ProcessVirtualParameter(p, i, memberFunction?.Item2)).ToArray()
                     };
                 }).ToArray();
+                vtableSize = vtable.StructLayoutAttribute?.Size ?? vtableSize;
             }
 
             var memberFunctionClass = type.GetMember("MemberFunctionPointers", ExporterStatics.BindingFlags).FirstOrDefault()?.DeclaringType;
@@ -544,6 +546,7 @@ .. memberFunctionParameters.Select(ProcessParameter).ToArray()]
                             StructNamespace = type.FullSanitizeName() + (attr.IsStruct ? $"{ExporterStatics.Separator}{attr.Union}" : ""),
                             StructTypeName = type.FullSanitizeName() + $"{ExporterStatics.Separator}{attr.Union}{(attr.IsStruct ? $"{ExporterStatics.Separator}{attr.Struct}" : "")}",
                             StructSize = 0,
+                            VirtualFunctionSize = 0,
                             Fields = [
                                 ProcessField(unionField, unionStartField.GetFieldOffset())
                             ],
@@ -588,6 +591,7 @@ .. memberFunctionParameters.Select(ProcessParameter).ToArray()]
                 StructNamespace = type.GetNamespace(),
                 StructTypeName = overrideType ?? type.FullSanitizeName(),
                 StructSize = type.SizeOf(),
+                VirtualFunctionSize = vtableSize,
                 Fields = ProcessFields(fields),
                 VirtualFunctions = virtualFunctions,
                 MemberFunctions = memberFunctionsArray,
@@ -686,6 +690,7 @@ public class ProcessedStruct {
     public required string StructNamespace;
     public required int StructSize;
     public required ProcessedField[] Fields;
+    public required int VirtualFunctionSize;
     public ProcessedVirtualFunction[]? VirtualFunctions; // null if there are no virtual functions, empty if there's a vtable with unknown contents
     public required ProcessedMemberFunction[] MemberFunctions;
     public ProcessedMemberFunction[]? StaticMemberFunctions;
@@ -863,6 +868,10 @@ public void WriteYaml(IEmitter emitter, object? value, Type type) {
             ProcessedFieldConverter.Instance.WriteYaml(emitter, field, field.GetType());
         }
         emitter.Emit(new SequenceEnd());
+        if (s.VirtualFunctionSize != 0) {
+            emitter.Emit(new Scalar("vtable_size"));
+            emitter.Emit(new Scalar(s.VirtualFunctionSize.ToString()));
+        }
         if (s.VirtualFunctions != null) {
             emitter.Emit(new Scalar("virtual_functions"));
             emitter.Emit(new SequenceStart(null, null, true, SequenceStyle.Block));

FFXIVClientStructs/FFXIV/Client/Game/ActionManager.cs

@@ -59,6 +59,14 @@ public unsafe partial struct ActionManager {
     [FieldOffset(0x124), FixedSizeArray] internal FixedSizeArray24<uint> _blueMageActions;
     [FieldOffset(0x184), FixedSizeArray] internal FixedSizeArray80<RecastDetail> _cooldowns;
 
+    // used for some actions that are only conditionally usable, corresponding timer is set to 5s and ticks down every frame when ActionEffect is received
+    // 0 = unused (padding bytes?)
+    // 1 = player's action is dodged by any character (including player, i.e. SGE Pepsis)
+    // 2 = player blocks
+    // 3 = player parries
+    // 4 = player dodges
+    [FieldOffset(0x7C4), FixedSizeArray] internal FixedSizeArray5<float> _procTimers;
+
     [FieldOffset(0x7E8)] public float DistanceToTargetHitbox; // distance to target minus both self & target hitbox radius, clamped to 0
 
     /// <summary>

FFXIVClientStructs/FFXIV/Client/Game/Event/EventFramework.cs

@@ -1,6 +1,7 @@
 using FFXIVClientStructs.FFXIV.Client.Game.InstanceContent;
 using FFXIVClientStructs.FFXIV.Client.Game.MassivePcContent;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
+using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Common.Lua;
 
 namespace FFXIVClientStructs.FFXIV.Client.Game.Event;
@@ -67,6 +68,9 @@ public void MaterializeItem(InventoryItem* itemSlot, MaterializeEntryId entryId)
         MaterializeItem(new EventId { ContentId = EventHandlerContent.Materialize, EntryId = (ushort)entryId }, itemSlot->Container, itemSlot->Slot, 0);
     }
 
+    [MemberFunction("E8 ?? ?? ?? ?? 4C 8B 46 ?? 49 BF")]
+    public partial void GetEventMapMarkers(ushort territoryId, StdVector<MapMarkerData>* markerVector);
+
     [MemberFunction("E8 ?? ?? ?? ?? 41 0F B7 4E ?? 3B C8")]
     public static partial uint GetCurrentContentId();
 
@@ -79,6 +83,9 @@ public void MaterializeItem(InventoryItem* itemSlot, MaterializeEntryId entryId)
     [MemberFunction("48 83 EC 28 48 8B 05 ?? ?? ?? ?? 48 85 C0 74 2C")]
     public static partial bool CanLeaveCurrentContent();
 
+    [MemberFunction("E8 ?? ?? ?? ?? 48 8B 43 ?? 41 B2")]
+    public static partial void LeaveCurrentContent(bool forced = false);
+
     private T* GetInstanceContentDirector<T>(InstanceContentType instanceContentType) where T : unmanaged {
         var instanceDirector = GetInstanceContentDirector();
         if (instanceDirector == null || instanceDirector->InstanceContentType != instanceContentType)

FFXIVClientStructs/FFXIV/Client/Game/Fate/FateManager.cs

@@ -30,4 +30,10 @@ public unsafe partial struct FateManager {
 
     [MemberFunction("40 53 48 83 EC ?? 48 8B 81 ?? ?? ?? ?? 49 8B D8")]
     public partial bool TryGetFatePosition(ushort fateId, Vector3* position);
+
+    [MemberFunction("40 53 48 83 EC ?? 48 8B 91 ?? ?? ?? ?? 48 8B D9 48 85 D2 0F 84 ?? ?? ?? ?? E8")]
+    public partial FateContext* LevelSync();
+
+    [MemberFunction("48 83 EC ?? 0F B7 42 ?? 66 39 81")]
+    public partial bool IsSyncedToFate(FateContext* fate);
 }

FFXIVClientStructs/FFXIV/Client/Game/InstanceContent/ContentDirector.cs

@@ -14,6 +14,8 @@ public unsafe partial struct ContentDirector {
 
     [FieldOffset(0x580)] public DutyActionManager DutyActionManager;
 
+    [FieldOffset(0xCE8)] public MapEffectList* MapEffects;
+
     [FieldOffset(0xCF0)] private DynamicEventContainer* DynamicEvents;
 
     [FieldOffset(0xD48)] public float ContentTimeLeft;
@@ -24,4 +26,19 @@ public unsafe partial struct ContentDirector {
     /// <returns>Time in seconds</returns>
     [VirtualFunction(313)]
     public partial uint GetContentTimeMax();
+
+    [GenerateInterop]
+    [StructLayout(LayoutKind.Explicit, Size = 0x608)]
+    public partial struct MapEffectList {
+        [FieldOffset(0x00), FixedSizeArray] internal FixedSizeArray128<MapEffectItem> _items;
+        [FieldOffset(0x602)] public ushort ItemCount;
+        [FieldOffset(0x604)] public byte Dirty;
+    }
+
+    [StructLayout(LayoutKind.Explicit, Size = 0xC)]
+    public struct MapEffectItem {
+        [FieldOffset(0x00)] public uint LayoutId;
+        [FieldOffset(0x08)] public ushort State;
+        [FieldOffset(0x0A)] public byte Flags;
+    }
 }

FFXIVClientStructs/FFXIV/Client/Game/InstanceContent/DynamicEventContainer.cs

@@ -72,6 +72,9 @@ public unsafe partial struct DynamicEvent {
     [FieldOffset(0x154)] public byte MaxParticipants2;
     [FieldOffset(0x170)] public MapMarkerData MapMarker;
     [FieldOffset(0x1C0)] public DynamicEventContainer* EventContainer;
+
+    [MemberFunction("E8 ?? ?? ?? ?? 84 C0 74 ?? 44 0F B7 03")]
+    public partial bool IsActive();
 }
 
 public enum DynamicEventState : byte {

FFXIVClientStructs/FFXIV/Client/Game/InstanceContent/PublicContentOccultCrescent.cs

@@ -44,20 +44,22 @@ public unsafe partial struct PublicContentOccultCrescent {
     public static partial bool ChangeSupportJob(byte id);
 }
 
+[GenerateInterop]
 [StructLayout(LayoutKind.Explicit, Size = 0x24)]
-public struct OccultCrescentMKDData {
+public partial struct OccultCrescentMKDData {
     [FieldOffset(0x00), CExporterExcelBegin("MKDData")] public uint QuestId;
     [FieldOffset(0x04)] public uint ZoneNameId; // Addon RowId
-    [FieldOffset(0x08), FixedSizeArray] internal FixedSizeArray2<uint> _currencyItemIds;
-    [FieldOffset(0x10)] public uint CipherItemId;
-    [FieldOffset(0x14), FixedSizeArray] internal FixedSizeArray2<uint> _currencyNameIds; // Addon RowIds
-    [FieldOffset(0x1C)] public int CipherNameId;
+    [FieldOffset(0x08), FixedSizeArray] internal FixedSizeArray3<uint> _currencyItemIds;
+    [FieldOffset(0x10), Obsolete("Use CurrencyItemIds[2] instead")] public uint CipherItemId;
+    [FieldOffset(0x14), FixedSizeArray] internal FixedSizeArray3<uint> _currencyNameIds; // Addon RowIds
+    [FieldOffset(0x1C), Obsolete("Use CurrencyNameIds[2] instead")] public int CipherNameId;
     [FieldOffset(0x20)] public byte Unknown8; // Minimum Knowledge Level?
     [FieldOffset(0x21), CExporterExcelEnd] public byte Unknown9;
 }
 
+[GenerateInterop]
 [StructLayout(LayoutKind.Explicit, Size = 0x5A)] // unsure how long
-public struct OccultCrescentState {
+public partial struct OccultCrescentState {
     [FieldOffset(0x00), FixedSizeArray] internal FixedSizeArray13<uint> _supportJobExperience;
     [FieldOffset(0x34)] public uint CurrentKnowledge;
     [FieldOffset(0x38)] public uint NeededKnowledge;

FFXIVClientStructs/FFXIV/Client/Game/InventoryManager.cs

@@ -112,6 +112,9 @@ public unsafe partial struct InventoryManager {
     [MemberFunction("E8 ?? ?? ?? ?? 48 8B 4B ?? 40 88 71")]
     public partial void SetRetainerMarketPrice(short slot, uint price);
 
+    [MemberFunction("E8 ?? ?? ?? ?? 39 6B 38")]
+    public partial void SetSlotUnblocked(InventoryType type, short slot);
+
     /// <summary> Gets the number of (limited) tomestones the user has acquired during the current reset cycle. </summary>
     public int GetWeeklyAcquiredTomestoneCount() => GetLimitedTomestoneCount(GetSpecialItemId(9));
 }

FFXIVClientStructs/FFXIV/Client/Game/Object/Treasure.cs

@@ -5,4 +5,13 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Object;
 [GenerateInterop]
 [Inherits<GameObject>]
 [StructLayout(LayoutKind.Explicit, Size = 0x200)]
-public unsafe partial struct Treasure;
+public unsafe partial struct Treasure {
+    [FieldOffset(0x1EC)] public TreasureFlags Flags;
+
+    [Flags]
+    public enum TreasureFlags : byte {
+        None = 0,
+        Opened = 1,
+        FadedOut = 2
+    }
+}

FFXIVClientStructs/FFXIV/Client/System/Input/SoftKeyboardDeviceInterface.cs

@@ -31,7 +31,7 @@ public unsafe partial struct SoftKeyboardDeviceInterface {
     public partial bool IsSoftKeyboardOpen();
 
     // Client::System::Input::SoftKeyboardDeviceInterface::SoftKeyboardInputInterface
-    [GenerateInterop]
+    [GenerateInterop(true)]
     [StructLayout(LayoutKind.Explicit, Size = 0x8)]
     public unsafe partial struct SoftKeyboardInputInterface {
         // CAUTION: May be the concrete class' dtor!