updated typing

College-Kings · May 3, 2023 · 98e66c2 · 98e66c2
1 parent 82a6c0b
commit 98e66c2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/CharacterColors_ren.py b/CharacterColors_ren.py
@@ -18,6 +18,7 @@
     "#ff8afb",
     "#5fc9f8",
 )
+
 FEMININE_COLORS: tuple[str, ...] = (
     "#05F0D5",
     "#800080",

diff --git a/CharacterService_ren.py b/CharacterService_ren.py
@@ -1,15 +1,14 @@
 from __future__ import annotations
+from typing import Optional
 
 from renpy import store
 import renpy.exports as renpy
 
-
 from game.characters.Relationship_ren import Relationship
 from game.characters.Moods_ren import Moods
 from game.characters.NonPlayableCharacter_ren import NonPlayableCharacter
 from game.characters.PlayableCharacters_ren import PlayableCharacter
 
-
 """renpy
 init python:
 """
@@ -18,7 +17,7 @@
 class CharacterService:
     @staticmethod
     def get_relationship(
-        character: NonPlayableCharacter, target: PlayableCharacter = None
+        character: NonPlayableCharacter, target: Optional[PlayableCharacter] = None
     ) -> Relationship:
         if target is None:
             target = store.mc
@@ -32,7 +31,7 @@ def get_relationship(
     def has_relationship(
         character: NonPlayableCharacter,
         relationship: Relationship,
-        target: PlayableCharacter = None,
+        target: Optional[PlayableCharacter] = None,
     ) -> bool:
         if target is None:
             target = store.mc
@@ -43,7 +42,7 @@ def has_relationship(
     def set_relationship(
         character: NonPlayableCharacter,
         relationship: Relationship,
-        target: PlayableCharacter = None,
+        target: Optional[PlayableCharacter] = None,
     ) -> None:
         if target is None:
             target = store.mc
@@ -112,7 +111,7 @@ def get_profile_pictures(character_name: str) -> list[str]:
 
     @staticmethod
     def is_girlfriend(
-        character: NonPlayableCharacter, target: PlayableCharacter = None
+        character: NonPlayableCharacter, target: Optional[PlayableCharacter] = None
     ) -> bool:
         if target is None:
             target = store.mc
@@ -123,7 +122,7 @@ def is_girlfriend(
 
     @staticmethod
     def is_fwb(
-        character: NonPlayableCharacter, target: PlayableCharacter = None
+        character: NonPlayableCharacter, target: Optional[PlayableCharacter] = None
     ) -> bool:
         if target is None:
             target = store.mc
@@ -132,7 +131,7 @@ def is_fwb(
 
     @staticmethod
     def is_dating(
-        character: NonPlayableCharacter, target: PlayableCharacter = None
+        character: NonPlayableCharacter, target: Optional[PlayableCharacter] = None
     ) -> bool:
         if target is None:
             target = store.mc
@@ -141,7 +140,7 @@ def is_dating(
 
     @staticmethod
     def is_kissed(
-        character: NonPlayableCharacter, target: PlayableCharacter = None
+        character: NonPlayableCharacter, target: Optional[PlayableCharacter] = None
     ) -> bool:
         if target is None:
             target = store.mc
@@ -150,7 +149,7 @@ def is_kissed(
 
     @staticmethod
     def is_friend(
-        character: NonPlayableCharacter, target: PlayableCharacter = None
+        character: NonPlayableCharacter, target: Optional[PlayableCharacter] = None
     ) -> bool:
         if target is None:
             target = store.mc
@@ -159,7 +158,7 @@ def is_friend(
 
     @staticmethod
     def is_ex(
-        character: NonPlayableCharacter, target: PlayableCharacter = None
+        character: NonPlayableCharacter, target: Optional[PlayableCharacter] = None
     ) -> bool:
         if target is None:
             target = store.mc

diff --git a/Frat_ren.py b/Frat_ren.py
@@ -1,7 +1,6 @@
 import enum
 from enum import Enum
 
-
 """renpy
 init python:
 """

diff --git a/NonPlayableCharacter_ren.py b/NonPlayableCharacter_ren.py
@@ -4,7 +4,6 @@
 from game.characters.CharacterService_ren import CharacterService
 from game.characters.Moods_ren import Moods
 from game.characters.Relationship_ren import Relationship
-from game.characters.PlayableCharacters_ren import PlayableCharacter
 from game.phone.Message_ren import Message
 
 """renpy
@@ -17,15 +16,15 @@ class NonPlayableCharacter:
     name: str
     username: str = ""
 
-    relationships: dict[PlayableCharacter, Relationship] = field(default_factory=dict)
+    relationships: dict[str, Relationship] = field(default_factory=dict)
     mood: Moods = Moods.NORMAL
 
     profile_pictures: list[str] = field(default_factory=list)
     points: int = 0
     has_had_sex_with_mc: bool = False
 
     is_competitive: bool = False
-    vindictive_characters: list[NonPlayableCharacter] = ()
+    vindictive_characters: tuple[NonPlayableCharacter, ...] = ()
     is_talkative: bool = False
 
     pending_text_messages: list[Message] = field(default_factory=list)

diff --git a/PlayableCharacters_ren.py b/PlayableCharacters_ren.py
@@ -9,7 +9,6 @@
 
 from game.detective.Detective_ren import Detective
 from game.characters.CharacterService_ren import CharacterService
-from game.characters.NonPlayableCharacter_ren import NonPlayableCharacter
 from game.characters.Relationship_ren import Relationship
 
 """renpy
@@ -25,9 +24,7 @@ class PlayableCharacter:
     money: int = 0
     inventory: list[str] = field(default_factory=list)
     detective: Optional[Detective] = None
-    relationships: dict[NonPlayableCharacter, Relationship] = field(
-        default_factory=dict
-    )
+    relationships: dict[str, Relationship] = field(default_factory=dict)
     frat: Frat = Frat.WOLVES
     daddy_name: str = "Daddy"