Skip to content

Commit 9abbe2a

Browse files
committed
fixed actor enums overriding actor types
1 parent 095696f commit 9abbe2a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

fast64_internal/oot/actor/properties.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def get_param_value(self, target: str):
319319
have_custom_value = True
320320
continue
321321

322-
if param.type in {"Type", "Enum"}:
322+
if param.type == "Type":
323323
type_value = getEvalParamsInt(cur_prop_value)
324324
else:
325325
param_val = 0
@@ -330,6 +330,8 @@ def get_param_value(self, target: str):
330330
param_val = ootData.actorData.collectibleItemsByKey[cur_prop_value].value
331331
elif param.type == "Message":
332332
param_val = ootData.actorData.messageItemsByKey[cur_prop_value].value
333+
elif param.type == "Enum":
334+
param_val = getEvalParamsInt(cur_prop_value)
333335

334336
if "Rot" in target:
335337
type_value = getEvalParamsInt(getattr(self, get_prop_name(actor.key, "Type", None, 1)))

0 commit comments

Comments
 (0)