From 3bc545d3c039a1c7698edbb201bfb890327e492a Mon Sep 17 00:00:00 2001 From: Benjamin Date: Fri, 23 Oct 2026 18:24:51 +0200 Subject: [PATCH] =?UTF-8?q?Player=20als=20Player=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/textures/entity/player/player.png | Bin 824 -> 1091 bytes game.py | 7 ++++--- scripts/player.py | 15 ++++++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/data/textures/entity/player/player.png b/data/textures/entity/player/player.png index 44f7420df47233284b73069b3893b6bb4148d044..b38e2ae12dcedc27c27295070e8923b0cf5249cb 100644 GIT binary patch delta 1071 zcmV+~1kn4q2Ez!DBYy-6NklhG|}2a*;=8M zMp!DM2(BJHi6{mC)MMEOL_}E2;-Pr(AiWgD9yDO}(v#b+*wxAwq)T?CHW(ALjk`0G z&LqX9hx9PcG_%RB9-QBc+xfzfH}AbL-{1GW-|zS4%?ph`Gk?ULjJs45P>nzU)dW-{ z5I{8n)d&PoO+YmQ0aO!EjX(g^1XLpsKs5o?2n0|~Ks5pZR1;8*KmgSQR3i{TH38LF zr{bYw6SJ*u^|@?1B+W%kfOezDU)tBvUY=j{^pO%nM1Zl0*;Y5B9hB!60k1GePyf)8 z5JA)hre=z6`G4_89&*dc_$I#i?lKk41RxRX7vm%*z|>69WAt*ocwiS`&xZU@SEXq6 zUKU8kH}PO(gV^(Y7vP`#-+>bcre=yHB7Gb=IJjcA_%9(g11d%nxNYca__4U)Hysxt ziLb+B6SJ+ML?36*oa)-Xv`}@+W^JA)-#AXS*%C>GVt+GW-(dV-_x<+cQ6HIjArb?$ z=`T4p`nFp)u;)3q?2LZusn%%EZNz|FHXVxXc>%DEbqsDVJ1}eW0F;VlcE0?9 zhzp3s0I+95_3TG0wznI9=)KRxmcpXz0LRFc>PyA4BppC73+#XGb4rDaoE+|+2G37U z1Mun6A%DWL0Sez7T^lao81LZPxltZCc-*~z;_CZ+web~_f1RPw9Aax`FM6$lrBx|k zIN`epA}*lUD(>(0RMOKnx&0jgnp@v=jhBS40*p<}wldF-1FULTbaMi|R^i$?JO5jn zogE@OM|@9(qOZf2R)xOX_sd1O@7^#sBnhElOMgt$>)g0!<=NnjKETFk62oUcA~7Jk zIpLP;*R8I7EUilYxz@;j|==^1poj5AY({UO#lFT zCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy24YJ`L;yhmKmbAQkv2d8 z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2kHnD4m&pRL4S5%0007fNklBt8NNECkAVKycSfxCoUKN67-6(fEx@PqDEA>Uw*cy$rL`t4y1#G~fC~eU^`0R_ zbwGRc?4m?S`s_Oab|ZoIb%vcEYOPUgor62O0Gl^U0)KJ}7$v^0Yj1uTAYizt>pJ^k zL8k#zCE#tKwT7l?;=c@e9*RUg5h}|vxC31hFl>ZGbs!=4;kNm0?yd_&><*Zm`;Zn4 zMQZM;=YFck;4F6tziS7Gsi#27LlJ8J0@evpmL*bWHF#Byxer%LApn3eM)cR)-Ff)` zdf5;EC4cDvr4;l6e91!+VWZ>ki{hlidn06w5!cH;SpY0Fu#hUy9qkk$te;rPhfLx0WTDwlPyRK;(2>DL9 z7JtA9RKYu+2-yjk@dt>=BQSy;d{+<=GXb-Q8(M2`0ThdHNCMX656F8W^k(=xe}KhD z>JRYV2PmcB`}lzG;{%jZN#`E`&=~XbY24@I?P~l1QwiSg&cR7or9S`wuD9g-sW g)El4*p1}b40gYQXsfrFT6951J07*qoM6N<$f~7!C`v3p{ diff --git a/game.py b/game.py index 293195d..af2a5cc 100644 --- a/game.py +++ b/game.py @@ -25,17 +25,18 @@ class Game: self.player_pos = pygame.Vector2( self.screen.get_width() / 2, self.screen.get_height() / 2 ) - self.player = Player(self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) - # 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/plants/plant.png"), "wall": load_image("level/walls/wall_0.png"), + + "player": load_image("entity/player/player.png"), } + self.player = Player(self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE, image=self.assets["player"]) + self.flashlight_player = Flashlight(self, self.player) self.level = Level( game=self, diff --git a/scripts/player.py b/scripts/player.py index 1e9d1a0..82b19f4 100644 --- a/scripts/player.py +++ b/scripts/player.py @@ -5,15 +5,17 @@ from scripts.constants import * class Player: - def __init__(self, pos: pygame.Vector2, width, height): + def __init__(self, pos: pygame.Vector2, width, height, image=None): self.pos: Vector2 = pos self.width: float = width self.height: float = height self.speed = 150 + self.image = image self.rect = pygame.Rect( self.pos[0] - self.width / 2, self.pos[1] - self.height / 2, width, height ) + def update(self, walls, dt): keys = pygame.key.get_pressed() direction = pygame.Vector2( @@ -59,5 +61,12 @@ class Player: self.rect.top = wall.bottom self.pos.y = self.rect.centery - def render(self, surface): - pygame.draw.rect(surface, (255, 0, 0), self.rect) + + def render(self, surface: pygame.Surface): + if not self.image: + pygame.draw.rect(surface, self.color, self.rect) + else: + surface.blit( + self.image, + (self.pos[0]-TILE_SIZE/2, self.pos[1]-TILE_SIZE/2-10, self.image.get_width(), self.image.get_height()), + )