remove take_any_locs in-place modifications
This commit is contained in:
parent
6427d246a2
commit
97a5f412a8
14
ItemPool.py
14
ItemPool.py
|
@ -524,13 +524,19 @@ take_any_locations = {
|
||||||
'Palace of Darkness Hint', 'East Dark World Hint', 'Archery Game', 'Dark Lake Hylia Ledge Hint',
|
'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'}
|
'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):
|
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':
|
if world.mode[player] == 'inverted':
|
||||||
take_any_locs -= {"Dark Sanctuary Hint", "Archery Game"}
|
take_any_locs = take_any_locations_inverted
|
||||||
take_any_locs = list(take_any_locs)
|
else:
|
||||||
take_any_locs.sort()
|
take_any_locs = take_any_locations
|
||||||
|
|
||||||
regions = world.random.sample(take_any_locs, 5)
|
regions = world.random.sample(take_any_locs, 5)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue