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

Core: Remove deprecated get_current_option_name and SpecialRange (#3296) 

* Removing deprecated function

* Removing SpecialRange
This commit is contained in:
Exempt-Medic 2024-05-17 04:02:25 -04:00 committed by GitHub
parent 5a2d839412
commit 6d8ac5d054
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Options.py
View File

@ -140,12 +140,6 @@ class Option(typing.Generic[T], metaclass=AssembleOptions):
def current_key(self) -> str: def current_key(self) -> str:
return self.name_lookup[self.value] return self.name_lookup[self.value]
def get_current_option_name(self) -> str:
"""Deprecated. use current_option_name instead. TODO remove around 0.4"""
logging.warning(DeprecationWarning(f"get_current_option_name for {self.__class__.__name__} is deprecated."
f" use current_option_name instead. Worlds should use {self}.current_key"))
return self.current_option_name
@property @property
def current_option_name(self) -> str: def current_option_name(self) -> str:
"""For display purposes. Worlds should be using current_key.""" """For display purposes. Worlds should be using current_key."""
@ -750,37 +744,6 @@ class NamedRange(Range):
return super().from_text(text) return super().from_text(text)
class SpecialRange(NamedRange):
special_range_cutoff = 0
# TODO: remove class SpecialRange, earliest 3 releases after 0.4.3
def __new__(cls, value: int) -> SpecialRange:
from Utils import deprecate
deprecate(f"Option type {cls.__name__} is a subclass of SpecialRange, which is deprecated and pending removal. "
"Consider switching to NamedRange, which supports all use-cases of SpecialRange, and more. In "
"NamedRange, range_start specifies the lower end of the regular range, while special values can be "
"placed anywhere (below, inside, or above the regular range).")
return super().__new__(cls)
@classmethod
def weighted_range(cls, text) -> Range:
if text == "random-low":
return cls(cls.triangular(cls.special_range_cutoff, cls.range_end, cls.special_range_cutoff))
elif text == "random-high":
return cls(cls.triangular(cls.special_range_cutoff, cls.range_end, cls.range_end))
elif text == "random-middle":
return cls(cls.triangular(cls.special_range_cutoff, cls.range_end))
elif text.startswith("random-range-"):
return cls.custom_range(text)
elif text == "random":
return cls(random.randint(cls.special_range_cutoff, cls.range_end))
else:
raise Exception(f"random text \"{text}\" did not resolve to a recognized pattern. "
f"Acceptable values are: random, random-high, random-middle, random-low, "
f"random-range-low-<min>-<max>, random-range-middle-<min>-<max>, "
f"random-range-high-<min>-<max>, or random-range-<min>-<max>.")
class FreezeValidKeys(AssembleOptions): class FreezeValidKeys(AssembleOptions):
def __new__(mcs, name, bases, attrs): def __new__(mcs, name, bases, attrs):
if "valid_keys" in attrs: if "valid_keys" in attrs: