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

Merge branch 'OverworldShuffleDev' into OverworldShuffle

Browse Source
This commit is contained in:
codemann8
2022-09-05 13:41:06 -05:00
parent 3b0310e487 f74a64d0b8
commit 37fc55cd2a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ItemList.py
View File

@@ -545,7 +545,7 @@ def fill_prizes(world, attempts=15):
continue continue
break break
else: else:
raise FillError('Unable to place dungeon prizes') raise FillError("Unable to place dungeon prizes: {}".format(", ".join(list(map(lambda d: d.hint_text, prize_locs)))))
def set_up_shops(world, player): def set_up_shops(world, player):

3
Rules.py
View File

@@ -67,7 +67,8 @@ def set_rules(world, player):
if not world.swamp_patch_required[player]: if not world.swamp_patch_required[player]:
add_rule(world.get_entrance('Swamp Lobby Moat', player), lambda state: state.has_Mirror(player)) add_rule(world.get_entrance('Swamp Lobby Moat', player), lambda state: state.has_Mirror(player))
set_bunny_rules(world, player, world.mode[player] == 'inverted') if not world.is_copied_world:
set_bunny_rules(world, player, world.mode[player] == 'inverted')
def mirrorless_path_to_location(world, startName, targetName, player): def mirrorless_path_to_location(world, startName, targetName, player):