Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update data.yml, Add AgentInventoryContext::InventoryContextEvent #1275

Merged
merged 4 commits into from
Jan 15, 2025
Merged

Update data.yml, Add AgentInventoryContext::InventoryContextEvent #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dd4fb3
Add AgentInventoryContext::InventoryContextEvent
Haselnussbomber Jan 11, 2025
e633c47
Update data.yml
Haselnussbomber Jan 11, 2025
315166f
Update data.yml
Haselnussbomber Jan 11, 2025
eaabd6a
Update data.yml
Haselnussbomber Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion FFXIVClientStructs/FFXIV/Client/Game/Event/ShopEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
using FFXIVClientStructs.FFXIV.Client.System.String;
using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using FFXIVClientStructs.FFXIV.Common.Component.Excel;
using FFXIVClientStructs.FFXIV.Component.GUI;

namespace FFXIVClientStructs.FFXIV.Client.Game.Event;

// Client::Game::Event::ShopEventHandler
// Client::Game::Event::EventHandler
// Client::UI::Agent::AgentInventoryContext::InventoryContextEvent
[GenerateInterop]
[Inherits<EventHandler>]
[Inherits<EventHandler>, Inherits<AgentInventoryContext.InventoryContextEvent>]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to have a 3rd inheritance that is calling stuff related to Client::Game::Event::FinalizeSceneTask 2 layers deep in vf1 of said inheritance. Not sure if you want to investigate this before merge.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I know, says so in the comments at the start of the struct.
But I didn't want to look into it, because I didn't want to come up with a name. 😅

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ShopSceneTaskScheduler 😛

[StructLayout(LayoutKind.Explicit, Size = 0x32F0)]
public unsafe partial struct ShopEventHandler {
// 0x210: second base class, related to context menu integration for selling items
Expand Down
3 changes: 2 additions & 1 deletion FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentHousingPlant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ namespace FFXIVClientStructs.FFXIV.Client.UI.Agent;
// Client::UI::Agent::AgentHousingPlant
// Client::UI::Agent::AgentInterface
// Component::GUI::AtkModuleInterface::AtkEventInterface
// Client::UI::Agent::AgentInventoryContext::InventoryContextEvent
[Agent(AgentId.HousingPlant)]
[GenerateInterop]
[Inherits<AgentInterface>]
[Inherits<AgentInterface>, Inherits<AgentInventoryContext.InventoryContextEvent>]
[StructLayout(LayoutKind.Explicit, Size = 0x950)]
public unsafe partial struct AgentHousingPlant {
[FieldOffset(0x40)] public uint ContextAddonId;
Expand Down
4 changes: 4 additions & 0 deletions FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentInventoryContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,8 @@ public bool IsContextItemDisabled(int index) {

[MemberFunction("E8 ?? ?? ?? ?? 48 83 C4 ?? 5B C3 8B 83")]
public partial void LowerItemQuality(InventoryItem* itemSlot, InventoryType inventory, int slot, uint addonId);

[GenerateInterop(isInherited: true)]
[StructLayout(LayoutKind.Explicit, Size = 0x8)]
public partial struct InventoryContextEvent; // contains 2 vfs
}
Loading
Loading