From 01e925902a37a5e9e72711ce3d59340b08b7283a Mon Sep 17 00:00:00 2001 From: Benjamin Date: Fri, 16 Oct 2026 18:31:55 +0200 Subject: [PATCH] =?UTF-8?q?Assets=20und=20Klassen=20f=C3=BCr=20das=20Spiel?= =?UTF-8?q?=20hinzugef=C3=BCgt:=20neue=20Texturen,=20Level-=20und=20Item-K?= =?UTF-8?q?lassen=20implementiert,=20sowie=20die=20Flashlight-Logik=20erst?= =?UTF-8?q?ellt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/textures/items/furniture/plant.png | Bin 1533 -> 0 bytes .../textures/items/furniture/plants/plant.png | Bin 0 -> 1523 bytes data/textures/level/walls/wall_0.png | Bin 0 -> 4628 bytes game.py | 218 ++++-------------- scripts/constants.py | 9 + scripts/flashlight.py | 62 +++++ scripts/item.py | 53 +++++ scripts/level.py | 30 +++ scripts/player.py | 61 +++++ scripts/wall.py | 0 10 files changed, 254 insertions(+), 179 deletions(-) delete mode 100644 data/textures/items/furniture/plant.png create mode 100644 data/textures/items/furniture/plants/plant.png create mode 100644 data/textures/level/walls/wall_0.png create mode 100644 scripts/constants.py create mode 100644 scripts/flashlight.py create mode 100644 scripts/item.py create mode 100644 scripts/level.py create mode 100644 scripts/player.py create mode 100644 scripts/wall.py diff --git a/data/textures/items/furniture/plant.png b/data/textures/items/furniture/plant.png deleted file mode 100644 index 2f9e72216b873571b93272ae01cc7549341fc156..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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; diff --git a/data/textures/items/furniture/plants/plant.png b/data/textures/items/furniture/plants/plant.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b78e6f1c4de91f8602283bd3d2e9ca309d6919 GIT binary patch literal 1523 zcmVz@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;xNDt^oBoqU2=&000SaNLh0L04^f{04^f|c%?sf00007 zbV*G`2kHtC4;(62G7iiD00lQmL_t(o!@Zf$ZyQAv$G@{{yjzkcts_Sc4g?TCM5O)! z{Tp&J93rC10fle?!+~2w4-x8>3#zzO9GZhAA5c#I8~O(nMSwzSMct-x?AXqa?yh(D zaoEgyWxBRSkS{QlDrHLYAQ1opt}g{( z(J%O308p>i*hmQ1BlJCA`Ah^^SzD!S&Ol?&k|0R5OtKeFpAVL5B*eWtzp&=P;7!c~ zf_SZp^bjNhK^L2r)LubMDT{51Z6Dv?YT)b@@G>vh`|> z-P&3wBEWM8?-E5y3Gv1E8)RlRxE{gJ_9a8bc>`0^41Yedh9I1_J+%I%N|~mvGLR2= z9&qx^iVe&R|7Y{|2F=as7m~|xd>%=|LmN1h?==qy`2s@|hEmQ&k(ytc8ZIEBCqCcW zpt(5>8J)p#eGm~eEdcIy2=Bl7I)3}>6y}T{8ozmC7W>T}fWY0hEf+7(1#C-gHClzW zPrv(&X0BZ{8GR3@b{}VsixaDlM~@vGb%JF%IrqZaAp-FDVZv+q|4!Q;GN@_;*eBnv z)53xVBcsD|y|8NXfV+8PRyi9Hg8aY}t-r0Xbh~bF9{_4U-XEET+OI#|XYC_GyX8xb ziwa=B*^`WiGtq#PE=g%SPTx56*^j>|6VU)bWmK%FacVlVXojUb$rBl6M+D%(!>*Ky z(UcrDvN;3RIgRW|V?9x-lS5FaGr4bTDsZyp7 z-ZkM9q5INNx<0OybMJ@{)R5Q>28dHDGZababfnA_~K6NL*hrc4rlZN)oL!Su;^*6$Qx`7~adz#DaJp z;MhR>vAXGr%Z^MM!)b@61+!9h*kg%RsZu6xm=`Shx*NMZj0F-752?K{Qmo=6S_BeB zY*aHm3SdaAig`oXRf*kFnyv}}Zf&honyyOP{OsP{VU4DZ7i|YeFDP7!B<;`U4CD(8 z`2xer+A2x=(~ECTFPNBKFo*W8V^!QqI_-rIO|+Vn*lEXRhicCu2B>Nq$RW9Ewwl4D zdkt%Hop@EducXX~h4`=g&^Y-{Eagd_NV_AC!lo(ZEKN*Y=GjE*4RQ1(s#6;A{y3*J ziH9VmN|}nwrj!-@z(hQwjJiF#54lxB+HzR4OqMIQMPVQ77 zu@D)Z;Wb@L+{V?bH5QGPs3*V%CwE*yMUYqs#u&_u4vjHo9T}PTEHKRDA^HVP4}zA1 z#6tYMeUDjZ44oEI*Ab}$-w$G@Uahh2QwuZK2Hw#132Mh>p77VJHTFt>YMA7=j@`RE Z>|fr_r$crz@{<4n002ovPDHLkV1jm2orVAa literal 0 HcmV?d00001 diff --git a/data/textures/level/walls/wall_0.png b/data/textures/level/walls/wall_0.png new file mode 100644 index 0000000000000000000000000000000000000000..55b6712c4813438b207bcfd1b579ae4601785b29 GIT binary patch literal 4628 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 KMNUMnLSTY9H;L~6 literal 0 HcmV?d00001 diff --git a/game.py b/game.py index 930a364..05645a7 100644 --- a/game.py +++ b/game.py @@ -1,54 +1,11 @@ import pygame -from pygame.math import Vector2 -from pygame.rect import Rect -from pygame.typing import SequenceLike +from scripts.constants import * +from scripts.flashlight import Flashlight +from scripts.level import Level +from scripts.player import Player from scripts.utils import load_image -TILE_SIZE = 64 -COLS = 20 -ROWS = 12 -SCREEN_WIDTH = TILE_SIZE * COLS -SCREEN_HEIGHT = TILE_SIZE * ROWS -SCREEN_CENTER = (SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2) -PLAYER_SIZE = 40 -LIGHT_RADIUS = 150 - - -class Item: - 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) - self.width: float = width - self.height: float = height - self.color: SequenceLike[int] | str | int = color - self.visible: bool = False - self.flashlight = flashlight - self.game = game - self.image = image - self.mask = pygame.mask.Mask(self.rect.size, fill=True) - - @property - def rect(self) -> pygame.Rect: - 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.mask, self.rect.topleft) is not None - - - def render(self, surface: pygame.Surface): - if self.visible and self.flashlight.light_state: - 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: def __init__(self): @@ -75,24 +32,32 @@ class Game: # Assets self.assets = { "floor_01": load_image("level/ground/floor_1.png"), - "plant_01": load_image("items/furniture/plant.png"), + "plant_01": load_image("items/furniture/plants/plant.png"), + "wall": load_image("level/walls/wall_0.png"), } - # Items - 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), - ] + self.level = Level( + game=self, + items=[], + walls=[ + pygame.Rect(0, 0, SCREEN_WIDTH, TILE_SIZE), + pygame.Rect(0, TILE_SIZE, TILE_SIZE, SCREEN_HEIGHT), + pygame.Rect( + TILE_SIZE, SCREEN_HEIGHT - TILE_SIZE, SCREEN_WIDTH, TILE_SIZE + ), + pygame.Rect(SCREEN_WIDTH - TILE_SIZE, 0, SCREEN_WIDTH, SCREEN_HEIGHT), + ], + ) + self.level_zustand: int = 0 - # Level - self.walls: list[Rect] = [ - pygame.Rect(100 * 2, 100 * 2, 20 * 2, 50 * 2), - pygame.Rect(300 * 2, 300 * 2, 200 * 2, 20 * 2), - pygame.Rect(550 * 2, 80 * 2, 20 * 2, 200 * 2), - ] - + @property + def walls(self): + return self.level.walls + @property + def items(self): + return self.level.items def update(self) -> None: # Ereignisse @@ -105,8 +70,9 @@ class Game: if event.key == pygame.K_LSHIFT: self.player.speed = 300 if event.key == pygame.K_q: - self.flashlight_player.light_state = not self.flashlight_player.light_state - + self.flashlight_player.light_state = ( + not self.flashlight_player.light_state + ) if event.type == pygame.KEYUP and event.key == pygame.K_LSHIFT: self.player.speed = 150 @@ -122,12 +88,7 @@ class Game: # Hintergrund self.screen.fill((0, 0, 0, 0)) - for y in range(ROWS): - for x in range(COLS): - self.screen.blit( - self.assets["floor_01"], - pygame.Rect(x * 64, y * 64, TILE_SIZE, TILE_SIZE), - ) + self.level.render(self.screen) # 1. Zeichne 1 Tile -> [] @@ -144,18 +105,12 @@ class Game: for item in self.items: item.render(self.screen) - # Wände - for wall in self.walls: - pygame.draw.rect(self.screen, "grey", wall) - # Spieler self.player.render(self.screen) # Surfaces aktualisieren pygame.display.update() - - def run(self) -> None: while self.running: self.dt: float = self.clock.tick(60) / 1000.0 @@ -163,123 +118,28 @@ class Game: self.render() -class Player: - def __init__(self, pos: pygame.Vector2, width, height): - self.pos: Vector2 = pos - self.width: float = width - self.height: float = height - self.speed = 150 - 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( - keys[pygame.K_d] - keys[pygame.K_a], keys[pygame.K_s] - keys[pygame.K_w] - ) - - if direction.length_squared() > 0: - direction = direction.normalize() - - movement: pygame.Vector2 = direction * self.speed * dt - - self.pos.x += movement.x - - if self.pos.x - self.width / 2 < 0: - self.pos.x = self.width / 2 - if self.pos.x + self.width / 2 > SCREEN_WIDTH: - self.pos.x = SCREEN_WIDTH - self.width / 2 - self.rect.centerx = round(self.pos.x) - - for wall in walls: - if self.rect.colliderect(wall): - if movement.x > 0: - self.rect.right = wall.left - elif movement.x < 0: - self.rect.left = wall.right - self.pos.x = self.rect.centerx - - self.pos.y += movement.y - - if self.pos.y - self.height / 2 < 0: - self.pos.y = self.height / 2 - if self.pos.y + self.height / 2 > SCREEN_HEIGHT: - self.pos.y = SCREEN_HEIGHT - self.height / 2 - self.rect.centery = round(self.pos.y) - - for wall in walls: - if self.rect.colliderect(wall): - if movement.y > 0: - self.rect.bottom = wall.top - elif movement.y < 0: - self.rect.top = wall.bottom - self.pos.y = self.rect.centery - - def render(self, surface): - pygame.draw.rect(surface, (255, 0, 0), self.rect) -class Flashlight: - def __init__(self, game, sprite): + +class Wall: + def __init__(self, game, x: float, y: float, width: float, height: float): self.game = game - self.sprite = sprite - self.light_points: list[pygame.Vector2] = [] - self.light_surface: pygame.Surface = pygame.Surface((SCREEN_WIDTH, SCREEN_HEIGHT), pygame.SRCALPHA) - self.light_state: bool = True - self.light_mask = None - - def create_light_points(self) -> list[pygame.Vector2]: - points: list[pygame.Vector2] = [] - origin: Vector2 = self.sprite.pos - base_ray = pygame.Vector2(LIGHT_RADIUS, 0) - - for angle in range(360): - ray_end = origin + base_ray.rotate(angle) - for wall in self.game.walls: - intersection = wall.clipline(origin, ray_end) - if intersection: - ray_end = pygame.Vector2(intersection[0]) - points.append(ray_end) - - return points + self.x = x + self.y = y + self.width = width + self.height = height def update(self): - if not self.light_state: - return - - self.light_points = self.create_light_points() - self.light_surface.fill((0, 0, 0, 0)) - pygame.draw.polygon(self.light_surface, (243, 255, 74, 255), self.light_points) - self.light_mask = pygame.mask.from_surface(self.light_surface) - + pass def render(self, surface): - if self.light_state: - surface.blit(self.light_surface, (0, 0)) - points: list[pygame.Vector2] = [] - origin: Vector2 = self.sprite.pos - base_ray = pygame.Vector2(LIGHT_RADIUS, 0) + pass - # Lichtstrahlen berechnen - for angle in range(360): - ray_end = origin + base_ray.rotate(angle) - # Überschneidung mit den Wänden prüfen - for wall in self.game.walls: - # Überschneidung - intersection = wall.clipline(origin, ray_end) - if intersection: - ray_end = pygame.Vector2(intersection[0]) - points.append(ray_end) - - return points - game = Game() game.run() - """ Ein paar Assets schonmal zurechtschneiden. -""" \ No newline at end of file +""" diff --git a/scripts/constants.py b/scripts/constants.py new file mode 100644 index 0000000..7d4239a --- /dev/null +++ b/scripts/constants.py @@ -0,0 +1,9 @@ +TILE_SIZE = 64 +COLS = 20 +ROWS = 12 +SCREEN_WIDTH = TILE_SIZE * COLS +SCREEN_HEIGHT = TILE_SIZE * ROWS +SCREEN_CENTER = (SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2) +PLAYER_SIZE = 40 +LIGHT_RADIUS = 150 +WALL_COLOR = "grey" \ No newline at end of file diff --git a/scripts/flashlight.py b/scripts/flashlight.py new file mode 100644 index 0000000..d4658fe --- /dev/null +++ b/scripts/flashlight.py @@ -0,0 +1,62 @@ +import pygame +from pygame.math import Vector2 + +from scripts.constants import * + + +class Flashlight: + def __init__(self, game, sprite): + self.game = game + self.sprite = sprite + self.light_points: list[pygame.Vector2] = [] + self.light_surface: pygame.Surface = pygame.Surface( + (SCREEN_WIDTH, SCREEN_HEIGHT), pygame.SRCALPHA + ) + self.light_state: bool = True + self.light_mask = None + + def create_light_points(self) -> list[pygame.Vector2]: + points: list[pygame.Vector2] = [] + origin: Vector2 = self.sprite.pos + base_ray = pygame.Vector2(LIGHT_RADIUS, 0) + + for angle in range(360): + ray_end = origin + base_ray.rotate(angle) + for wall in self.game.walls: + intersection = wall.clipline(origin, ray_end) + if intersection: + ray_end = pygame.Vector2(intersection[0]) + points.append(ray_end) + + return points + + def update(self): + if not self.light_state: + return + + self.light_points = self.create_light_points() + self.light_surface.fill((0, 0, 0, 0)) + pygame.draw.polygon(self.light_surface, (243, 255, 74, 255), self.light_points) + self.light_mask = pygame.mask.from_surface(self.light_surface) + + def render(self, surface): + if self.light_state: + surface.blit(self.light_surface, (0, 0)) + points: list[pygame.Vector2] = [] + origin: Vector2 = self.sprite.pos + base_ray = pygame.Vector2(LIGHT_RADIUS, 0) + + # Lichtstrahlen berechnen + for angle in range(360): + ray_end = origin + base_ray.rotate(angle) + + # Überschneidung mit den Wänden prüfen + for wall in self.game.walls: + # Überschneidung + intersection = wall.clipline(origin, ray_end) + if intersection: + ray_end = pygame.Vector2(intersection[0]) + points.append(ray_end) + + return points + diff --git a/scripts/item.py b/scripts/item.py new file mode 100644 index 0000000..c50599d --- /dev/null +++ b/scripts/item.py @@ -0,0 +1,53 @@ +import pygame +from pygame.typing import SequenceLike + + +class Item: + 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) + self.width: float = width + self.height: float = height + self.color: SequenceLike[int] | str | int = color + self.visible: bool = False + self.flashlight = flashlight + self.game = game + self.image = image + self.mask = pygame.mask.Mask(self.rect.size, fill=True) + + @property + def rect(self) -> pygame.Rect: + 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.mask, self.rect.topleft) is not None + ) + + def render(self, surface: pygame.Surface): + if self.visible and self.flashlight.light_state: + 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()), + ) diff --git a/scripts/level.py b/scripts/level.py new file mode 100644 index 0000000..1fa95c3 --- /dev/null +++ b/scripts/level.py @@ -0,0 +1,30 @@ +import pygame + +from scripts.constants import * +from scripts.item import Item + + +class Level: + def __init__(self, game, items: list[Item], walls: list[pygame.Rect]): + self.game = game + + # Items + self.items = items + + # Level + self.walls = walls + + def render(self, surface: pygame.Surface): + for y in range(ROWS): + for x in range(COLS): + surface.blit( + self.game.assets["floor_01"], + pygame.Rect(x * 64, y * 64, TILE_SIZE, TILE_SIZE), + ) + + # Wände + for wall in self.walls: + surface.blit(self.game.assets["wall"], wall) + + def draw_walls(self, surface: pygame.Surface): + pass diff --git a/scripts/player.py b/scripts/player.py new file mode 100644 index 0000000..8468ebc --- /dev/null +++ b/scripts/player.py @@ -0,0 +1,61 @@ +import pygame +from pygame.math import Vector2 + +from scripts.constants import * + + +class Player: + def __init__(self, pos: pygame.Vector2, width, height): + self.pos: Vector2 = pos + self.width: float = width + self.height: float = height + self.speed = 150 + 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( + keys[pygame.K_d] - keys[pygame.K_a], keys[pygame.K_s] - keys[pygame.K_w] + ) + + if direction.length_squared() > 0: + direction = direction.normalize() + + movement: pygame.Vector2 = direction * self.speed * dt + + self.pos.x += movement.x + + if self.pos.x - self.width / 2 < 0: + self.pos.x = self.width / 2 + if self.pos.x + self.width / 2 > SCREEN_WIDTH: + self.pos.x = SCREEN_WIDTH - self.width / 2 + self.rect.centerx = round(self.pos.x) + + for wall in walls: + if self.rect.colliderect(wall): + if movement.x > 0: + self.rect.right = wall.left + elif movement.x < 0: + self.rect.left = wall.right + self.pos.x = self.rect.centerx + + self.pos.y += movement.y + + if self.pos.y - self.height / 2 < 0: + self.pos.y = self.height / 2 + if self.pos.y + self.height / 2 > SCREEN_HEIGHT: + self.pos.y = SCREEN_HEIGHT - self.height / 2 + self.rect.centery = round(self.pos.y) + + for wall in walls: + if self.rect.colliderect(wall): + if movement.y > 0: + self.rect.bottom = wall.top + elif movement.y < 0: + self.rect.top = wall.bottom + self.pos.y = self.rect.centery + + def render(self, surface): + pygame.draw.rect(surface, (255, 0, 0), self.rect) diff --git a/scripts/wall.py b/scripts/wall.py new file mode 100644 index 0000000..e69de29