Skip to content

Fix "Remove" silver rupees setting #2550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cjohnson57 wants to merge 1 commit into from
Closed

Fix "Remove" silver rupees setting #2550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ItemPool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,13 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:
if shuffle_setting is not None and dungeon_collection is not None and not shuffle_item:
if shuffle_setting in ('remove', 'startwith'):
world.state.collect(ItemFactory(item, world))
item = get_junk_item()[0]
shuffle_item = True
if location.type == 'SilverRupee':
# Silver rupees handled differently since removing them actually removes their locations from the world
item = IGNORE_LOCATION
shuffle_item = False
else:
item = get_junk_item()[0]
shuffle_item = True
elif shuffle_setting in ('any_dungeon', 'overworld', 'keysanity', 'regional', 'anywhere') and not world.precompleted_dungeons.get(dungeon.name, False):
shuffle_item = True
elif shuffle_item is None:
Expand Down
Loading