diff --git a/ItemList.py b/ItemList.py index 5c4aa40d..29ef71da 100644 --- a/ItemList.py +++ b/ItemList.py @@ -545,7 +545,7 @@ def fill_prizes(world, attempts=15): continue break 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): diff --git a/Rules.py b/Rules.py index 6b8812fd..d18c9ae5 100644 --- a/Rules.py +++ b/Rules.py @@ -67,7 +67,8 @@ def set_rules(world, player): if not world.swamp_patch_required[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):