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.

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

[Fix] GS Token giveItemId bleed between rando and vanilla saves #3925

Conversation

Malkierian
Copy link
Contributor

@Malkierian Malkierian commented Feb 10, 2024

Currently, if you have rando and vanilla saves at the same time, collect a non-token item from a gold skulltula in the rando save, and just reset to select the vanilla save, all GS tokens will then give you the rando item, even though the token is rendered appropriately. This adds a reset function to z_en_si (GS Token) to set getItemId to vanilla after resetting SoH to prevent this. The reset function also resets the textId, just in case.

Build Artifacts

Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

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

There's two more file level vars that could be cleared/zeroed out in here, but those aren't a blocker for this getting merged, especially considering it sounds like these are being removed anyways with the rando v3 changes.

@Malkierian
Copy link
Contributor Author

If you're talking about getItemId and getItem, I didn't include them because they didn't have file-level defaults because they're always set for randomizer and appear to not be used in vanilla codeflows (otherwise just doing the two wouldn't have worked, I think).

@Archez Archez linked an issue Feb 12, 2024 that may be closed by this pull request
@garrettjoecox garrettjoecox merged commit 0cb4cd1 into HarbourMasters:develop-macready Feb 16, 2024
8 checks passed
@Malkierian Malkierian deleted the fix-token-shuffle-bleed branch February 16, 2024 01:54
@garrettjoecox garrettjoecox mentioned this pull request Feb 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Gold Skultula Bug
4 participants