diff --git a/GameObject.py b/GameObject.py index 29bbfb2..fa03a53 100644 --- a/GameObject.py +++ b/GameObject.py @@ -27,7 +27,7 @@ class GameObject(object): if(self.image is not None): self.rect = screen.blit(self.image, (self.pos_x, self.pos_y)) else: - print("Kein Image hinterlegt!") + self.rect = pygame.draw.rect(screen, (255,0,0), (self.pos_x, self.pos_y, self.width, self.height)) return def setpos(self, pos_x, pos_y): @@ -220,7 +220,15 @@ class Weapons(GameObject): class Item(GameObject): def __init__(self, name, pos_x, pos_y, width, height, image=None) -> None: super().__init__(name, pos_x, pos_y, width, height, image) + self.speed = 5 + + def move(self, x, y): + self.pos_x += x + self.pos_y += y + + pass class item_extra_life(Item): def __init__(self, name, pos_x, pos_y, width, height, image=None) -> None: - super().__init__(name, pos_x, pos_y, width, height, image) \ No newline at end of file + super().__init__(name, pos_x, pos_y, width, height, image) + self.speed = 10 \ No newline at end of file diff --git a/game.py b/game.py index 5000e46..bf1dc43 100644 --- a/game.py +++ b/game.py @@ -7,10 +7,19 @@ import animations from levels import * import pygame import logger +import random +import copy #Leveldefinitions levels_list.append(first_level("First Level", (500,500), 10, 2)) + +items = [ + GameObject.item_extra_life("Extra-Life", 0, 0, 30, 30, None) +] + +items_spawned = list() + #Override def loadlevels(): for level in levels_list: @@ -18,3 +27,25 @@ def loadlevels(): print("LEVEL") print(level) pass + +def item_handler(screen:pygame.Surface): + + spawn_chance = random.randint(0, 10) + print(spawn_chance) + if(spawn_chance == 0): + #print("Spawne item") + spawn_item_random(screen) + + for item in items_spawned: + item:GameObject.Item + print(item) + item.move(0, item.speed) + item.render(screen) + + pass + +def spawn_item_random(screen:pygame.Surface): + + items_spawned.append(copy.deepcopy(items[0])) + print("Spawn") + pass diff --git a/interface.py b/interface.py index d214ae1..01a1965 100644 --- a/interface.py +++ b/interface.py @@ -22,9 +22,9 @@ class Healthbar(UIelement): grundwert = self.max_health prozentwert = playerheatlh prozent = (playerheatlh/grundwert) - print(prozent) - print(prozentwert) - print(playerheatlh) + #print(prozent) + #print(prozentwert) + #print(playerheatlh) #Update until playerhealth not zero if(self.health > 0): diff --git a/test.py b/test.py index c918b54..04ac586 100644 --- a/test.py +++ b/test.py @@ -134,6 +134,7 @@ while(gamestate): healthbar1.render(screen) player1.firecontrol(screen) player2.firecontrol(screen) + game.item_handler(screen) #print("Spieler1 Lifes: ", player1.lifes) #print("Spieler2 Lifes: ", player2.lifes)