refactor: 🔥 removed server from repository

Client/Classes/Game/World.py

@@ -36,7 +36,6 @@ class World():
 
     def buildGameWorld(self):
         # construct elements arround the playerfield
-        # Todo add lifepoint label for player and enemy and make them scriptable move to player class
 
         # presets the y position later passed down to the vector2
         eRow1Height = 85
@@ -56,17 +55,10 @@ class World():
         pManaPos = pygame.Vector2(20, pRow2Height + 255)
 
         # labeling
-<<<<<<< HEAD:Game_Client/Classes/Game/World.py
-        self.__labels.append(Label("PlayerHP", self.__screen, "0 / 0", pHPPos))
-        self.__labels.append(Label("PlayerName", self.__screen, "Not Connected", pNamePos))
-        self.__labels.append(Label("PlayerMana", self.__screen, "0", pManaPos))
-        self.__labels.append(Label("EnemyHP", self.__screen, "0 / 0", eHPPos))
-=======
         self.__labels.append(Label("PlayerHP", self.__screen, "1000 / 1000", pHPPos))
         self.__labels.append(Label("PlayerName", self.__screen, "Not Connected", pNamePos))
         self.__labels.append(Label("PlayerName", self.__screen, "0", pManaPos))
         self.__labels.append(Label("EnemyHP", self.__screen, "1000 / 1000", eHPPos))
->>>>>>> 18dcd6cc42f1f23e221702147a36f650f6aae6ac:Client/Classes/Game/World.py
         self.__labels.append(Label("EnemyName", self.__screen, "Not Connected", eNamePos))
 
         self.__boardFields.append(BoardField("EnemyDeck", "Enemy", "Deck", eDeckPos, PathUtil.getAbsolutePathTo("Assets/Cards/0/field.png"), "e-deck"))

Client/Classes/System/Network/EventHandler.py

@@ -13,15 +13,9 @@ class TCPEventHandler:
     def __init__(self, socket:socket):
         self.tcp_socket = socket
 
-<<<<<<< HEAD:Game_Client/Classes/System/Network/EventHandler.py
-    def handleEvents(self, message:dict, inputHandler:InputHandler, world:World):
-        if message["event"] == "loginresponse":
-            # todo: handle login response here
-=======
     def handleEvents(self, message, inputHandler:InputHandler, world:World):
         print(message)
         if message["event"] == "loginresponse":
->>>>>>> 18dcd6cc42f1f23e221702147a36f650f6aae6ac:Client/Classes/System/Network/EventHandler.py
             LoginResponse(message, world)
             pass
         elif message["event"] == "startgame":
@@ -34,17 +28,6 @@ class TCPEventHandler:
             CardPlaced(world, message["card"], message["type"], message["owner"], pygame.Vector2(int(message["x"]), int(message["y"]), inputHandler))
             pass    
         elif message["event"] == "MoveCard":
-<<<<<<< HEAD:Game_Client/Classes/System/Network/EventHandler.py
-            # CardMoved(
-            #    world, 
-            #    message["card"], 
-            #    message["type"], 
-            #    message["owner"], 
-            #    pygame.Vector2(int(message["old_x"]), int(message["old_y"])), 
-            #    pygame.Vector2(int(message["new_x"]), int(message["new_y"])), 
-            #    inputHandler, world)
-=======
->>>>>>> 18dcd6cc42f1f23e221702147a36f650f6aae6ac:Client/Classes/System/Network/EventHandler.py
             pass
         elif message["event"] == "RemoveCard":
             pass