diff --git a/game.py b/game.py index 79d67c2..62405a8 100644 --- a/game.py +++ b/game.py @@ -1,4 +1,3 @@ - import pygame from pygame.math import Vector2 from pygame.rect import Rect @@ -9,8 +8,8 @@ from scripts.utils import load_image TILE_SIZE = 64 COLS = 20 ROWS = 12 -SCREEN_WIDTH = TILE_SIZE*COLS -SCREEN_HEIGHT = TILE_SIZE*ROWS +SCREEN_WIDTH = TILE_SIZE * COLS +SCREEN_HEIGHT = TILE_SIZE * ROWS SCREEN_CENTER = (SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2) PLAYER_SIZE = 40 LIGHT_RADIUS = 150 @@ -25,14 +24,14 @@ class Item: self.height: float = height self.color: SequenceLike[int] | str | int = color - @property - def rect(self)-> pygame.Rect: + def rect(self) -> pygame.Rect: return pygame.Rect(self.x, self.y, self.width, self.height) - - def render(self, surface) : + + def render(self, surface): pygame.draw.rect(surface, self.color, self.rect) + class Game: def __init__(self): # Pygame setup @@ -40,29 +39,92 @@ class Game: pygame.display.set_caption("School Game") self.clock = pygame.Clock() # Surfaces - self.screen: pygame.Surface = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT)) + self.screen: pygame.Surface = pygame.display.set_mode( + (SCREEN_WIDTH, SCREEN_HEIGHT) + ) # Pygame-Variablen self.running: bool = True self.dt: int = 0 # Spieler - self.player_pos = pygame.Vector2(self.screen.get_width() / 2, self.screen.get_height() / 2) + 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 = Taschenlampe(self) + # Items - self.test_item = Item(140 ,300, 20, 20, "blue") + self.test_item = Item(140, 300, 20, 20, "blue") self.test_item_mask = pygame.mask.Mask(self.test_item.rect.size, fill=True) # 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)] - # Licht - 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.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), + ] # Assets - self.assets = { - "floor_01": load_image("level/ground/floor_1.png") - } + self.assets = {"floor_01": load_image("level/ground/floor_1.png")} - def create_light_points(self)-> list[pygame.Vector2]: + def update(self) -> None: + # Ereignisse + for event in pygame.event.get(): + if event.type == pygame.QUIT: + self.running = False + if event.type == pygame.KEYDOWN: + if event.key == pygame.K_ESCAPE: + self.running = False + 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 + + 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() + + def render(self) -> None: + # 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), + ) + + # 1. Zeichne 1 Tile -> [] + + # 2. Zeichne eine Reihe von Tiles -> [][][][][][] + + # 3. Zeichne mehrere Reihen von Tiles + # -> [][][][][][] + # -> [][][][][][] + # -> [][][][][][] + + # Licht + self.flashlight.render(self.screen) + if self.flashlight.render_item: + self.test_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 create_light_points(self) -> list[pygame.Vector2]: points: list[pygame.Vector2] = [] origin: Vector2 = self.player.pos base_ray = pygame.Vector2(LIGHT_RADIUS, 0) @@ -81,70 +143,6 @@ class Game: return points - - def update(self) -> None: - # Ereignisse - for event in pygame.event.get(): - if event.type == pygame.QUIT: - self.running = False - if event.type == pygame.KEYDOWN: - if event.key == pygame.K_ESCAPE: - self.running = False - if event.key == pygame.K_LSHIFT: - self.player.speed = 300 - if event.key == pygame.K_q: - self.light_state = not self.light_state - - 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.light_points: list[Vector2] = self.create_light_points() - - - def render(self) -> None: - # 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)) - - - # 1. Zeichne 1 Tile -> [] - - # 2. Zeichne eine Reihe von Tiles -> [][][][][][] - - # 3. Zeichne mehrere Reihen von Tiles - # -> [][][][][][] - # -> [][][][][][] - # -> [][][][][][] - - - # Licht - if self.light_state: - self.light_surface.fill((0, 0, 0, 0)) - pygame.draw.polygon(self.light_surface, (243, 255, 74, 255), self.create_light_points()) - self.screen.blit(self.light_surface, (0, 0)) - light_mask = pygame.mask.from_surface(self.light_surface) - if light_mask.overlap(self.test_item_mask, self.test_item.rect.topleft) is not None: - # Item zeichnen, wenn Masken sich überlappen - self.test_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 @@ -158,11 +156,15 @@ class Player: 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) + 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]) + 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() @@ -205,5 +207,45 @@ class Player: pygame.draw.rect(surface, (255, 0, 0), self.rect) +class Taschenlampe: + def __init__(self, game): + 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.game = game + self.render_item = False + + def update(self): + self.light_points: list[Vector2] = self.game.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() + ) + surface.blit(self.light_surface, (0, 0)) + light_mask = pygame.mask.from_surface(self.light_surface) + + if light_mask.overlap(self.game.test_item_mask, self.game.test_item.rect.topleft) is not None: + self.render_item = True + else: + self.render_item = False + + + # Item zeichnen, wenn Masken sich überlappen + + game = Game() game.run() + + +""" +class Taschenlampe erstellen + +Methoden: init(), update(), render() + +WICHTIG: Alles in ihre richtigen Methoden +"""