added server communication between client and server

Game_Client/Classes/System/App.py

@@ -7,6 +7,8 @@ from Classes.System.Components.InputHandler import InputHandler
 from Classes.Game.World import World
 from Classes.System.Network.NetworkManager import NetworkManager
 from Classes.Game.Events.Login import Login
+from Classes.Game.Events.PlaceCard import PlaceCard
+from Classes.Game.Player import Player
 
 class App:
 
@@ -24,9 +26,15 @@ class App:
         self.__myFont = pygame.font.SysFont('Comic Sans MS', 30)
         self.__window = Window(width=width, height=height, title=title)
         self.__inputHandler = InputHandler()
-        self.__networkManager("127.0.0.1", "54322", "54323")
-        Login(self.__networkManager) # will login to the server
-        
+
+        try:
+            self.__networkManager = NetworkManager("127.0.0.1", "54322", "54323")
+            Login(self.__networkManager) # will login to the server
+        except Exception as e:
+            print(f"failed to login due to error {e}")
+            print("server connection failed or got refused")
+            pass
+
         # game word
         self.__world = World(self.__window.getScreen())
 
@@ -38,12 +46,12 @@ class App:
         # create sprite groups
         # todo: remove these and let server handle card creation instead
         # blocker: server - client communication [WIP]
-        self.__world.spawnCard("Assets/Cards/MonsterCards/testmonstercard/", (pygame.Vector2(500, 1050), self.__inputHandler))
-        self.__world.spawnCard("Assets/Cards/MonsterCards/testmonstercard/", (pygame.Vector2(600, 1050), self.__inputHandler))
-        self.__world.spawnCard("Assets/Cards/MonsterCards/testmonstercard/", (pygame.Vector2(700, 1050), self.__inputHandler))
-        self.__world.spawnCard("Assets/Cards/MonsterCards/testmonstercard/", (pygame.Vector2(800, 1050), self.__inputHandler))
-        self.__world.spawnCard("Assets/Cards/MonsterCards/testmonstercard/", (pygame.Vector2(900, 1050), self.__inputHandler))
-        self.__world.spawnCard("Assets/Cards/MonsterCards/testmonstercard/", (pygame.Vector2(1000, 1050), self.__inputHandler))
+        self.__world.spawnMonsterCard("Assets/Cards/1/", pygame.Vector2(500, 1050), self.__inputHandler, Player(1000, 0, "test"))
+        self.__world.spawnMonsterCard("Assets/Cards/1/", pygame.Vector2(600, 1050), self.__inputHandler, Player(1000, 0, "test"))
+        self.__world.spawnMonsterCard("Assets/Cards/1/", pygame.Vector2(700, 1050), self.__inputHandler, Player(1000, 0, "test"))
+        self.__world.spawnMonsterCard("Assets/Cards/1/", pygame.Vector2(800, 1050), self.__inputHandler, Player(1000, 0, "test"))
+        self.__world.spawnMonsterCard("Assets/Cards/1/", pygame.Vector2(900, 1050), self.__inputHandler, Player(1000, 0, "test"))
+        self.__world.spawnMonsterCard("Assets/Cards/1/", pygame.Vector2(1000, 1050), self.__inputHandler, Player(1000, 0, "test"))
 
         while self.__running:
             self.__clock.tick(self.__FPS)
@@ -57,7 +65,8 @@ class App:
             self.__world.getCards().update()
 
             # draw groups
-            self.__window.drawSpriteGroup(self.cards)
+            self.__window.drawSpriteGroup(self.__world.getCards())
+            self.__window.drawSpriteGroup(self.__world.getHandCards())
 
             # event handler
             self.handleEvent(pygame.event.get())
@@ -69,7 +78,7 @@ class App:
     def handleEvent(self, events):
         # TODO: fix bug that stacks cards when dragging them around
         selectedCard = None
-        
+
         for event in events:
             if event.type == pygame.QUIT:
                 self.onCleanup()
@@ -95,7 +104,9 @@ class App:
                                             card.rect.center = field.rect.center
                                             field.image = card.image.copy()
                                             card.setDragging(False)
-
+            elif self.__inputHandler.getPressed()[pygame.K_SPACE]:
+                print("card spawned")
+                self.__world.spawnMonsterCard("Assets/Cards/MonsterCards/testmonstercard/", self.__inputHandler.getMousePos(), self.__inputHandler)
             elif event.type == pygame.MOUSEBUTTONUP:
                 mouse_x, mouse_y = pygame.mouse.get_pos()
                 mouse_pos = pygame.Vector2(mouse_x, mouse_y)
@@ -104,6 +115,7 @@ class App:
                         card.setDragging(False)
                         # TODO: send place card event to server
                         # resets the currently selected card in order to prevent it getting moved
+                        PlaceCard(self.__networkManager, card) # tells the server that the player placed this card
                         if not card == None:
                             card = None 
 

Game_Client/Classes/System/Components/InputHandler.py

@@ -1,17 +1,18 @@
 import pygame
 
-from Classes.Objects.World import World
-from Classes.Objects.BoardField import BoardField
+from Classes.Game.BoardField import BoardField
 
 class InputHandler:
     # returns pressed key
+    @staticmethod
     def getPressed():
         return pygame.key.get_pressed()
     
     # takes in movement inputs and maps them to x and y axis
+    @staticmethod
     def getInputAxis() -> tuple:
