Skip to content

merge upstream changes #6

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

Merged
Yarukon merged 4 commits into from
Jun 24, 2025
Merged

merge upstream changes #6

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
6debe38
Update AtkComponentHoldButton
Haselnussbomber Jun 24, 2025
7198f55
Merge pull request #1462 from Haselnussbomber/update-AtkComponentHold…
aers Jun 24, 2025
29c1d80
7.25 hotfix2
pohky Jun 24, 2025
b5a0b13
Update data.yml
pohky Jun 24, 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
23 changes: 22 additions & 1 deletion FFXIVClientStructs/FFXIV/Component/GUI/AtkComponentHoldButton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,28 @@ namespace FFXIVClientStructs.FFXIV.Component.GUI;
[GenerateInterop]
[Inherits<AtkComponentButton>]
[StructLayout(LayoutKind.Explicit, Size = 0x120)]
public partial struct AtkComponentHoldButton : ICreatable {
public unsafe partial struct AtkComponentHoldButton : ICreatable {
[FieldOffset(0xF0)] public AtkResNode* ProgressResNode;
[FieldOffset(0xF8)] public AtkImageNode* ProgressImageNode;
[FieldOffset(0x100)] public bool IsTargetReached;
[FieldOffset(0x101)] public bool IsEventFired; // seems to be a safety mechanism to prevent multiple events from firing at the same time

[FieldOffset(0x104)] public float Duration;
[FieldOffset(0x108)] public float DecreaseRate;
[FieldOffset(0x10C)] public ProgressState Progress;

[MemberFunction("40 53 48 83 EC 20 48 8B D9 E8 ?? ?? ?? ?? 48 8D 05 ?? ?? ?? ?? C7 83 ?? ?? ?? ?? ?? ?? ?? ?? 48 89 03 33 C0 48 89 83 ?? ?? ?? ?? 48 89 83 ?? ?? ?? ?? 66 89 83 ?? ?? ?? ?? 48 89 83 ?? ?? ?? ??")]
public partial void Ctor();

[GenerateInterop]
[StructLayout(LayoutKind.Explicit, Size = 0x10)]
public partial struct ProgressState {
[FieldOffset(0x00)] public float StartValue;
[FieldOffset(0x04)] public float TargetValue;
[FieldOffset(0x08)] public float CurrentValue;
[FieldOffset(0x0C)] public float EndValue;

[MemberFunction("F3 0F 10 05 ?? ?? ?? ?? 0F 2F C1 F3 0F 11 51")]
public partial void StartProgress(float currentValue, float targetValue, float endValue);
}
}
Loading