morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core: use assert correctly (#345)

Browse Source 
Core: add some more types to State and add count() method
This commit is contained in:
Fabian Dill
2022-03-26 01:12:54 +01:00
committed by GitHub
parent 902472be32
commit 64ac619b46
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Options.py
View File

@@ -17,8 +17,8 @@ class AssembleOptions(type):
new_options = {name[7:].lower(): option_id for name, option_id in attrs.items() if
name.startswith("option_")}
assert "random" not in new_options # Choice option 'random' cannot be manually assigned.
assert len(new_options) == len(set(new_options.values())) # same ID cannot be used twice. Try alias?
assert "random" not in new_options, "Choice option 'random' cannot be manually assigned."
assert len(new_options) == len(set(new_options.values())), "same ID cannot be used twice. Try alias?"
attrs["name_lookup"].update({option_id: name for name, option_id in new_options.items()})
options.update(new_options)
@@ -104,7 +104,7 @@ class Toggle(Option):
default = 0
def __init__(self, value: int):
assert value == 0 or value == 1
assert value == 0 or value == 1, "value of Toggle can only be 0 or 1"
self.value = value
@classmethod
@@ -178,10 +178,10 @@ class Choice(Option):
if isinstance(other, self.__class__):
return other.value == self.value
elif isinstance(other, str):
assert other in self.options
assert other in self.options, "compared against a str that could never be equal."
return other == self.current_key
elif isinstance(other, int):
assert other in self.name_lookup
assert other in self.name_lookup, "compared against an int that could never be equal."
return other == self.value
elif isinstance(other, bool):
return other == bool(self.value)
@@ -192,10 +192,10 @@ class Choice(Option):
if isinstance(other, self.__class__):
return other.value != self.value
elif isinstance(other, str):
assert other in self.options
assert other in self.options , "compared against a str that could never be equal."
return other != self.current_key
elif isinstance(other, int):
assert other in self.name_lookup
assert other in self.name_lookup, "compared against am int that could never be equal."
return other != self.value
elif isinstance(other, bool):
return other != bool(self.value)