fix conflicts from 993

This commit is contained in:
alwaysintreble
2023-10-10 18:04:31 -05:00
parent 6f9cbe7750
commit 7bc7465ea5
8 changed files with 14 additions and 11 deletions

View File

@@ -880,6 +880,7 @@ class ItemSet(OptionSet):
class Accessibility(Choice):
"""Set rules for reachability of your items/locations.
Full: ensure everything can be reached and acquired.
Minimal: ensure what is needed to reach your goal can be acquired."""
display_name = "Accessibility"
@@ -891,6 +892,7 @@ class Accessibility(Choice):
class ItemsAccessibility(Accessibility):
"""Set rules for reachability of your items/locations.
Full: ensure everything can be reached and acquired.
Items: ensure all logically relevant items can be acquired. Some items, such as keys, may be self-locking.
Minimal: ensure what is needed to reach your goal can be acquired."""