Merge pull request #1352 from Haselnussbomber/some-agent-fixes

Fix AgentTelepotTown, fix Exp fields in AgentHUD

Author: pohky

FFXIVClientStructs/FFXIV/Client/Game/UI/PlayerState.cs

@@ -214,6 +214,8 @@ public float GetDesynthesisLevel(uint classJobId)
     /// |   3 | Eureka      | Is Elemental Level Synced    |
     /// |   4 | Eureka      | Current Elemental Level      |
     /// |   5 | Bozja       | Current Resistance Rank      |
+    /// |   6 | TerritoryIntendedUse 61 | Unknown          |
+    /// |   7 | TerritoryIntendedUse 61 | Unknown          |
     /// |-----|-------------|------------------------------|
     /// </code>
     /// </summary>

FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentHUD.cs

@@ -50,10 +50,11 @@ public unsafe partial struct AgentHUD {
     [FieldOffset(0x3564)] public uint ExpClassJobId;
     [FieldOffset(0x3568)] public ushort ExpLevel;
     [FieldOffset(0x356A)] public ushort ExpContentLevel; // level in eureka and bozja for example
-    [FieldOffset(0x356C)] public bool ExpIsLevelSynced;
-    [FieldOffset(0x356D)] public bool ExpUnkBool2;
-    [FieldOffset(0x356E)] public bool ExpIsMaxLevel;
-    [FieldOffset(0x356F)] public bool ExpIsInEureka;
+    [FieldOffset(0x356C), Obsolete("Use ExpFlags.HasFlag(AgentHudExpFlag.Synced)", true)] public bool ExpIsLevelSynced;
+    [FieldOffset(0x356D), Obsolete("Use ExpFlags.HasFlag(AgentHudExpFlag.Unk2)", true)] public bool ExpUnkBool2;
+    [FieldOffset(0x356E), Obsolete("Use ExpFlags.HasFlag(AgentHudExpFlag.MaxLevel)", true)] public bool ExpIsMaxLevel;
+    [FieldOffset(0x356F), Obsolete("Use ExpFlags.HasFlag(AgentHudExpFlag.InEureka)", true)] public bool ExpIsInEureka;
+    [FieldOffset(0x356C)] public AgentHudExpFlag ExpFlags;
 
     [FieldOffset(0x3578), FixedSizeArray] internal FixedSizeArray16<HudQueuedBattleTalk> _queuedBattleTalks;
 
@@ -160,3 +161,14 @@ public unsafe struct DisplayStatus {
     [MemberFunction("E8 ?? ?? ?? ?? 4D 8B CF 4C 8B C5 49 8B D6 48 8B CF")]
     public partial void Update(NumberArrayData* numberArray, StringArrayData* stringArray);
 }
+
+[Flags]
+public enum AgentHudExpFlag : byte {
+    None = 0,
+    Unk1 = 1 << 0,
+    Synced = 1 << 1,
+    Unk2 = 1 << 2,
+    MaxLevel = 1 << 3,
+    InEureka = 1 << 4,
+    Unk5 = 1 << 5, // In TerritoryIntendedUse 61?
+}

FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentTelepotTown.cs

@@ -10,15 +10,15 @@ namespace FFXIVClientStructs.FFXIV.Client.UI.Agent;
 public unsafe partial struct AgentTelepotTown {
     [FieldOffset(0x28)] public AgentTelepotTownData* Data;
 
-    [MemberFunction("48 89 5C 24 ?? 57 48 83 EC 50 0F B6 FA")]
+    [MemberFunction("E9 ?? ?? ?? ?? 83 F9 01 0F 85 ?? ?? ?? ?? 48 8B 4B 28")]
     public partial void TeleportToAetheryte(byte index);
 }
 
-[StructLayout(LayoutKind.Explicit, Size = 0xD168)]
+[StructLayout(LayoutKind.Explicit, Size = 0xDE20)]
 public struct AgentTelepotTownData {
     [FieldOffset(0x4)] public byte CurrentAetheryte; // the one you're standing at
 
-    [FieldOffset(0x70A)] public byte SelectedAetheryte;
+    [FieldOffset(0x70E)] public byte SelectedAetheryte;
 
-    [FieldOffset(0x70C)] public byte Flags;
+    [FieldOffset(0x710)] public byte Flags;
 }

ida/data.yml

@@ -10049,7 +10049,7 @@ classes:
         base: Client::UI::Agent::AgentInterface
     funcs:
       0x140AC4360: ctor
-#fail       0x140AA33F0: TeleportToAetheryte
+      0x140AC6830: TeleportToAetheryte
   Client::UI::Agent::AgentSocial:
     vtbls:
       - ea: 0x142005BB0