Rando - Fix ice traps & get item logic #2210
Merged
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
|
Resolves #2168 |
garrettjoecox
approved these changes
Dec 19, 2022
briaguya-ai
reviewed
Dec 20, 2022
| @@ -12,7 +12,7 @@ | |||
|
|
|||
| extern "C" void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEntry) { | |||
| s32 pad; | |||
|
|
|||
| s8 isColoredKeysEnabled = CVar_GetS32("gRandoMatchKeyColors", 0); | |||
There was a problem hiding this comment.
i'm assuming this is because we used to always draw keysanity keys with colors, this makes it so it's a setting?
There was a problem hiding this comment.
Previously the check for using colored keys was done in the logic for deciding to use custom draw functions or not. This just moved the check inside the actual custom draw function so that logic could be cleaned up and be more flexible for colouring more items down the line.
See the changes in z_draw.c and the bottom of z_player_lib.c how it changed the logic there.
|
overall i think this looks like it's ready to merge, could you add a summary of all the things it does to the main PR comment though? |
briaguya-ai
approved these changes
Dec 20, 2022
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.
Fixes and cleans up the logic for grabbing custom draw functions for rando-specific items. This includes moving the check for colored keys inside its custom draw functions instead of the preceding logic grabbing said custom draw functions.
Also fixes ice traps after they showed the fake item model unintentionally after a previous PR. They now show an ice model around the "get item model" to make it clearer the player has received an ice trap instead of an actual item.
Build Artifacts