Merge remote-tracking branch 'upstream/main'

Author: AtmoOmen

FFXIVClientStructs/FFXIV/Client/Enums/TerritoryIntendedUse.cs

@@ -4,7 +4,7 @@ public enum TerritoryIntendedUse : byte {
     Town = 0,
     Overworld = 1,
     Inn = 2,
-    Dungeon = 3, // Dungeons, Guildhests, Mahjong, Air Force One
+    Dungeon = 3, // Dungeons, Guildhests, Mahjong
     VariantDungeon = 4,
     MordionGaol = 5,
     OpeningArea = 6,

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

@@ -772,126 +772,127 @@ public enum InputId {
     TERM_FILTER = 521,
     MENU_TOFU = 522,
     QUICK_PANEL = 523,
-    PAD_MAP = 524,
-    PAD_JUMPANDCANCELCAST = 525,
-    PAD_LOCKANDSWARD = 526,
-    PAD_SWARD = 527,
-    PAD_LOCKANDSIT = 528,
-    PAD_MAINMENUFOCUS = 529,
-    PAD_HUDFOCUS = 530,
-    PAD_MODECHANGE = 531,
-    PAD_CROSSEDITMODE = 532,
-    PAD_DRAWN_SWORD = 533,
-    PAD_CAMERA_LOCK_ON_ONLY = 534,
-    PAD_QUICKPANEL = 535,
-    PAD_MACRO_98 = 536,
-    PAD_MACRO_99 = 537,
-    PAD_DISMOUNT = 538,
-
-    PAD_MAP_ZOOM = 549,
-    PAD_MAP_RESET = 550,
-    PAD_MAP_MENU = 551,
-
-    KEY_SCREENSHOT = 554,
-    PAD_SCREENSHOT = 555,
-
-    PERFORMANCE_MODE_OCTAVE_HIGHER = 567,
-    PERFORMANCE_MODE_OCTAVE_LOWER = 568,
-    PERFORMANCE_MODE_SHARP = 569,
-    PERFORMANCE_MODE_FLAT = 570,
-    PERFORMANCE_MODE_C4 = 571,
-    PERFORMANCE_MODE_C4_SHARP = 572,
-    PERFORMANCE_MODE_D4 = 573,
-    PERFORMANCE_MODE_D4_SHARP = 574,
-    PERFORMANCE_MODE_E4 = 575,
-    PERFORMANCE_MODE_F4 = 576,
-    PERFORMANCE_MODE_F4_SHARP = 577,
-    PERFORMANCE_MODE_G4 = 578,
-    PERFORMANCE_MODE_G4_SHARP = 579,
-    PERFORMANCE_MODE_A4 = 580,
-    PERFORMANCE_MODE_A4_SHARP = 581,
-    PERFORMANCE_MODE_B4 = 582,
-    PERFORMANCE_MODE_C5 = 583,
-    PERFORMANCE_MODE_TONE_NEXT = 584,
-    PERFORMANCE_MODE_TONE_PREV = 585,
-    PERFORMANCE_MODE_TONE0 = 586,
-    PERFORMANCE_MODE_TONE1 = 587,
-    PERFORMANCE_MODE_TONE2 = 588,
-    PERFORMANCE_MODE_TONE3 = 589,
-    PERFORMANCE_MODE_TONE4 = 590,
-    PERFORMANCE_MODE_EX_OCTAVE_HIGHER = 591,
-    PERFORMANCE_MODE_EX_OCTAVE_LOWER = 592,
-    PERFORMANCE_MODE_EX_SHARP = 593,
-    PERFORMANCE_MODE_EX_FLAT = 594,
-    PERFORMANCE_MODE_EX_C3 = 595,
-    PERFORMANCE_MODE_EX_C3_SHARP = 596,
-    PERFORMANCE_MODE_EX_D3 = 597,
-    PERFORMANCE_MODE_EX_D3_SHARP = 598,
-    PERFORMANCE_MODE_EX_E3 = 599,
-    PERFORMANCE_MODE_EX_F3 = 600,
-    PERFORMANCE_MODE_EX_F3_SHARP = 601,
-    PERFORMANCE_MODE_EX_G3 = 602,
-    PERFORMANCE_MODE_EX_G3_SHARP = 603,
-    PERFORMANCE_MODE_EX_A3 = 604,
-    PERFORMANCE_MODE_EX_A3_SHARP = 605,
-    PERFORMANCE_MODE_EX_B3 = 606,
-    PERFORMANCE_MODE_EX_C4 = 607,
-    PERFORMANCE_MODE_EX_C4_SHARP = 608,
-    PERFORMANCE_MODE_EX_D4 = 609,
-    PERFORMANCE_MODE_EX_D4_SHARP = 610,
-    PERFORMANCE_MODE_EX_E4 = 611,
-    PERFORMANCE_MODE_EX_F4 = 612,
-    PERFORMANCE_MODE_EX_F4_SHARP = 613,
-    PERFORMANCE_MODE_EX_G4 = 614,
-    PERFORMANCE_MODE_EX_G4_SHARP = 615,
-    PERFORMANCE_MODE_EX_A4 = 616,
-    PERFORMANCE_MODE_EX_A4_SHARP = 617,
-    PERFORMANCE_MODE_EX_B4 = 618,
-    PERFORMANCE_MODE_EX_C5 = 619,
-    PERFORMANCE_MODE_EX_C5_SHARP = 620,
-    PERFORMANCE_MODE_EX_D5 = 621,
-    PERFORMANCE_MODE_EX_D5_SHARP = 622,
-    PERFORMANCE_MODE_EX_E5 = 623,
-    PERFORMANCE_MODE_EX_F5 = 624,
-    PERFORMANCE_MODE_EX_F5_SHARP = 625,
-    PERFORMANCE_MODE_EX_G5 = 626,
-    PERFORMANCE_MODE_EX_G5_SHARP = 627,
-    PERFORMANCE_MODE_EX_A5 = 628,
-    PERFORMANCE_MODE_EX_A5_SHARP = 629,
-    PERFORMANCE_MODE_EX_B5 = 630,
-    PERFORMANCE_MODE_EX_C6 = 631,
-    PERFORMANCE_MODE_EX_TONE_NEXT = 632,
-    PERFORMANCE_MODE_EX_TONE_PREV = 633,
-    PERFORMANCE_MODE_EX_TONE0 = 634,
-    PERFORMANCE_MODE_EX_TONE1 = 635,
-    PERFORMANCE_MODE_EX_TONE2 = 636,
-    PERFORMANCE_MODE_EX_TONE3 = 637,
-    PERFORMANCE_MODE_EX_TONE4 = 638,
-
-    VIRTUAL_PAD_L1 = 654,
-    VIRTUAL_PAD_L2 = 655,
-    VIRTUAL_PAD_L3 = 656,
-    VIRTUAL_PAD_R1 = 657,
-    VIRTUAL_PAD_R2 = 658,
-    VIRTUAL_PAD_R3 = 659,
-    VIRTUAL_PAD_UP = 660,
-    VIRTUAL_PAD_DOWN = 661,
-    VIRTUAL_PAD_LEFT = 662,
-    VIRTUAL_PAD_RIGHT = 663,
-    VIRTUAL_PAD_TRIANGLE = 664,
-    VIRTUAL_PAD_CROSS = 665,
-    VIRTUAL_PAD_SQUARE = 666,
-    VIRTUAL_PAD_CIRCLE = 667,
-    VIRTUAL_PAD_START = 668,
-    VIRTUAL_PAD_SELECT = 669,
-    VIRTUAL_PAD_LSTICK_UP = 670,
-    VIRTUAL_PAD_LSTICK_DOWN = 671,
-    VIRTUAL_PAD_LSTICK_LEFT = 672,
-    VIRTUAL_PAD_LSTICK_RIGHT = 673,
-    VIRTUAL_PAD_RSTICK_UP = 674,
-    VIRTUAL_PAD_RSTICK_DOWN = 675,
-    VIRTUAL_PAD_RSTICK_LEFT = 676,
-    VIRTUAL_PAD_RSTICK_RIGHT = 677,
+    XBM_BOOK = 524,
+    PAD_MAP = 525,
+    PAD_JUMPANDCANCELCAST = 526,
+    PAD_LOCKANDSWARD = 527,
+    PAD_SWARD = 528,
+    PAD_LOCKANDSIT = 529,
+    PAD_MAINMENUFOCUS = 530,
+    PAD_HUDFOCUS = 531,
+    PAD_MODECHANGE = 532,
+    PAD_CROSSEDITMODE = 533,
+    PAD_DRAWN_SWORD = 534,
+    PAD_CAMERA_LOCK_ON_ONLY = 535,
+    PAD_QUICKPANEL = 536,
+    PAD_MACRO_98 = 537,
+    PAD_MACRO_99 = 538,
+    PAD_DISMOUNT = 539,
+
+    PAD_MAP_ZOOM = 550,
+    PAD_MAP_RESET = 551,
+    PAD_MAP_MENU = 552,
+
+    KEY_SCREENSHOT = 555,
+    PAD_SCREENSHOT = 556,
+
+    PERFORMANCE_MODE_OCTAVE_HIGHER = 568,
+    PERFORMANCE_MODE_OCTAVE_LOWER = 569,
+    PERFORMANCE_MODE_SHARP = 570,
+    PERFORMANCE_MODE_FLAT = 571,
+    PERFORMANCE_MODE_C4 = 572,
+    PERFORMANCE_MODE_C4_SHARP = 573,
+    PERFORMANCE_MODE_D4 = 574,
+    PERFORMANCE_MODE_D4_SHARP = 575,
+    PERFORMANCE_MODE_E4 = 576,
+    PERFORMANCE_MODE_F4 = 577,
+    PERFORMANCE_MODE_F4_SHARP = 578,
+    PERFORMANCE_MODE_G4 = 579,
+    PERFORMANCE_MODE_G4_SHARP = 580,
+    PERFORMANCE_MODE_A4 = 581,
+    PERFORMANCE_MODE_A4_SHARP = 582,
+    PERFORMANCE_MODE_B4 = 583,
+    PERFORMANCE_MODE_C5 = 584,
+    PERFORMANCE_MODE_TONE_NEXT = 585,
+    PERFORMANCE_MODE_TONE_PREV = 586,
+    PERFORMANCE_MODE_TONE0 = 587,
+    PERFORMANCE_MODE_TONE1 = 588,
+    PERFORMANCE_MODE_TONE2 = 589,
+    PERFORMANCE_MODE_TONE3 = 590,
+    PERFORMANCE_MODE_TONE4 = 591,
+    PERFORMANCE_MODE_EX_OCTAVE_HIGHER = 592,
+    PERFORMANCE_MODE_EX_OCTAVE_LOWER = 593,
+    PERFORMANCE_MODE_EX_SHARP = 594,
+    PERFORMANCE_MODE_EX_FLAT = 595,
+    PERFORMANCE_MODE_EX_C3 = 596,
+    PERFORMANCE_MODE_EX_C3_SHARP = 597,
+    PERFORMANCE_MODE_EX_D3 = 598,
+    PERFORMANCE_MODE_EX_D3_SHARP = 599,
+    PERFORMANCE_MODE_EX_E3 = 600,
+    PERFORMANCE_MODE_EX_F3 = 601,
+    PERFORMANCE_MODE_EX_F3_SHARP = 602,
+    PERFORMANCE_MODE_EX_G3 = 603,
+    PERFORMANCE_MODE_EX_G3_SHARP = 604,
+    PERFORMANCE_MODE_EX_A3 = 605,
+    PERFORMANCE_MODE_EX_A3_SHARP = 606,
+    PERFORMANCE_MODE_EX_B3 = 607,
+    PERFORMANCE_MODE_EX_C4 = 608,
+    PERFORMANCE_MODE_EX_C4_SHARP = 609,
+    PERFORMANCE_MODE_EX_D4 = 610,
+    PERFORMANCE_MODE_EX_D4_SHARP = 611,
+    PERFORMANCE_MODE_EX_E4 = 612,
+    PERFORMANCE_MODE_EX_F4 = 613,
+    PERFORMANCE_MODE_EX_F4_SHARP = 614,
+    PERFORMANCE_MODE_EX_G4 = 615,
+    PERFORMANCE_MODE_EX_G4_SHARP = 616,
+    PERFORMANCE_MODE_EX_A4 = 617,
+    PERFORMANCE_MODE_EX_A4_SHARP = 618,
+    PERFORMANCE_MODE_EX_B4 = 619,
+    PERFORMANCE_MODE_EX_C5 = 620,
+    PERFORMANCE_MODE_EX_C5_SHARP = 621,
+    PERFORMANCE_MODE_EX_D5 = 622,
+    PERFORMANCE_MODE_EX_D5_SHARP = 623,
+    PERFORMANCE_MODE_EX_E5 = 624,
+    PERFORMANCE_MODE_EX_F5 = 625,
+    PERFORMANCE_MODE_EX_F5_SHARP = 626,
+    PERFORMANCE_MODE_EX_G5 = 627,
+    PERFORMANCE_MODE_EX_G5_SHARP = 628,
+    PERFORMANCE_MODE_EX_A5 = 629,
+    PERFORMANCE_MODE_EX_A5_SHARP = 630,
+    PERFORMANCE_MODE_EX_B5 = 631,
+    PERFORMANCE_MODE_EX_C6 = 632,
+    PERFORMANCE_MODE_EX_TONE_NEXT = 633,
+    PERFORMANCE_MODE_EX_TONE_PREV = 634,
+    PERFORMANCE_MODE_EX_TONE0 = 635,
+    PERFORMANCE_MODE_EX_TONE1 = 636,
+    PERFORMANCE_MODE_EX_TONE2 = 637,
+    PERFORMANCE_MODE_EX_TONE3 = 638,
+    PERFORMANCE_MODE_EX_TONE4 = 639,
+
+    VIRTUAL_PAD_L1 = 655,
+    VIRTUAL_PAD_L2 = 656,
+    VIRTUAL_PAD_L3 = 657,
+    VIRTUAL_PAD_R1 = 658,
+    VIRTUAL_PAD_R2 = 659,
+    VIRTUAL_PAD_R3 = 660,
+    VIRTUAL_PAD_UP = 661,
+    VIRTUAL_PAD_DOWN = 662,
+    VIRTUAL_PAD_LEFT = 663,
+    VIRTUAL_PAD_RIGHT = 664,
+    VIRTUAL_PAD_TRIANGLE = 665,
+    VIRTUAL_PAD_CROSS = 666,
+    VIRTUAL_PAD_SQUARE = 667,
+    VIRTUAL_PAD_CIRCLE = 668,
+    VIRTUAL_PAD_START = 669,
+    VIRTUAL_PAD_SELECT = 670,
+    VIRTUAL_PAD_LSTICK_UP = 671,
+    VIRTUAL_PAD_LSTICK_DOWN = 672,
+    VIRTUAL_PAD_LSTICK_LEFT = 673,
+    VIRTUAL_PAD_LSTICK_RIGHT = 674,
+    VIRTUAL_PAD_RSTICK_UP = 675,
+    VIRTUAL_PAD_RSTICK_DOWN = 676,
+    VIRTUAL_PAD_RSTICK_LEFT = 677,
+    VIRTUAL_PAD_RSTICK_RIGHT = 678,
 }
 
 public enum SeVirtualKey : byte {

FFXIVClientStructs/FFXIV/Client/UI/AddonRaidFinder.cs

@@ -20,15 +20,16 @@ public unsafe partial struct AddonRaidFinder {
     [FieldOffset(0x2C8)] public AtkComponentDropDownList* OrderByDropDownList;
     [FieldOffset(0x2D0)] public AtkComponentButton* DutyTypeButton;
 
-    [FieldOffset(0x390)] public Utf8String RaidsTooltipString;
-    [FieldOffset(0x3F8)] public Utf8String TrialsTooltipString;
-    [FieldOffset(0x460)] public Utf8String UltimatesTooltipString;
+    [FieldOffset(0x398), FixedSizeArray] internal FixedSizeArray4<Utf8String> _tabTooltipStrings;
+    [FieldOffset(0x398), Obsolete("Use TabTooltipStrings[0]")] public Utf8String RaidsTooltipString;
+    [FieldOffset(0x400), Obsolete("Use TabTooltipStrings[1]")] public Utf8String TrialsTooltipString;
+    [FieldOffset(0x4D0), Obsolete("Use TabTooltipStrings[3]")] public Utf8String UltimatesTooltipString;
 
-    [FieldOffset(0x4EC)] public int HighlightedRow;
-    [FieldOffset(0x4F4)] public int NumDisplayedEntries; // Use to index into EntryInfoArray
-    [FieldOffset(0x4F8)] public int SelectedTab;
+    [FieldOffset(0x56C)] public int HighlightedRow;
+    [FieldOffset(0x574)] public int NumDisplayedEntries; // Use to index into EntryInfoArray
+    [FieldOffset(0x578)] public int SelectedTab;
 
-    [FieldOffset(0x500), FixedSizeArray] internal FixedSizeArray8<RaidFinderDutyEntry> _entries;
+    [FieldOffset(0x580), FixedSizeArray] internal FixedSizeArray8<RaidFinderDutyEntry> _entries;
 }
 
 [StructLayout(LayoutKind.Explicit, Size = 0x140)]

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

@@ -0,0 +1,35 @@
+namespace FFXIVClientStructs.FFXIV.Client.UI.Agent;
+
+// Client::UI::Agent::AgentRaidFinder
+//   Client::UI::Agent::AgentInterface
+//     Component::GUI::AtkModuleInterface::AtkEventInterface
+[Agent(AgentId.RaidFinder)]
+[GenerateInterop]
+[Inherits<AgentInterface>]
+[StructLayout(LayoutKind.Explicit, Size = 0x2368)]
+public partial struct AgentRaidFinder {
+    [FieldOffset(0x2C)] public uint SelectedEntry;
+
+    [FieldOffset(0x1EA8), FixedSizeArray] internal FixedSizeArray4<TabData> _tabs; // filled here: 40 55 53 57 41 54 41 55 48 8D 6C 24 ?? 48 81 EC ?? ?? ?? ?? 48 8B D9 (a1 is the agent)
+    [FieldOffset(0x22E8)] public uint SelectedTab;
+
+    [GenerateInterop]
+    [StructLayout(LayoutKind.Explicit, Size = 0x110)]
+    public partial struct TabData {
+        [FieldOffset(0x00), FixedSizeArray] internal FixedSizeArray5<TabEntryData> _entries;
+
+        [FieldOffset(0xA0)] public int EntryCount;
+
+        [FieldOffset(0xA8)] public Utf8String Label;
+
+        [StructLayout(LayoutKind.Explicit, Size = 0x14)]
+        public struct TabEntryData {
+            [FieldOffset(0x00)] public uint InstanceContentId;
+            [FieldOffset(0x04)] public uint ContentFinderConditionId;
+            [FieldOffset(0x08)] public ushort SortKey;
+            [FieldOffset(0x0C)] private int UnkC;
+            [FieldOffset(0x10)] private byte UnkFlags1;
+            [FieldOffset(0x11)] private byte UnkFlags2;
+        }
+    }
+}

ida/data.yml

@@ -7290,10 +7290,10 @@ classes:
       92: ResolveDecalPath
       93: ResolveVfxPath
       94: ResolveEidPath
-      95: GetDyeFlorSlot
+      95: GetDyeForSlot
       96: GetSkeletonCount
       101: CreateDeformer
-      102: CreateRenderModelForMDL
+      102: CreateRenderModel
       108: IsFreeCompanyCrestVisibleOnSlot
       109: SetFreeCompanyCrestVisibleOnSlot
       110: SetFreeCompanyCrest