Add error handling for character mood in CharacterService

College-Kings · May 22, 2024 · 51f187e · 51f187e
1 parent 74c2605
commit 51f187e
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/CharacterService_ren.py b/CharacterService_ren.py
@@ -96,17 +96,24 @@ def set_relationship(
 
     @staticmethod
     def get_mood(character: "NonPlayableCharacter") -> "Moods":
+        try:
+            return character.mood
+        except AttributeError:
+            character.mood = Moods.NORMAL
+
         return character.mood
 
     @staticmethod
     def has_mood(character: "NonPlayableCharacter", mood: "Moods") -> bool:
+        try:
+            character.mood
+        except AttributeError:
+            character.mood = Moods.NORMAL
+
         return mood == character.mood or character.mood & mood == mood
 
     @staticmethod
     def set_mood(character: "NonPlayableCharacter", mood: "Moods") -> None:
-        if mood == character.mood:
-            return
-
         character.mood = mood
 
     @staticmethod
@@ -115,9 +122,6 @@ def reset_mood(character: "NonPlayableCharacter") -> None:
 
     @staticmethod
     def add_mood(character: "NonPlayableCharacter", mood: "Moods") -> None:
-        if mood == character.mood:
-            return
-
         if character.mood == Moods.NORMAL:
             character.mood = mood
             return