monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Subnautica: fix use of _valid_keys were valid_keys should be used. (#3346) 

* Subnautica: fix use of _valid_keys were valid_keys should be used.

* Update Options.py
This commit is contained in:
Fabian Dill 2024-05-20 06:20:01 +02:00 committed by GitHub
parent 754fc11c1b
commit 14ffd1c70c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Options.py
View File

@ -746,6 +746,7 @@ class NamedRange(Range):
class FreezeValidKeys(AssembleOptions): class FreezeValidKeys(AssembleOptions):
def __new__(mcs, name, bases, attrs): def __new__(mcs, name, bases, attrs):
assert not "_valid_keys" in attrs, "'_valid_keys' gets set by FreezeValidKeys, define 'valid_keys' instead."
if "valid_keys" in attrs: if "valid_keys" in attrs:
attrs["_valid_keys"] = frozenset(attrs["valid_keys"]) attrs["_valid_keys"] = frozenset(attrs["valid_keys"])
return super(FreezeValidKeys, mcs).__new__(mcs, name, bases, attrs) return super(FreezeValidKeys, mcs).__new__(mcs, name, bases, attrs)

2
worlds/subnautica/options.py
View File

@ -120,7 +120,7 @@ class FillerItemsDistribution(ItemDict):
"""Random chance weights of various filler resources that can be obtained. """Random chance weights of various filler resources that can be obtained.
Available items: """ Available items: """
__doc__ += ", ".join(f"\"{item_name}\"" for item_name in item_names_by_type[ItemType.resource]) __doc__ += ", ".join(f"\"{item_name}\"" for item_name in item_names_by_type[ItemType.resource])
_valid_keys = frozenset(item_names_by_type[ItemType.resource]) valid_keys = sorted(item_names_by_type[ItemType.resource])
default = {item_name: 1 for item_name in item_names_by_type[ItemType.resource]} default = {item_name: 1 for item_name in item_names_by_type[ItemType.resource]}
display_name = "Filler Items Distribution" display_name = "Filler Items Distribution"