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

Jump to bottom

Fix: Show correct Gold Skulltula count in textbox on vanilla saves #2597

Merged
merged 1 commit into from
Mar 8, 2023
Merged

Fix: Show correct Gold Skulltula count in textbox on vanilla saves #2597

merged 1 commit into from
Mar 8, 2023

Conversation

Archez
Copy link
Contributor

@Archez Archez commented Mar 8, 2023 •
edited by github-actions bot

When using the "inject message counts" enhancement and collecting a Gold Skulltua in a vanilla save, the count displayed was always one higher than the actual collected amount. In randomizer saves, the count was displayed correctly.

In looking, gsTokens is incremented during Item_Give() and randomizer saves were performing the Item_Give() after the textbox is started. We were accounting for the wrong number in vanilla saves by adding a +1 in the message injection. However, vanilla saves perform the Item_Give() before the textbox gets started, so the gsTokens count on the save was already incremented.

To address I've removed the +1 from the text display and I've rearranged the logic when collecting a Gold Skulltula token to match the vanilla behavior:

  • First, the Item_Give() is performed
  • Then the textbox is displayed
  • Then the audio fanfare is played

Confirmed message counts work as expected for both vanilla and randomizer saves.

Fixes #2516, Fixes #2075

Build Artifacts

@briaguya-ai briaguya-ai merged commit 2117d98 into HarbourMasters:develop-khan Mar 8, 2023
@Archez Archez deleted the fix-skull-token-count-message branch March 8, 2023 15:37
@briaguya-ai briaguya-ai mentioned this pull request Mar 15, 2023
Closed
Archez added a commit to Archez/Shipwright that referenced this pull request Mar 28, 2023
@Archez
Revert "fix skulltula token count message on vanilla (HarbourMasters#…
ce0c793 
…2597)"

This reverts commit 2117d98.
@Archez Archez mentioned this pull request Mar 28, 2023
Merged
briaguya-ai pushed a commit that referenced this pull request Apr 1, 2023
@Archez
Fix: Actually display correct GS token count in message for vanilla a…
21a3bd9 
…nd rando (#2651)

* Revert "fix skulltula token count message on vanilla (#2597)"

This reverts commit 2117d98.

* fix vanilla vs rando gs token count to be correct
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@briaguya-ai briaguya-ai briaguya-ai approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Archez @briaguya-ai