Item cycling improvements#3456
Merged
briaguya0 merged 6 commits intoHarbourMasters:developfrom Dec 27, 2023
Merged
Conversation
This was previously done with `Inventory_ReplaceItem` but that led to problems when another slot had the same item as the one that's being cycled.
briaguya0
approved these changes
Dec 26, 2023
Contributor
briaguya0
left a comment
There was a problem hiding this comment.
tested the mask select aspect of it locally and it all seems to be working as expected
garrettjoecox
approved these changes
Dec 26, 2023
Archez
approved these changes
Dec 27, 2023
| return gCurrentItemCyclingSlot != -1; | ||
| } | ||
|
|
||
| void KaleidoScope_ResetTradeSelect() { |
Contributor
There was a problem hiding this comment.
Could probably rename this to KaleidoScope_ResetItemCycling() so the name matches the rest of the refactors.
| } | ||
|
|
||
| void KaleidoScope_HandleItemCycles(PlayState* play) { | ||
| KaleidoScope_HandleItemCycleExtras( |
Contributor
There was a problem hiding this comment.
It would be nice to have a comment per each handle/draw pairs calling out which it is for (technically the SLOT_ enum sorta explains it, but a comment wouldn't hurt).
| true | ||
| ); | ||
|
|
||
| gSlotAgeReqs[SLOT_TRADE_CHILD] = |
Contributor
There was a problem hiding this comment.
A comment for the req changes would also be nice.
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
4 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.
This PR improves several aspects of the item cycling implementation making it easier to modify (or add new item cycles) in code.
It also makes items for the wrong age grayed out when they're the previous or next item in the cycle.
Build Artifacts