OoT: permit dungeon_items: overworld to fill into shops
This commit is contained in:
parent
fd6e1b3046
commit
d8d881085f
|
@ -650,8 +650,8 @@ class OOTWorld(World):
|
||||||
itempools['overworld'].sort(key=lambda item:
|
itempools['overworld'].sort(key=lambda item:
|
||||||
{'GanonBossKey': 4, 'BossKey': 3, 'SmallKey': 2, 'FortressSmallKey': 1}.get(item.type, 0))
|
{'GanonBossKey': 4, 'BossKey': 3, 'SmallKey': 2, 'FortressSmallKey': 1}.get(item.type, 0))
|
||||||
non_dungeon_locations = [loc for loc in self.get_locations() if
|
non_dungeon_locations = [loc for loc in self.get_locations() if
|
||||||
not loc.item and loc not in any_dungeon_locations
|
not loc.item and loc not in any_dungeon_locations and
|
||||||
and loc.type != 'Shop' and
|
(loc.type != 'Shop' or loc.name in self.shop_prices) and
|
||||||
(loc.type != 'Song' or self.shuffle_song_items != 'song') and
|
(loc.type != 'Song' or self.shuffle_song_items != 'song') and
|
||||||
(loc.name not in dungeon_song_locations or self.shuffle_song_items != 'dungeon')]
|
(loc.name not in dungeon_song_locations or self.shuffle_song_items != 'dungeon')]
|
||||||
self.world.random.shuffle(non_dungeon_locations)
|
self.world.random.shuffle(non_dungeon_locations)
|
||||||
|
|
Loading…
Reference in New Issue