Fix "Remove" silver rupees setting#2550
Conversation
|
I don't think "remove" is actually supposed to remove the locations from the game??? |
|
The tooltip says it adds refill items to the item pool. There's no reason it should do that if the intention wasn't that the locations are still shuffled. |
|
The tooltip just seems hastily copied from the Maps and Compasses "Remove" setting to me. |
|
#2541 appears to be an invalid bug after further discussion. I seem to have made a mistake when remembering the issue happening the next week, skimmed the conversation and re-read some of the chat as more definitive than it was when writing the report. The user appears to have legitimately had the issue, but it was not properly reproduced and currently does not seem reproducible. |
|
Maybe we should still add an option that completely removes the silver rupee locations and uses the logic from this PR. If nothing else, it could help to recuce confusion about how the option is supposed to work. |
To be clear, it is invalid because "remove" does not actually completely remove the silver rupee locations from the game as the user reported.
I'm gonna close this but feel free to steal the logic to do that. |
Fixes #2541
Basically, the "remove" silver rupee setting was working like other remove settings, such as small keys: The items are given to the player automatically, but the locations are still open for filling with items. But silver rupee "remove" is different in that it actually removes the locations from the game, so obviously nothing should be shuffled onto these locations. Fixed by checking if the location type is silver rupee in the "remove" logic and, if so, setting it to not be shuffled and ignoring the location.
Testing
OoT_FBB47_49XAF4DK8K_Spoiler.json
After this change, spoiler logs with silver rupees set to remove no longer list silver rupee locations as having items in them. I also noted a lack of silver rupee items in the location pool when inspecting the code while it was running.