-        xvel:int = 0    
-        yvel:int = 0
+        xvel = 0    
+        yvel = 0
 
         # construct x and y velocity input axis
         if InputHandler.getPressed()[pygame.K_a] or InputHandler.getPressed()[pygame.K_LEFT]:
@@ -25,22 +26,23 @@ class InputHandler:
         
         return tuple((xvel, yvel))
     
-    def getMousePos(self) -> pygame.Vector2:
+    @staticmethod
+    def getMousePos() -> pygame.Vector2:
         return pygame.Vector2(pygame.mouse.get_pos())
 
     # get field under mousbutton
-    def getMouseHover(self, world:World) -> BoardField:
-        mouse_pos = self.getMousePos()
-        x_pos = mouse_pos.x / world.getCardWidth()
-        y_pos = mouse_pos.y / world.getCardHeight()
+    @staticmethod
+    def getMouseHover(mouse_pos: pygame.Vector2, world_card_width: int, world_card_height: int, board_fields: list) -> BoardField:
+        x_pos = mouse_pos.x / world_card_width
+        y_pos = mouse_pos.y / world_card_height
 
-        for field in world.getBoardFields():
+        for field in board_fields:
             field_x = field.getPos().x
             field_y = field.getPos().y
-            field_width = world.getCardWidth()  # Annahme: Jedes Feld hat eine Breite von 1 Einheit
-            field_height = world.getCardHeight()  # Annahme: Jedes Feld hat eine Höhe von 1 Einheit
+            field_width = world_card_width  # Annahme: Jedes Feld hat eine Breite von 1 Einheit
+            field_height = world_card_height  # Annahme: Jedes Feld hat eine Höhe von 1 Einheit
 
             if field_x <= x_pos < field_x + field_width and field_y <= y_pos < field_y + field_height:
                 return field
 
-        return None
+        return None

Game_Client/Classes/System/Components/Window.py

@@ -1,8 +1,8 @@
 import pygame
 from pygame.locals import *
 
-from Classes.Objects.BoardField import BoardField
-from Classes.Objects.World import World
+from Classes.Game.BoardField import BoardField
+from Classes.Game.World import World
 
 class Window:
     __width:int = 800

Game_Client/Classes/System/Network/NetworkManager.py

@@ -2,7 +2,7 @@ import json
 import socket
 import threading
 
-from Game_Client.Classes.System.Network.EventHandler import TCPEventHandler, UDPEventHandler
+from Classes.System.Network.EventHandler import TCPEventHandler, UDPEventHandler
 
 class NetworkManager:
     class UDP:
@@ -11,19 +11,22 @@ class NetworkManager:
             self.port = int(port)
             self.udpSocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
             self.eventHandler = UDPEventHandler(self.udpSocket)
+
+            try:
+                self.udpSocket.bind((self.addr, self.port))
+            except Exception as e:
+                print(f"Error binding UDP socket: {e}")
             
             # start listener thread
             self.listen()
 
         def send(self, message: dict):
-            self.udpSocket.sendto(json.dumps(message).encode(), (self.addr, self.port))
+            try:
+                self.udpSocket.sendto(json.dumps(message).encode(), (self.addr, self.port))
+            except Exception as e:
+                print(f"Error sending UDP data: {e}")
 
         # starts a listener thread for udp data
-        def listen(self):
-            udpThread = threading.Thread(target=self.receive)
-            udpThread.daemon = True
-            udpThread.start()
-
         def receive(self):
             while True:
                 try:
@@ -35,6 +38,11 @@ class NetworkManager:
                     print(f"Error receiving UDP data: {e}")
                     break
 
+        def listen(self):
+            udpThread = threading.Thread(target=self.receive)
+            udpThread.daemon = True
+            udpThread.start()
+
     class TCP:
         def __init__(self, addr: str, port: str):
             self.addr = addr
@@ -42,20 +50,19 @@ class NetworkManager:
             self.tcpSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             self.eventHandler = TCPEventHandler(self.tcpSocket)
 
-            # start listener thread
+            try:
+                self.tcpSocket.connect((self.addr, self.port))
+            except Exception as e:
+                print(f"Error connecting TCP socket: {e}")
+
+            # Starten des Listener-Threads
             self.listen()
 
-        def connect(self):
-            self.tcpSocket.connect((self.addr, self.port))
-
         def send(self, message: dict):
-            self.tcpSocket.sendall(json.dumps(message).encode())
-
-        # starts a listener thread for tcp data
-        def listen(self):
-            tcp_thread = threading.Thread(target=self.receive)
-            tcp_thread.daemon = True
-            tcp_thread.start()
+            try:
+                self.tcpSocket.sendall(json.dumps(message).encode())
+            except Exception as e:
+                print(f"Error sending TCP data: {e}")
 
         def receive(self):
             while True:
@@ -68,6 +75,11 @@ class NetworkManager:
                     print(f"Error receiving TCP data: {e}")
                     break
 
-    def __init__(self, addr: str, port: str):
-        self.tcp = self.TCP(addr, port)
-        self.udp = self.UDP(addr, port)
+        def listen(self):
+            tcpThread = threading.Thread(target=self.receive)
+            tcpThread.daemon = True
+            tcpThread.start()
+
+    def __init__(self, addr: str, tcpport: str, udpport: str):
+        self.tcp = self.TCP(addr, tcpport)
+        self.udp = self.UDP(addr, udpport)