From f91d7a7fa15e8f3bdbd44aa7d1c20b8917ebc37d Mon Sep 17 00:00:00 2001 From: Benjamin Date: Fri, 9 Oct 2026 18:32:12 +0200 Subject: [PATCH] ENDE: 09.10.2026 --- data/textures/items/furniture/automat.png | Bin 0 -> 4013 bytes data/textures/items/furniture/plant.png | Bin 0 -> 1533 bytes game.py | 44 ++++++++++++++++------ 3 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 data/textures/items/furniture/automat.png create mode 100644 data/textures/items/furniture/plant.png diff --git a/data/textures/items/furniture/automat.png b/data/textures/items/furniture/automat.png new file mode 100644 index 0000000000000000000000000000000000000000..fa1a0491aacc104ae258db2ba737bf2b08f61dc8 GIT binary patch literal 4013 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 Tc}-;=00000NkvXXu0mjfQ-Zvv literal 0 HcmV?d00001 diff --git a/data/textures/items/furniture/plant.png b/data/textures/items/furniture/plant.png new file mode 100644 index 0000000000000000000000000000000000000000..2f9e72216b873571b93272ae01cc7549341fc156 GIT binary patch literal 1533 zcmVz@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;xNDt^oBoqU2=&000SaNLh0L04^f{04^f|c%?sf00007 zbV*G`2kHt55EcnF(Q9k~00luwL_t(o!@Zf!ZW~n;$NzW6c%~#xT1So?90(vjM5I1I zpCK#5A|k3BPzXrivS5J}(M5#1LSh3E5~^4<3rk+0tnv(ffT9RcD6MGPG)^4HanhOb z%p4YzJHB^(=fk1lt~{UTch5cNf6g5<{Lf=AbUnBy72@;NWx6y%IB{I~ z6il+YOG*$GgyR6sZ3_S}K5fGD0suaAJ%G@XAczQ->xBRSP%JT2YE??}AQ1opuFeEt z(Fc4l0NAWISR#b$5qh4lye5LoEzDECU|?sBszAsED3~zO^l*IIly4Sl;FD@1Nz?0wA zF_I}TlVG?J6-2SbBq4hGhlR=4M$qoMFfTFqXL94%lpdH|gc$4RId^C6+hy9>vn7K( zb@@4-vYYh=yRouJM1be^-zAEa65^9@mdMO&a6N*b?@5NrlLkgc8UB1=4L~?8dtm)5 zwJMEVW*{H%JmC0=6&sj2{$u&p5=~6#XOhcscp6E=Jsa4Q&oy@m#S%jkhEmQ&k(!(t z87v^8Cq7MNn&2SRDe2c&; zjgTNJwJN>yrU{=2N6#Il>*Go}_l^ibKG6QhN-g8cF(wG^dZ^`d;iP*zb1 z;-pJKp~zgbmkRVvS#QdZ;(M%dhlFO)j%$Ufw9Inar*X|-0wLM-1}lGKq4QrwKB zrHXEb(EoC$0*Qsl=?pLFTIx1#v)*9QSc!T9tpDYXE2sz(3&9wJnbV;$rmQ20dCvmF zJRYJCXnGK|93&Rvr`0>mI$>xZAafm&I`HivW;W{$cJ$c7*p^ jh5prWp8q;F*4Ej-a2Toist}9T00000NkvXXu0mjfq&m0; literal 0 HcmV?d00001 diff --git a/game.py b/game.py index 1616a21..33090e4 100644 --- a/game.py +++ b/game.py @@ -16,7 +16,7 @@ LIGHT_RADIUS = 150 class Item: - def __init__(self, x: float, y: float, width: float, height: float, color, flashlight, game): + def __init__(self, x: float, y: float, width: float, height: float, color, flashlight, game, image: pygame.Surface = None): self.x: float = x self.y: float = y self.vector = pygame.Vector2(self.x, self.y) @@ -26,19 +26,28 @@ class Item: self.visible: bool = False self.flashlight = flashlight self.game = game + self.mask = pygame.mask.Mask(self.rect.size, fill=True) + self.image = image @property def rect(self) -> pygame.Rect: - return pygame.Rect(self.x, self.y, self.width, self.height) + if not self.image: + return pygame.Rect(self.x, self.y, self.width, self.height) + + else: + return pygame.Rect(self.x, self.y, self.image.get_width(), self.image.get_height()) def update(self): self.visible = False - self.visible = self.flashlight.light_mask.overlap(self.game.test_item_mask, self.rect.topleft) is not None + self.visible = self.flashlight.light_mask.overlap(self.mask, self.rect.topleft) is not None - def render(self, surface): + def render(self, surface: pygame.Surface): if self.visible and self.flashlight.light_state: - pygame.draw.rect(surface, self.color, self.rect) + if not self.image: + pygame.draw.rect(surface, self.color, self.rect) + else: + surface.blit(self.image, (self.x, self.y, self.image.get_width(), self.image.get_height())) class Game: @@ -63,9 +72,19 @@ class Game: # Flashlight self.flashlight_player = Flashlight(self, self.player) + # Assets + self.assets = { + "floor_01": load_image("level/ground/floor_1.png"), + "plant_01": load_image("items/furniture/plant.png"), + } + # Items - self.test_item = Item(140, 300, 20, 20, "blue", self.flashlight_player, self) - self.test_item_mask = pygame.mask.Mask(self.test_item.rect.size, fill=True) + self.items = [ + Item(140, 300, 20, 20, "blue", self.flashlight_player, self, self.assets["plant_01"]), + Item(140, 340, 20, 20, "red", self.flashlight_player, self), + ] + + # Level self.walls: list[Rect] = [ pygame.Rect(100 * 2, 100 * 2, 20 * 2, 50 * 2), @@ -73,8 +92,7 @@ class Game: pygame.Rect(550 * 2, 80 * 2, 20 * 2, 200 * 2), ] - # Assets - self.assets = {"floor_01": load_image("level/ground/floor_1.png")} + def update(self) -> None: # Ereignisse @@ -96,7 +114,9 @@ class Game: # Spielzustände aktualisieren self.player.update(walls=self.walls, dt=self.dt) self.flashlight_player.update() - self.test_item.update() + + for item in self.items: + item.update() def render(self) -> None: # Hintergrund @@ -120,7 +140,9 @@ class Game: # Licht self.flashlight_player.render(self.screen) - self.test_item.render(self.screen) + + for item in self.items: + item.render(self.screen) # Wände for wall in self.walls: