From 9dfd00b9774952747390fb2e9d1c579eeec81c0c Mon Sep 17 00:00:00 2001
From: Petzys <87223648+Petzys@users.noreply.github.com>
Date: Mon, 26 Feb 2024 16:54:06 +0100
Subject: [PATCH] Feat(client): TTTK-52 Prettified Attributes, added player
 numbers to GameClient

---
 Client/client.py | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/Client/client.py b/Client/client.py
index 08c7045..4bf112a 100644
--- a/Client/client.py
+++ b/Client/client.py
@@ -95,21 +95,26 @@ class GameClient:
     """
     
     def __init__(self, ip:str, port:int, player:Player, handler) -> None:
-        self._ip = ip
-        self._port = port
-        self._player = player
-        self._handler = handler
-
-        self._opponent = None
-        self._current_player = None
-        self._symbol = None
-
-        self._lobby_status = []
-        self._game_status = [[0,0,0],[0,0,0],[0,0,0]]
-        self._statistics = None
-        self._chat_history = []
-        self._winner = None
-        self._statistics = None
+        self._ip: str = ip
+        self._port: int = port
+        self._handler: function = handler
+
+        # Player info
+        self._player: Player = player
+        self._player_number: int = None
+        self._symbol: str = None
+
+        # Opponent info
+        self._opponent: Player = None
+        self._opponent_number: int = None
+
+        # Game info
+        self._current_player: Player = None
+        self._lobby_status: list = []
+        self._game_status: list[list[int]] = [[0,0,0],[0,0,0],[0,0,0]]
+        self._statistics = None # TODO
+        self._chat_history: list[str] = []
+        self._winner: Player = None
 
         with open("./json_schema/server_to_client.json", "r") as f:
             self._json_schema = json.load(f)
@@ -142,9 +147,13 @@ async def listen(self):
                     if str(self._player.uuid) == message_json["starting_player_uuid"]:
                         self._current_player = self._player  
                         self._symbol = "X"
+                        self._player_number = 1
+                        self._opponent_number = 2
                     else:
                         self._current_player = self._opponent
                         self._symbol = "O"
+                        self._opponent_number = 1
+                        self._player_number = 2
                 case "game/end":
                     self._winner = self.get_player_by_uuid(message_json["winner_uuid"])
                     self._game_status = message_json["final_playfield"]