Fix some Dark Link issues#5532
Merged
Malkierian merged 1 commit intoHarbourMasters:develop-blairfrom May 29, 2025
Merged
Conversation
serprex
reviewed
May 23, 2025
| COND_VB_SHOULD(VB_TORCH2_HANDLE_CLANKING, CVAR_ENEMY_RANDOMIZER_VALUE != CVAR_ENEMY_RANDOMIZER_DEFAULT, { | ||
| Actor* darkLink = va_arg(args, Actor*); | ||
|
|
||
| if (darkLink->xzDistToPlayer > 100.0f) { |
Contributor
There was a problem hiding this comment.
what happens if this condition is same category check as those above? seems less hackish
Contributor
Author
There was a problem hiding this comment.
Doesn't work as the code this is modifying is only called by Dark Link (it's in z_en_torch2.c).
I chose 100 units for the threshold as I don't think it's possible to sword clank at that distance and so the original purpose of the code doesn't apply.
Malkierian
reviewed
May 23, 2025
serprex
reviewed
May 23, 2025
| COND_VB_SHOULD(VB_LIKE_LIKE_GRAB_PLAYER, CVAR_ENEMY_RANDOMIZER_VALUE != CVAR_ENEMY_RANDOMIZER_DEFAULT, { | ||
| EnRr* likeLike = va_arg(args, EnRr*); | ||
|
|
||
| if (!(likeLike->collider1.base.oc != NULL && likeLike->collider1.base.oc->category == ACTORCAT_PLAYER) && |
Contributor
There was a problem hiding this comment.
does this prevent like like from grabbing player if both link & dark link are on the like like?
Contributor
Author
There was a problem hiding this comment.
No, unless the bump collision with Dark Link overshadowed Link's.
Malkierian
approved these changes
May 25, 2025
ReddestDream
pushed a commit
to ReddestDream/Shipwright
that referenced
this pull request
Jun 3, 2025
krazyjakee
pushed a commit
to krazyjakee/OOT
that referenced
this pull request
Sep 6, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes the following dark link issues in enemy randomizer:
Build Artifacts