From 19684bcdfad770edd313636020ac807795a1df5b Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 24 Mar 2021 14:02:07 -0500 Subject: [PATCH] Merged and fixed Shopsanity with OW shuffle --- Fill.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Fill.py b/Fill.py index 1999fea8..08b54450 100644 --- a/Fill.py +++ b/Fill.py @@ -555,7 +555,7 @@ def balance_money_progression(world): checked_locations = [] for player in range(1, world.players+1): kiki_payable = state.prog_items[('Moon Pearl', player)] > 0 or world.mode[player] == 'inverted' - if kiki_payable and world.get_region('East Dark World', player) in state.reachable_regions[player]: + if kiki_payable and world.get_region('Palace of Darkness Area', player) in state.reachable_regions[player]: if not kiki_paid[player]: kiki_check[player] = True sphere_costs[player] += 110 @@ -577,7 +577,7 @@ def balance_money_progression(world): if kiki_check[loc_player] and not kiki_paid[loc_player] and kiki_required(state, location): locked_by_money[loc_player].add(location) location_free = False - if location_free: + if location_free and location.item: state.collect(location.item, True, location) unchecked_locations.remove(location) if location.item.name.startswith('Rupee'):