diff --git a/ZIPTE.png b/ZIPTE.png new file mode 100644 index 0000000..fd65d90 Binary files /dev/null and b/ZIPTE.png differ diff --git a/game.py b/game.py index 2c304c0..7293d84 100644 --- a/game.py +++ b/game.py @@ -52,7 +52,7 @@ class Game: self.player = Player(self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) # Flashlight - self.flashlight = Taschenlampe(self) + self.flashlight_player = Flashlight(self, self.player) # Items self.test_item = Item(140, 300, 20, 20, "blue") @@ -78,16 +78,16 @@ class Game: if event.key == pygame.K_LSHIFT: self.player.speed = 300 if event.key == pygame.K_q: - self.flashlight.light_state = not self.flashlight.light_state - if self.flashlight.render_item: - self.flashlight.render_item = False + self.flashlight_player.light_state = not self.flashlight_player.light_state + if self.flashlight_player.render_item: + self.flashlight_player.render_item = False if event.type == pygame.KEYUP and event.key == pygame.K_LSHIFT: self.player.speed = 150 # Spielzustände aktualisieren self.player.update(walls=self.walls, dt=self.dt) - self.flashlight.update() + self.flashlight_player.update() def render(self) -> None: # Hintergrund @@ -110,8 +110,8 @@ class Game: # -> [][][][][][] # Licht - self.flashlight.render(self.screen) - if self.flashlight.render_item: + self.flashlight_player.render(self.screen) + if self.flashlight_player.render_item: self.test_item.render(self.screen) # Wände @@ -124,24 +124,7 @@ class Game: # Surfaces aktualisieren pygame.display.update() - def create_light_points(self) -> list[pygame.Vector2]: - points: list[pygame.Vector2] = [] - origin: Vector2 = self.player.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.walls: - # Überschneidung - intersection = wall.clipline(origin, ray_end) - if intersection: - ray_end = pygame.Vector2(intersection[0]) - points.append(ray_end) - - return points + def run(self) -> None: while self.running: @@ -207,8 +190,8 @@ class Player: pygame.draw.rect(surface, (255, 0, 0), self.rect) -class Taschenlampe: - def __init__(self, game): +class Flashlight: + def __init__(self, game, sprite): self.light_points: list[pygame.Vector2] self.light_surface: pygame.Surface = pygame.Surface( (SCREEN_WIDTH, SCREEN_HEIGHT), pygame.SRCALPHA @@ -216,15 +199,16 @@ class Taschenlampe: self.light_state: bool = True self.game = game self.render_item = False + self.sprite = sprite def update(self): - self.light_points: list[Vector2] = self.game.create_light_points() + self.light_points: list[Vector2] = self.create_light_points() def render(self, surface) -> bool: if self.light_state: self.light_surface.fill((0, 0, 0, 0)) pygame.draw.polygon( - self.light_surface, (243, 255, 74, 255), self.game.create_light_points() + self.light_surface, (243, 255, 74, 255), self.create_light_points() ) surface.blit(self.light_surface, (0, 0)) light_mask = pygame.mask.from_surface(self.light_surface) @@ -241,15 +225,34 @@ class Taschenlampe: # Item zeichnen, wenn Masken sich überlappen + def create_light_points(self) -> list[pygame.Vector2]: + 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 + game = Game() game.run() """ -class Taschenlampe erstellen +in Klasse Flashlight: -Methoden: init(), update(), render() -WICHTIG: Alles in ihre richtigen Methoden +create_light_points() in Flashlight machen + +render_item in Item Klasse machen """