From adfd68f83c1c1b49e161c3e9f665850daa9dd2fe Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 31 Aug 2021 22:14:18 +0200 Subject: [PATCH] Options: fix get_option_name --- Options.py | 9 +++++---- WebHostLib/options.py | 17 ++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Options.py b/Options.py index f31c7e6f..af7d048f 100644 --- a/Options.py +++ b/Options.py @@ -57,11 +57,12 @@ class Option(metaclass=AssembleOptions): """For display purposes.""" return self.get_option_name(self.value) - def get_option_name(self, value: typing.Any) -> str: - if self.autodisplayname: - return self.name_lookup[self.value].replace("_", " ").title() + @classmethod + def get_option_name(cls, value: typing.Any) -> str: + if cls.autodisplayname: + return cls.name_lookup[value].replace("_", " ").title() else: - return self.name_lookup[self.value] + return cls.name_lookup[value] def __int__(self) -> int: return self.value diff --git a/WebHostLib/options.py b/WebHostLib/options.py index 9edbbe6c..fa0b1db6 100644 --- a/WebHostLib/options.py +++ b/WebHostLib/options.py @@ -10,16 +10,15 @@ target_folder = os.path.join("WebHostLib", "static", "generated") def create(): + def dictify_range(option): + data = {option.range_start: 0, option.range_end: 0, "random": 0, "random-low": 0, "random-high": 0, + option.default: 50} + notes = { + option.range_start: "minimum value", + option.range_end: "maximum value" + } + return data, notes for game_name, world in AutoWorldRegister.world_types.items(): - def dictify_range(option): - data = {option.range_start: 0, option.range_end: 0, "random": 0, "random-low": 0, "random-high": 0, - option.default: 50} - notes = { - option.range_start: "minimum value", - option.range_end: "maximum value" - } - return data, notes - res = Template(open(os.path.join("WebHostLib", "templates", "options.yaml")).read()).render( options=world.options, __version__=__version__, game=game_name, yaml_dump=yaml.dump, dictify_range=dictify_range