monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into multishop

This commit is contained in:
CaitSith2 2021-01-15 10:17:27 -08:00
parent 10a4a89c5f 97a5f412a8
commit f046ca806c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ItemPool.py
View File

@ -538,13 +538,19 @@ take_any_locations = {
'Palace of Darkness Hint', 'East Dark World Hint', 'Archery Game', 'Dark Lake Hylia Ledge Hint',
'Dark Lake Hylia Ledge Spike Cave', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint', 'Dark Desert Hint'}
take_any_locations_inverted = list(take_any_locations - {"Dark Sanctuary Hint", "Archery Game"})
take_any_locations = list(take_any_locations)
# sets are sorted by the element's hash, python's hash is seeded at startup, resulting in different sorting each run
take_any_locations_inverted.sort()
take_any_locations.sort()
def set_up_take_anys(world, player):
take_any_locs = take_any_locations
# these are references, do not modify these lists in-place
if world.mode[player] == 'inverted':
take_any_locs -= {"Dark Sanctuary Hint", "Archery Game"}
take_any_locs = list(take_any_locs)
take_any_locs.sort()
take_any_locs = take_any_locations_inverted
else:
take_any_locs = take_any_locations
regions = world.random.sample(take_any_locs, 5)