Move AtkOperationGuide inside AtkStage

aers · Jan 9, 2025 · d9dd8a6 · d9dd8a6
1 parent 6942d15
commit d9dd8a6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/FFXIVClientStructs/FFXIV/Component/GUI/AtkOperationGuide.cs b/FFXIVClientStructs/FFXIV/Component/GUI/AtkOperationGuide.cs
diff --git a/FFXIVClientStructs/FFXIV/Component/GUI/AtkStage.cs b/FFXIVClientStructs/FFXIV/Component/GUI/AtkStage.cs
@@ -28,7 +28,7 @@ public unsafe partial struct AtkStage {
     [FieldOffset(0x168)] public AtkTooltipManager TooltipManager;
     [FieldOffset(0x2B8)] public DialogueStruct Dialogue;
     [FieldOffset(0x2F8)] public FilterStruct Filter;
-    [FieldOffset(0x308)] public AtkOperationGuide AtkOperationGuide;
+    [FieldOffset(0x308)] public OperationGuideStruct OperationGuide;
     [FieldOffset(0x338)] public AtkCursor AtkCursor;
     [FieldOffset(0x358), FixedSizeArray] internal FixedSizeArray32<AtkEventDispatcher> _atkEventDispatcher;
     [FieldOffset(0x858)] public uint NextEventDispatcherIndex;
@@ -79,7 +79,24 @@ public struct FilterStruct {
         [FieldOffset(0x00)] public AtkStage* AtkStage;
         [FieldOffset(0x08)] public short NumActiveSystemFilters;
         [FieldOffset(0x0A)] public short NumActiveFilters;
-        [FieldOffset(0x0C)] public short SomeOtherNum;
-        [FieldOffset(0x0E)] public short SomeAddonId;
+        [FieldOffset(0x0C)] private short SomeOtherNum;
+        [FieldOffset(0x0E)] private short SomeAddonId;
+    }
+
+    [StructLayout(LayoutKind.Explicit, Size = 0x30)]
+    public unsafe struct OperationGuideStruct {
+        [FieldOffset(0x00)] public AtkStage* AtkStage;
+        [FieldOffset(0x08)] private AtkUnitBase* UnkUnitBase1;
+        [FieldOffset(0x10)] private AtkUnitBase* UnkUnitBase2;
+        [FieldOffset(0x18)] private byte Unk18;
+        [FieldOffset(0x19)] private byte Unk19;
+        [FieldOffset(0x1A)] private byte Unk1A;
+        [FieldOffset(0x1B)] private byte Unk1B;
+        [FieldOffset(0x1C)] private short X;
+        [FieldOffset(0x1E)] private short Y;
+        [FieldOffset(0x20)] private short Width;
+        [FieldOffset(0x22)] private short Height;
+        [FieldOffset(0x24)] private float ScaleX; // result of ScaleX / Scale
+        [FieldOffset(0x28)] private float Scale;
     }
 }