alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Update PotShuffle.py for keydrop shuffle changes

Browse Source
This commit is contained in:
compiling
2020-11-08 11:53:31 +11:00
parent 8ca529aa6a
commit 793eb30dec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PotShuffle.py
View File

@@ -1,7 +1,7 @@
from collections import defaultdict from collections import defaultdict
from BaseClasses import PotItem, Pot, PotFlags, CrystalBarrier from BaseClasses import PotItem, Pot, PotFlags, CrystalBarrier
from Regions import key_only_locations from Regions import key_drop_data
movable_switch_rooms = defaultdict(lambda: [], movable_switch_rooms = defaultdict(lambda: [],
{'PoD Stalfos Basement': ['PoD Basement Ledge'], {'PoD Stalfos Basement': ['PoD Basement Ledge'],
@@ -311,7 +311,7 @@ def shuffle_pots(world, player):
if new_pot.item == PotItem.Key and new_pot.room != old_pot.room: if new_pot.item == PotItem.Key and new_pot.room != old_pot.room:
# Move pot key to new room # Move pot key to new room
key = next(location for location in world.get_region(old_pot.room, player).locations if location.name in key_only_locations) key = next(location for location in world.get_region(old_pot.room, player).locations if location.name in key_drop_data)
world.get_region(old_pot.room, player).locations.remove(key) world.get_region(old_pot.room, player).locations.remove(key)
world.get_region(new_pot.room, player).locations.append(key) world.get_region(new_pot.room, player).locations.append(key)
elif new_pot.item == PotItem.Switch and (new_pot.flags & PotFlags.SwitchLogicChange): elif new_pot.item == PotItem.Switch and (new_pot.flags & PotFlags.SwitchLogicChange):