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

BPS flag for Mystery

Browse Source 
Expanded logic options for mystery
Fixed a shopsanity+district bug
Fixed the keysanity menu not showing map marks
This commit is contained in:
aerinon
2022-02-24 14:06:34 -07:00
parent 4717449c35
commit b7e307f4c1
6 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/item/FillUtil.py
View File

@@ -419,7 +419,7 @@ def vanilla_fallback(item_to_place, locations, world):
return []
def filter_locations(item_to_place, locations, world, vanilla_skip=False):
def filter_locations(item_to_place, locations, world, vanilla_skip=False, potion=False):
if world.algorithm == 'vanilla_fill':
config, filtered = world.item_pool_config, []
item_name = 'Bottle' if item_to_place.name.startswith('Bottle') else item_to_place.name
@@ -452,6 +452,12 @@ def filter_locations(item_to_place, locations, world, vanilla_skip=False):
restricted = config.location_groups[0].locations
filtered = [l for l in locations if l.name in restricted and l.player in restricted[l.name]]
return filtered if len(filtered) > 0 else locations
elif potion:
restricted = config.location_groups[0].locations
filtered = [l for l in locations if l.name not in restricted or l.player not in restricted[l.name]]
if len(filtered) == 0:
raise RuntimeError('Can\'t sell potion of a certain type due to district restriction')
return filtered
return locations