morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Options: allow yaml access to Priority Locations

Browse Source
This commit is contained in:
Fabian Dill
2022-02-01 16:36:14 +01:00
parent 2361f8f9d3
commit 0f20888563
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/generic/Rules.py
View File

@@ -32,9 +32,9 @@ def exclusion_rules(world, player: int, exclude_locations: typing.Set[str]):
raise Exception(f"Unable to exclude location {loc_name} in player {player}'s world.") from e
else:
add_item_rule(location, lambda i: not (i.advancement or i.never_exclude))
location.excluded = True
location.progress_type = LocationProgressType.EXCLUDED
def set_rule(spot, rule: CollectionRule):
spot.access_rule = rule

4
worlds/oot/HintList.py
View File

@@ -1,5 +1,7 @@
import random
from BaseClasses import LocationProgressType
# Abbreviations
# DMC Death Mountain Crater
# DMT Death Mountain Trail
@@ -1257,7 +1259,7 @@ def hintExclusions(world, clear_cache=False):
world.hint_exclusions = []
for location in world.get_locations():
if (location.locked and (location.item.type != 'Song' or world.shuffle_song_items != 'song')) or location.excluded:
if (location.locked and (location.item.type != 'Song' or world.shuffle_song_items != 'song')) or location.progress_type == LocationProgressType.EXCLUDED:
world.hint_exclusions.append(location.name)
world_location_names = [