fixed a bunch of shit

Game Server/Classes/Objects/Player.py

@@ -0,0 +1,37 @@
+import random
+
+
+class Player:
+    __id:int
+    __hp:int
+    __name:str
+    __handCards:list
+    
+    def __init__(self, name:str, hp:int=1000):
+        self.__hp = hp
+        self.__name = name
+        self.__handCards = []
+        self.__id = random.randint(3, 99999)
+
+    def getName(self) -> str:
+        return self.__name
+    
+    def getHP(self) -> int:
+        return self.__hp
+    
+    def adjustHP(self, hp:int) -> int:
+        self.__hp = self.__hp + hp
+
+    def getID(self) -> int:
+        return self.__id
+
+    def getHand(self) -> list:
+        return self.__handCards
+    
+    def AddToHand(self, card) -> list:
+        self.__handCards.append(card)
+        return self.__handCards
+
+    def removeFromHand(self, pos:int) -> list:
+        self.__handCards.remove(pos)
+        return self.__handCards

Game Server/Classes/System/PlayerManager.py

@@ -1,5 +1,5 @@
 import json
-
+from Classes.Objects.Player import Player
 
 class Player:
     __queue:list
@@ -29,8 +29,8 @@ class Player:
         self.__users.append(user)
 
     def createUser(self, user:json):
-        if self.getUser(user["id"]) == None:
-            self.__users.append(user)
+        if self.getUser(user["username"]) == None:
+            self.__users.append(Player(user["username"]))
 
     def removeUser(self, user:int):
         self.__users.remove(user)

Game Server/Classes/System/Server.py

@@ -9,12 +9,13 @@ class Server:
     __udpPort:str
     __tcpSocket:socket
     __udpSocket:socket
-    __clientThread:threading.Thread
+    __TCPclientThread:threading.Thread
+    __UDPclientThread:threading.Thread
 
     def __init__(self, address:str, tcpPort:str, udpPort:str):
         self.__address = address
         self.__tcpPort = tcpPort
-        self.__udpPort = tcpPort
+        self.__udpPort = udpPort
         self.__tcpSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.__udpSocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         
@@ -34,15 +35,15 @@ class Server:
         while True:
             # accept incoming connection
             # TODO: validate this connection is a valid game connection
-            client_tcpSocket, client_tcpAddress = self.__tcpSocket.accept()
+            clientTcpSocket, clientTcpAddress = self.__tcpSocket.accept()
 
             # create network thread for connection
-            self.__TCPclientThread = threading.Thread(target=self.handleTCPConnection, args=(client_tcpSocket, client_tcpAddress))
-            self.__TCPclientThread.start()
+            self.__TCPClientThread = threading.Thread(target=self.handleTCPConnection, args=(clientTcpSocket, clientTcpAddress))
+            self.__TCPClientThread.start()
 
-            client_udpSocket, client_udpAddress = self.__udpSocket.accept()
-            self.__UDPclientThread = threading.Thread(target=self.handleUDPConnection, args=(client_udpSocket, client_udpAddress))
-            self.__UDPclientThread.start()
+            clientUdpSocket, clientUdpAddress = self.__udpSocket.accept()
+            self.__UDPClientThread = threading.Thread(target=self.handleUDPConnection, args=(clientUdpSocket, clientUdpAddress))
+            self.__UDPClientThread.start()
 
 
     # handles ticking the game loop server side converting data and passing of to the event handler
@@ -104,6 +105,16 @@ class Server:
             pass
 
     def handleUDPEvents(self, event):
-        if event["event"] == "gameAction":
-            # pass of to own handler function which handles game logic
-            pass
+        if event["event"] == "placeCard":
+            pass
+        elif event["event"] == "removeCard":
+            pass
+        elif event["event"] == "attackCard":
+            pass
+        elif event["event"] == "attackPlayer":
+            pass
+        elif event["event"] == "activateeffectCard":
+            pass
+        elif event["event"] == "activatemonstereffect":
+            pass
+