Steev/Online_TCG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved merge conflicts

Browse Source
This commit is contained in:
steev
2024-01-14 18:45:57 +01:00
parent ae49b1cec7 96df962227
commit 0602e638f3
14 changed files with 121 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Game_Client/Classes/Game/Events/PlaceCard.py
View File

@ -28,7 +28,7 @@ def CardPlaced(world:World, card:int, type:str, owner:str, pos:pygame.Vector2, i
world.spawnSpellCard(f"Assets/Cards/{card}/", pos, inputHandler, owner)
pass
elif type == "TrapCard":
world.spawmTrapCard(f"Assets/Cards/{card}/", pos, inputHandler, owner)
world.spawnTrapCard(f"Assets/Cards/{card}/", pos, inputHandler, owner)
pass
pass

4
Game_Client/Classes/System/App.py
View File

@ -116,9 +116,11 @@ class App:
mouse_pos = pygame.Vector2(mouse_x, mouse_y)
if event.button == 1: # Wenn linke Maustaste losgelassen wird
for card in self.__world.getCards():
# card.setState("placed")
# TODO: send place card event to server
# resets the currently selected card in order to prevent it getting moved
try:
card.setDragging(False)
card.setState("placed")
# TODO: send place card event to server
# resets the currently selected card in order to prevent it getting moved
PlaceCard(self.__tcpClient, card) # tells the server that the player placed this card