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

fixed a bunch of shit

Browse Source
This commit is contained in:
steev
2023-12-17 22:51:25 +01:00
parent 0b447f9505
commit 2055786d4a
15 changed files with 120 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Game_Client/Classes/Objects/BoardField.py
View File

@ -2,6 +2,7 @@ import os
import pygame
class BoardField(pygame.sprite.Sprite):
__fieldID:str
__name:str
__side:str
__type:str
@ -12,13 +13,14 @@ class BoardField(pygame.sprite.Sprite):
image:pygame.image
rect:pygame.rect
def __init__(self, name:str, side:str, type:str, pos:pygame.Vector2, imagePath:str):
def __init__(self, name:str, side:str, type:str, pos:pygame.Vector2, imagePath:str, fid:str):
pygame.sprite.Sprite.__init__(self)
self.__name = name
self.__side = side
self.__type = type
self.__pos = pos
self.__holdsCard = None
self.__fieldID = fid
# Überprüfen des Dateipfads
if not os.path.exists(imagePath):
@ -78,4 +80,7 @@ class BoardField(pygame.sprite.Sprite):
return self.__color
def setCardHolding(self, card):
self.__holdsCard = card
self.__holdsCard = card
def getFieldID(self) -> str:
return self.__fieldID

10
Game_Client/Classes/Objects/Player.py
View File

@ -1,6 +1,7 @@
import pygame
class Player:
__id:int
__hp:int
__name:str
__handCards:pygame.Sprite.Group
@ -9,6 +10,12 @@ class Player:
self.__hp = hp
self.__name = name
def setID(self, id:int):
self.__id = id
def getID(self) -> int:
return self.__id
def getName(self) -> str:
return self.__name
@ -21,7 +28,8 @@ class Player:
def getHand(self) -> pygame.Sprite.Group:
return self.__handCards
def getAddToHand(self, card) -> pygame.Sprite.Group:
def AddToHand(self, card) -> pygame.Sprite.Group:
self.__handCards.add(card)
return self.__handCards
def removeFromHand(self, pos:int) -> pygame.Sprite.Group:

9
Game_Client/Classes/Objects/World.py
View File

@ -61,12 +61,11 @@ class World():
eMonsterPos = pygame.Vector2((self.__cardOffset + (((self.__cardWidth + 10) - 30) * (i+1)), eRow1Height))
eEffectPos = pygame.Vector2((self.__cardOffset + (((self.__cardWidth + 10) - 30) * (i+1))), eRow2Height)
self.__boardFields.append(BoardField("PlayerMonsterField-"+str(i), "Player", "MonsterField", pMonsterPos, "Assets/Cards/Arena/field.png"))
self.__boardFields.append(BoardField("PlayerEffectField-"+str(i), "Player", "EffectField", pEffectPos, "Assets/Cards/Arena/field.png"))
self.__boardFields.append(BoardField("EnemyMonsterField-"+str(i), "Enemy", "MonsterField", eMonsterPos, "Assets/Cards/Arena/field.png"))
self.__boardFields.append(BoardField("EnemySpellTrapField-"+str(i), "Enemy", "EffectField", eEffectPos, "Assets/Cards/Arena/field.png"))
self.__boardFields.append(BoardField("PlayerMonsterField-"+str(i), "Player", "MonsterField", pMonsterPos, "Assets/Cards/Arena/field.png", "pm"+str(id)))
self.__boardFields.append(BoardField("PlayerEffectField-"+str(i), "Player", "EffectField", pEffectPos, "Assets/Cards/Arena/field.png", "pe"+str(id)))
self.__boardFields.append(BoardField("EnemyMonsterField-"+str(i), "Enemy", "MonsterField", eMonsterPos, "Assets/Cards/Arena/field.png", "em"+str(id)))
self.__boardFields.append(BoardField("EnemySpellTrapField-"+str(i), "Enemy", "EffectField", eEffectPos, "Assets/Cards/Arena/field.png", "ee"+str(id)))
def getBoardFields(self) -> list:
return self.__boardFields