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

Merged in DR v1.4.6

Browse Source
This commit is contained in:
codemann8
2024-10-15 19:11:10 -05:00
parent b52d292b1b 5225ce996f
commit 413d5cc5fd
14 changed files with 227 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/overworld/EntranceShuffle2.py
View File

@@ -1511,7 +1511,7 @@ def do_vanilla_connect(pool_def, avail):
if avail.world.dropshuffle[avail.player] not in ['none', 'keys']:
return
if 'enemy_drop' in pool_def['condition']:
if avail.world.dropshuffle[avail.player] not in ['none', 'keys'] or avail.world.enemy_shuffle[avail.player] != 'none':
if avail.world.dropshuffle[avail.player] not in ['none', 'keys'] and avail.world.enemy_shuffle[avail.player] != 'none':
return
defaults = {**default_connections, **(inverted_default_connections if avail.inverted != avail.world.is_tile_swapped(0x1b, avail.player) else open_default_connections)}
for entrance in pool_def['entrances']: