Skip to content

Commit 879ff16

Browse files
committed
Add support for is_type(str_id).
1 parent 7f30ddf commit 879ff16

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

sc2reader/data/__init__.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,26 @@ def is_type(self, unit_type, strict=True):
4343
return unit_type == self._type_class.id
4444
else:
4545
return unit_type == 0
46-
else:
46+
elif isinstance(unit_type, Unit):
4747
return self._type_class == unit_type
48+
else:
49+
if self._type_class:
50+
return unit_type == self._type_class.str_id
51+
else:
52+
return unit_type == None
4853
else:
4954
if isinstance(unit_type, int):
5055
if self._type_class:
5156
return unit_type in [utype.id for utype in self.type_history.values()]
5257
else:
5358
return unit_type == 0
54-
else:
59+
elif isinstance(unit_type, Unit):
5560
return unit_type in self.type_history.values()
61+
else:
62+
if self._type_class:
63+
return unit_type in [utype.str_id for utype in self.type_history.values()]
64+
else:
65+
return unit_type == None
5666

5767
@property
5868
def name(self):

0 commit comments

Comments
 (0)