Tweak: CTMC/CSMC for treasure mini game reward and set loser green rupee as junk #2652
Conversation
This file contains 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
briaguya-ai
approved these changes
Apr 1, 2023
| @@ -645,7 +647,8 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) { | |||
| } | |||
| } | |||
|
|
|||
| if (play->sceneNum != SCENE_TAKARAYA && (cvar == 1 || cvar == 3) && ((agonyCVar > 0 && stoneCheck) | agonyCVar == 0)) { | |||
| // Change size | |||
| if (!isVanilla && (cstmc == 1 || cstmc == 3)) { | |||
There was a problem hiding this comment.
not in-scope for this PR, but figure this is probably something we shouldn't use magic numbers for #2656
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Originally all green rupees (regular green rupees and loser green rupees) were marked as major items for CTMC/CSMC because it was funny for Greg memes. After the introduction of a dedicated Greg item, the regular green rupee was set back to junk, but the loser green rupee was missed. This PR sets the loser green rupee to now also be junk.
This PR also adds the final reward chest in the treasure chest mini game to support CTMC/CSMC (by checking the room of the actor), since before we were excluding the whole scene from using CTMC/CSMC. The rest of the chests still display as vanilla regardless of settings.
Fixes #2633
Build Artifacts