Mit Ruff formatiert
This commit is contained in:
parent
9ccdf57c7e
commit
e17c55fbcf
1 changed files with 20 additions and 73 deletions
93
game.py
93
game.py
|
|
@ -7,24 +7,18 @@ SCREEN_HEIGHT = 720
|
||||||
class Game:
|
class Game:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
pygame.init()
|
pygame.init()
|
||||||
|
|
||||||
pygame.display.set_caption("School Game")
|
pygame.display.set_caption("School Game")
|
||||||
|
|
||||||
self.clock = pygame.Clock()
|
self.clock = pygame.Clock()
|
||||||
self.screen: pygame.Surface = pygame.display.set_mode(
|
self.screen: pygame.Surface = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT))
|
||||||
(SCREEN_WIDTH, SCREEN_HEIGHT)
|
|
||||||
)
|
|
||||||
|
|
||||||
self.display: pygame.Surface = pygame.Surface(
|
|
||||||
(self.screen.get_width() // 2, self.screen.get_height() // 2)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
self.display: pygame.Surface = pygame.Surface((self.screen.get_width() // 2, self.screen.get_height() // 2))
|
||||||
|
|
||||||
self.running: bool = True
|
self.running: bool = True
|
||||||
|
|
||||||
self.dt: int = 0
|
self.dt: int = 0
|
||||||
|
|
||||||
|
|
||||||
self.player_pos = pygame.Vector2(self.display.get_width() / 2, self.display.get_height() / 2)
|
self.player_pos = pygame.Vector2(self.display.get_width() / 2, self.display.get_height() / 2)
|
||||||
self.player_width = 20
|
self.player_width = 20
|
||||||
self.player_height = 20
|
self.player_height = 20
|
||||||
|
|
@ -40,11 +34,7 @@ class Game:
|
||||||
|
|
||||||
self.light_points: list[pygame.Vector2] = []
|
self.light_points: list[pygame.Vector2] = []
|
||||||
|
|
||||||
self.walls = [
|
self.walls = [pygame.Rect(100, 100, 20, 50), pygame.Rect(300, 300, 200, 20), pygame.Rect(550, 80, 20, 200)]
|
||||||
pygame.Rect(100, 100, 20, 50),
|
|
||||||
pygame.Rect(300, 300, 200, 20),
|
|
||||||
pygame.Rect(550, 80, 20, 200)
|
|
||||||
]
|
|
||||||
self.light_radius = 75
|
self.light_radius = 75
|
||||||
|
|
||||||
# self.circle = pygame.geometry.Circle(self.player_pos[0], self.player_pos[1], 30)
|
# self.circle = pygame.geometry.Circle(self.player_pos[0], self.player_pos[1], 30)
|
||||||
|
|
@ -53,21 +43,15 @@ class Game:
|
||||||
while self.running:
|
while self.running:
|
||||||
self.dt: float = self.clock.tick(60) / 1000.0
|
self.dt: float = self.clock.tick(60) / 1000.0
|
||||||
|
|
||||||
|
|
||||||
self.update()
|
self.update()
|
||||||
self.calculate_collsions()
|
self.calculate_collsions()
|
||||||
|
|
||||||
self.render()
|
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()
|
pygame.display.update()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def update(self) -> None:
|
def update(self) -> None:
|
||||||
# Event-Keys
|
# Event-Keys
|
||||||
for event in pygame.event.get():
|
for event in pygame.event.get():
|
||||||
|
|
@ -85,19 +69,15 @@ class Game:
|
||||||
if event.key == pygame.K_LSHIFT:
|
if event.key == pygame.K_LSHIFT:
|
||||||
self.player.speed = 150
|
self.player.speed = 150
|
||||||
|
|
||||||
if...:
|
if ...:
|
||||||
...
|
...
|
||||||
|
|
||||||
|
|
||||||
self.player.update(walls=self.walls, dt=self.dt)
|
self.player.update(walls=self.walls, dt=self.dt)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def render(self) -> None:
|
def render(self) -> None:
|
||||||
|
|
||||||
self.display.fill((0, 0, 0, 0))
|
self.display.fill((0, 0, 0, 0))
|
||||||
|
|
||||||
|
|
||||||
"""RAYCASTING"""
|
"""RAYCASTING"""
|
||||||
ray_end = pygame.Vector2()
|
ray_end = pygame.Vector2()
|
||||||
self.light_points = []
|
self.light_points = []
|
||||||
|
|
@ -105,48 +85,33 @@ class Game:
|
||||||
|
|
||||||
# Lichtstrahlen berechnen
|
# Lichtstrahlen berechnen
|
||||||
for i in range(360):
|
for i in range(360):
|
||||||
|
|
||||||
rotated_vector = vector.rotate(i)
|
rotated_vector = vector.rotate(i)
|
||||||
ray_end = self.player_pos + rotated_vector
|
ray_end = self.player_pos + rotated_vector
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Überschneidung mit den Wänden prüfen
|
# Überschneidung mit den Wänden prüfen
|
||||||
for wall in self.walls:
|
for wall in self.walls:
|
||||||
überschneidung = wall.clipline(self.player_pos, ray_end)
|
überschneidung = wall.clipline(self.player_pos, ray_end)
|
||||||
|
|
||||||
|
|
||||||
if überschneidung:
|
if überschneidung:
|
||||||
schnittpunkt = pygame.Vector2(überschneidung[0])
|
schnittpunkt = pygame.Vector2(überschneidung[0])
|
||||||
|
|
||||||
ray_end = schnittpunkt
|
ray_end = schnittpunkt
|
||||||
|
|
||||||
|
|
||||||
self.light_points.append(ray_end)
|
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)
|
pygame.draw.rect(self.display, (255, 0, 0), self.flashlight_rect, 1)
|
||||||
|
|
||||||
self.player.render(surface=self.display)
|
self.player.render(surface=self.display)
|
||||||
|
|
||||||
pygame.draw.rect(self.display, self.color_item, self.item_rect)
|
pygame.draw.rect(self.display, self.color_item, self.item_rect)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for wall in self.walls:
|
for wall in self.walls:
|
||||||
pygame.draw.rect(self.display, "grey", wall)
|
pygame.draw.rect(self.display, "grey", wall)
|
||||||
|
|
||||||
|
|
||||||
def calculate_collsions(self) -> None:
|
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
|
nearest_x = self.player_pos.x
|
||||||
if self.player_pos.x < self.item_rect.left:
|
if self.player_pos.x < self.item_rect.left:
|
||||||
nearest_x = self.item_rect.left
|
nearest_x = self.item_rect.left
|
||||||
|
|
@ -187,7 +152,6 @@ class Game:
|
||||||
return distance_squared < self.radius * self.radius
|
return distance_squared < self.radius * self.radius
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Player:
|
class Player:
|
||||||
def __init__(self, game, pos: pygame.Vector2, width, height):
|
def __init__(self, game, pos: pygame.Vector2, width, height):
|
||||||
self.game = game
|
self.game = game
|
||||||
|
|
@ -198,40 +162,32 @@ class Player:
|
||||||
|
|
||||||
self.speed = 150
|
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):
|
def update(self, walls, dt):
|
||||||
|
|
||||||
|
|
||||||
# Smooth Movement
|
# Smooth Movement
|
||||||
keys = pygame.key.get_pressed()
|
keys = pygame.key.get_pressed()
|
||||||
|
|
||||||
direction = pygame.Vector2(
|
direction = pygame.Vector2(keys[pygame.K_d] - keys[pygame.K_a], keys[pygame.K_s] - keys[pygame.K_w])
|
||||||
keys[pygame.K_d] - keys[pygame.K_a],
|
|
||||||
keys[pygame.K_s] - keys[pygame.K_w]
|
|
||||||
)
|
|
||||||
|
|
||||||
if direction.length_squared() > 0:
|
if direction.length_squared() > 0:
|
||||||
direction = direction.normalize()
|
direction = direction.normalize()
|
||||||
|
|
||||||
movement: pygame.Vector2 = direction * self.speed * dt
|
movement: pygame.Vector2 = direction * self.speed * dt
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
self.pos.x += movement.x
|
self.pos.x += movement.x
|
||||||
|
|
||||||
if self.pos.x - self.width/2 < 0:
|
if self.pos.x - self.width / 2 < 0:
|
||||||
self.pos.x = self.width/2
|
self.pos.x = self.width / 2
|
||||||
|
|
||||||
|
if self.pos.x + self.width / 2 > SCREEN_WIDTH / 2:
|
||||||
if self.pos.x + self.width/2 > SCREEN_WIDTH/2:
|
self.pos.x = SCREEN_WIDTH / 2 - self.width / 2
|
||||||
self.pos.x = SCREEN_WIDTH/2 - self.width/2
|
|
||||||
# self.pos += movement
|
# self.pos += movement
|
||||||
|
|
||||||
|
|
||||||
# player_rect.center = round(player_pos)
|
# player_rect.center = round(player_pos)
|
||||||
self.rect.centerx = round(self.pos.x)
|
self.rect.centerx = round(self.pos.x)
|
||||||
|
|
||||||
for wall in walls:
|
for wall in walls:
|
||||||
if self.rect.colliderect(wall):
|
if self.rect.colliderect(wall):
|
||||||
if movement.x > 0:
|
if movement.x > 0:
|
||||||
|
|
@ -242,15 +198,13 @@ class Player:
|
||||||
|
|
||||||
self.pos.x = self.rect.centerx
|
self.pos.x = self.rect.centerx
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
self.pos.y += movement.y
|
self.pos.y += movement.y
|
||||||
|
|
||||||
if self.pos.y - self.height/2 < 0:
|
if self.pos.y - self.height / 2 < 0:
|
||||||
self.pos.y = self.height/2
|
self.pos.y = self.height / 2
|
||||||
|
|
||||||
if self.pos.y + self.height/2 > SCREEN_HEIGHT/2:
|
if self.pos.y + self.height / 2 > SCREEN_HEIGHT / 2:
|
||||||
self.pos.y = SCREEN_HEIGHT/2 - self.height/2
|
self.pos.y = SCREEN_HEIGHT / 2 - self.height / 2
|
||||||
|
|
||||||
self.rect.centery = round(self.pos.y)
|
self.rect.centery = round(self.pos.y)
|
||||||
|
|
||||||
|
|
@ -264,17 +218,11 @@ class Player:
|
||||||
|
|
||||||
self.pos.y = self.rect.centery
|
self.pos.y = self.rect.centery
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def render(self, surface):
|
def render(self, surface):
|
||||||
|
|
||||||
pygame.draw.rect(surface, (255, 0, 0), self.rect)
|
pygame.draw.rect(surface, (255, 0, 0), self.rect)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
game = Game()
|
game = Game()
|
||||||
game.run()
|
game.run()
|
||||||
|
|
||||||
|
|
@ -294,4 +242,3 @@ game.run()
|
||||||
|
|
||||||
------------------------------------- GEHST. -------------------------------------
|
------------------------------------- GEHST. -------------------------------------
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue