From 130ec660e1dfe5ba5e0aec88599942f7c0715996 Mon Sep 17 00:00:00 2001 From: Lara <63805048+larkgz@users.noreply.github.com> Date: Fri, 27 Dec 2024 13:32:35 -0500 Subject: [PATCH] fix: has_injuries thoughts --- scripts/cat/thoughts.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/cat/thoughts.py b/scripts/cat/thoughts.py index 6f8b8155fb..419bf8ded4 100644 --- a/scripts/cat/thoughts.py +++ b/scripts/cat/thoughts.py @@ -221,7 +221,7 @@ def cats_fulfill_thought_constraints( if "m_c" in thought["has_injuries"]: if main_cat.injuries or main_cat.illnesses: injuries_and_illnesses = ( - main_cat.injuries.keys() + main_cat.injuries.keys() + list(main_cat.injuries.keys()) + list(main_cat.injuries.keys()) ) if ( not [ @@ -232,12 +232,13 @@ def cats_fulfill_thought_constraints( and "any" not in thought["has_injuries"]["m_c"] ): return False - return False + else: + return False if "r_c" in thought["has_injuries"] and random_cat: if random_cat.injuries or random_cat.illnesses: injuries_and_illnesses = ( - random_cat.injuries.keys() + random_cat.injuries.keys() + list(random_cat.injuries.keys()) + list(random_cat.injuries.keys()) ) if ( not [ @@ -248,7 +249,8 @@ def cats_fulfill_thought_constraints( and "any" not in thought["has_injuries"]["r_c"] ): return False - return False + else: + return False if "perm_conditions" in thought: if "m_c" in thought["perm_conditions"]: