created has_mood and is_threatened

College-Kings · May 2, 2023 · 17df284 · 17df284
1 parent dbd23b3
commit 17df284
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/CharacterService_ren.py b/CharacterService_ren.py
@@ -67,6 +67,10 @@ def set_relationship(
     def get_mood(character: NonPlayableCharacter) -> Moods:
         return character.mood
 
+    @staticmethod
+    def has_mood(character: NonPlayableCharacter, mood: Moods) -> bool:
+        return mood == character.mood or character.mood & mood == mood
+
     @staticmethod
     def set_mood(character: NonPlayableCharacter, mood: Moods) -> None:
         if mood == character.mood:
@@ -164,4 +168,8 @@ def is_ex(
 
     @staticmethod
     def is_mad(character: NonPlayableCharacter) -> bool:
-        return Moods.MAD in character.mood
+        return CharacterService.has_mood(character, Moods.MAD)
+
+    @staticmethod
+    def is_threatened(character: NonPlayableCharacter) -> bool:
+        return CharacterService.has_mood(character, Moods.THREATENED)