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

Override redirection using /ac with placeholder #46

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Override redirection using /ac with placeholder #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Redirect/GameHooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,12 @@ private CursorStatus ValidateCursorPlacement(IntPtr action_manager, Lumina.Excel
}
}

public GameObject? ResolveTarget(string target) {
return target switch {
public GameObject? ResolveTarget(string targetOption, ulong originalTarget) {
return targetOption switch {
"UI Mouseover" => CurrentUIMouseover,
"Model Mouseover" => TargetManager.MouseOverTarget,
"Self" => Services.ClientState.LocalPlayer,
"Target" => TargetManager.Target,
"Target" => Services.ObjectTable.SearchById(originalTarget) ?? TargetManager.Target,
"Focus" => TargetManager.FocusTarget,
"Target of Target" => TargetManager.Target is { } ? TargetManager.Target.TargetObject : null,
"Soft Target" => TargetManager.SoftTarget,
Expand Down Expand Up @@ -257,7 +257,7 @@ private unsafe bool TryActionCallback(IntPtr action_manager, ActionType type, ui
}
}
else {
GameObject? nt = ResolveTarget(t);
GameObject? nt = ResolveTarget(t, target);
if (nt is not null) {
bool ok = adjusted_row.TargetInRangeAndLOS(nt, out var err);
bool tt_ok = adjusted_row.TargetTypeValid(nt);
Expand Down