Merge branch 'main' into breaking_changes

# Conflicts:
#	Main.py
#	worlds/alttp/EntranceRandomizer.py
This commit is contained in:
Fabian Dill
2021-03-03 01:54:52 +01:00
14 changed files with 425 additions and 21 deletions

View File

@@ -361,7 +361,7 @@ def generate_itempool(world, player: int):
world.clock_mode[player] = clock_mode
if treasure_hunt_count is not None:
world.treasure_hunt_count[player] = treasure_hunt_count
world.treasure_hunt_count[player] = treasure_hunt_count % 999
if treasure_hunt_icon is not None:
world.treasure_hunt_icon[player] = treasure_hunt_icon