diff --git a/game.py b/game.py index 8d2a69e..284fbb8 100644 --- a/game.py +++ b/game.py @@ -7,24 +7,18 @@ SCREEN_HEIGHT = 720 class Game: def __init__(self): pygame.init() - + pygame.display.set_caption("School Game") self.clock = pygame.Clock() - self.screen: pygame.Surface = pygame.display.set_mode( - (SCREEN_WIDTH, SCREEN_HEIGHT) - ) - - self.display: pygame.Surface = pygame.Surface( - (self.screen.get_width() // 2, self.screen.get_height() // 2) - ) + self.screen: pygame.Surface = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT)) + self.display: pygame.Surface = pygame.Surface((self.screen.get_width() // 2, self.screen.get_height() // 2)) self.running: bool = True self.dt: int = 0 - self.player_pos = pygame.Vector2(self.display.get_width() / 2, self.display.get_height() / 2) self.player_width = 20 self.player_height = 20 @@ -40,11 +34,7 @@ class Game: self.light_points: list[pygame.Vector2] = [] - self.walls = [ - pygame.Rect(100, 100, 20, 50), - pygame.Rect(300, 300, 200, 20), - pygame.Rect(550, 80, 20, 200) - ] + self.walls = [pygame.Rect(100, 100, 20, 50), pygame.Rect(300, 300, 200, 20), pygame.Rect(550, 80, 20, 200)] self.light_radius = 75 # self.circle = pygame.geometry.Circle(self.player_pos[0], self.player_pos[1], 30) @@ -53,21 +43,15 @@ class Game: while self.running: self.dt: float = self.clock.tick(60) / 1000.0 - self.update() self.calculate_collsions() self.render() - - self.screen.blit( - pygame.transform.scale(self.display, self.screen.get_size()) - ) + self.screen.blit(pygame.transform.scale(self.display, self.screen.get_size())) pygame.display.update() - - def update(self) -> None: # Event-Keys for event in pygame.event.get(): @@ -85,19 +69,15 @@ class Game: if event.key == pygame.K_LSHIFT: self.player.speed = 150 - if...: + if ...: ... - self.player.update(walls=self.walls, dt=self.dt) - - def render(self) -> None: self.display.fill((0, 0, 0, 0)) - """RAYCASTING""" ray_end = pygame.Vector2() self.light_points = [] @@ -105,48 +85,33 @@ class Game: # Lichtstrahlen berechnen for i in range(360): - rotated_vector = vector.rotate(i) ray_end = self.player_pos + rotated_vector - - # Überschneidung mit den Wänden prüfen for wall in self.walls: überschneidung = wall.clipline(self.player_pos, ray_end) - if überschneidung: schnittpunkt = pygame.Vector2(überschneidung[0]) ray_end = schnittpunkt - self.light_points.append(ray_end) - - self.flashlight_rect = pygame.draw.polygon( - self.display, - (243, 255, 74), - self.light_points - ) + self.flashlight_rect = pygame.draw.polygon(self.display, (243, 255, 74), self.light_points) pygame.draw.rect(self.display, (255, 0, 0), self.flashlight_rect, 1) self.player.render(surface=self.display) pygame.draw.rect(self.display, self.color_item, self.item_rect) - - - for wall in self.walls: pygame.draw.rect(self.display, "grey", wall) - def calculate_collsions(self) -> None: - - for light_ray in self.light_points: + for light_ray in self.light_points: nearest_x = self.player_pos.x if self.player_pos.x < self.item_rect.left: nearest_x = self.item_rect.left @@ -187,7 +152,6 @@ class Game: return distance_squared < self.radius * self.radius - class Player: def __init__(self, game, pos: pygame.Vector2, width, height): self.game = game @@ -198,40 +162,32 @@ class Player: 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): - # Smooth Movement 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() 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 < 0: + self.pos.x = self.width / 2 - - if self.pos.x + self.width/2 > SCREEN_WIDTH/2: - self.pos.x = SCREEN_WIDTH/2 - self.width/2 + if self.pos.x + self.width / 2 > SCREEN_WIDTH / 2: + self.pos.x = SCREEN_WIDTH / 2 - self.width / 2 # self.pos += movement - # player_rect.center = round(player_pos) self.rect.centerx = round(self.pos.x) - + for wall in walls: if self.rect.colliderect(wall): if movement.x > 0: @@ -242,15 +198,13 @@ class Player: 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 < 0: + self.pos.y = self.height / 2 - if self.pos.y + self.height/2 > SCREEN_HEIGHT/2: - self.pos.y = SCREEN_HEIGHT/2 - self.height/2 + if self.pos.y + self.height / 2 > SCREEN_HEIGHT / 2: + self.pos.y = SCREEN_HEIGHT / 2 - self.height / 2 self.rect.centery = round(self.pos.y) @@ -264,17 +218,11 @@ class Player: self.pos.y = self.rect.centery - - - - def render(self, surface): pygame.draw.rect(surface, (255, 0, 0), self.rect) - - game = Game() game.run() @@ -294,4 +242,3 @@ game.run() ------------------------------------- GEHST. ------------------------------------- """ -