More consistent handling of boss keys from key rings #2149
Merged
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 #2137. In small keysy with keyrings give boss keys, boss doors of dungeons with keyrings are now unlocked. Tested with this plando:
This PR also introduces the methods
World.keyring
andWorld.keyring_give_bk
to consolidate the checks for the various conditions required for a dungeon to have a key ring, or to have the boss key included in the key ring, respectively.This also reverts #2045 which was intended to fix this issue but does not actually seem to do anything as far as I can tell. The approach taken there was to give the boss keys as starting items rather than unlocking the boss doors, with the reason given that having some boss doors but not others be unlocked would be misleading in RSL. Personally I think this PR's consistent behavior is a better approach overall as the locked boss door may lead players who are familiar with how keysy normally works to think they're stuck; RSL players would just have one more thing to keep in mind for identifying settings. Alternatively, we could indicate boss keysy by unlocking the door and giving the player the boss key item — keeping a boss key after using it is the vanilla behavior after all.