Player

game/common/player.py

@@ -5,68 +5,78 @@
 
 
 class Player(GameObject):
-    def __init__(self, code: object = None, team_name: str = None, action: Action = None, avatar: Avatar = None):
+    def __init__(self, code: object | None = None, team_name: str | None = None, action: ActionType | None = None,
+                 avatar: Avatar | None = None):
         super().__init__()
         self.object_type: ObjectType = ObjectType.PLAYER
         self.functional: bool = True
-        self.error: object = None
-        self.team_name: str = team_name
+        # self.error: object | None = None  # error is not used
+        self.team_name: str | None = team_name
         self.code: object = code
-        self.action: Action = action
-        self.avatar: Avatar = avatar
+        # self.action: Action = action
+        self.action: ActionType | None = action
+        self.avatar: Avatar | None = avatar
 
     @property
-    def action(self) -> Action:  # Will need to change Avatar class to the enum eventually
+    def action(self) -> ActionType | None:  # change to Action if you want to use the action object
         return self.__action
 
     @action.setter
-    def action(self, action: Action):
-        if action is None or isinstance(action, Action):
-            self.__action = action
+    def action(self, action: ActionType | None) -> None:  # showing it returns nothing(like void in java)
+        # if it's (not none = and) if its (none = or)
+        if action is not None and not isinstance(action, ActionType):  # since it can be either none or action type we need it to be and not or
+            # ^change to Action if you want to use the action object
+            raise ValueError(f'{self.__class__.__name__}.action must be ActionType or None')
+            # ^if it's not either throw an error
+        self.__action = action
 
     @property
     def functional(self) -> bool:
         return self.__functional
 
-    @functional.setter
-    def functional(self, functional: bool):
-        if functional is None or isinstance(functional, bool):
-            self.__functional = functional
+    @functional.setter  # do this for all the setters
+    def functional(self, functional: bool) -> None:  # this enforces the type intting
+        if functional is None or not isinstance(functional, bool):  # if this statement is true throw an error
+            raise ValueError(f'{self.__class__.__name__}.functional must be a boolean')
+        self.__functional = functional
 
     @property
     def team_name(self) -> str:
         return self.__team_name
 
     @team_name.setter
-    def team_name(self, team_name: str):
-        if team_name is None or isinstance(team_name, str):
-            self.__team_name = team_name
+    def team_name(self, team_name: str) -> None:
+        if team_name is not None and not isinstance(team_name, str):
+            raise ValueError(f'{self.__class__.__name__}.team_name must be a String or None')
+        self.__team_name = team_name
 
     @property
     def avatar(self) -> Avatar:
         return self.__avatar
 
     @avatar.setter
-    def avatar(self, avatar: Avatar):
-        if avatar is None or isinstance(avatar, Avatar):
-            self.__avatar = avatar
+    def avatar(self, avatar: Avatar) -> None:
+        if avatar is not None and not isinstance(avatar, Avatar):
+            raise ValueError(f'{self.__class__.__name__}.avatar must be Avatar or None')
+        self.__avatar = avatar
 
     @property
     def object_type(self) -> ObjectType:
         return self.object_type
 
     @object_type.setter
-    def object_type(self, object_type: ObjectType):
-        if object_type is None or isinstance(object_type, GameObject):
-            self.__object_type = object_type
+    def object_type(self, object_type: ObjectType) -> None:
+        if object_type is None or not isinstance(object_type, GameObject):
+            raise ValueError(f'{self.__class__.__name__}.object_type must be ObjectType')
+        self.__object_type = object_type
 
     def to_json(self):
         data = super().to_json()
 
         data['functional'] = self.functional
-        data['error'] = self.error
+        # data['error'] = self.error  # .to_json() if self.error is not None else None
         data['team_name'] = self.team_name
-        data['action'] = self.action.to_json() if self.action is not None else None
+        data['action'] = self.actiontype.to_json() if self.actiontype is not None else None
         data['avatar'] = self.avatar.to_json() if self.avatar is not None else None
 
         return data
@@ -75,10 +85,35 @@ def from_json(self, data):
         super().from_json(data)
 
         self.functional = data['functional']
-        self.error = data['error']
+        # self.error = data['error']  # .from_json(data['action']) if data['action'] is not None else None
         self.team_name = data['team_name']
-        self.action = Action().from_json(data['action']) if data['action'] is not None else None
-        self.avatar = Avatar().from_json(data['avatar']) if data['avatar'] is not None else None
+
+        action: ActionType | None = data['action']
+        avatar: Avatar | None = data['avatar']
+        if action is None and avatar is None:
+            self.action = None
+            self.avatar = None
+            return self
+        # match case for action
+        # match action['object_type']:
+        #     case ObjectType.ACTION:
+        #         self.action = Action().from_json(data['action'])
+        #     case None:
+        #         self.action = None
+        #     case _:  # checks if it is anything else
+        #         raise Exception(f'Could not parse action: {self.action}')
+
+        # match case for avatar
+        match avatar['object_type']:
+            case ObjectType.AVATAR:
+                self.avatar = Avatar().from_json(data['avatar'])
+            case None:
+                self.avatar = None
+            case _:
+                raise Exception(f'Could not parse avatar: {self.avatar}')
+        return self
+        # self.action = Action().from_json(data['action']) if data['action'] is not None else None
+        # self.avatar = Avatar().from_json(data['avatar']) if data['avatar'] is not None else None
 
     def __str__(self):
         p = f"""ID: {self.id}