Compare commits

..

No commits in common. "c8494dcab1661c098629c73b05d62750947a2170" and "d7f2b54f3b5749806c5286444825ce9bfa745cc7" have entirely different histories.

4 changed files with 33 additions and 40 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 824 B

21
game.py
View file

@ -25,30 +25,29 @@ class Game:
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_player = Flashlight(self, self.player)
# Assets
self.assets = {
"floor_01": load_image("level/ground/floor_1.png"),
"plant_01": load_image("items/furniture/plants/plant.png"),
"wall": load_image("level/walls/wall_0.png"),
"player": load_image("entity/player/player.png"),
}
self.player = Player(self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE, image=self.assets["player"])
self.flashlight_player = Flashlight(self, self.player)
self.level = Level(
game=self,
items=[],
walls=[
Wall(self, 0, 0, SCREEN_WIDTH//TILE_SIZE, 1),
Wall(self, 0, TILE_SIZE, 1, SCREEN_HEIGHT//TILE_SIZE),
Wall(self, 0, 0, SCREEN_WIDTH, TILE_SIZE),
Wall(self, 0, TILE_SIZE, TILE_SIZE, SCREEN_HEIGHT),
Wall(
self, TILE_SIZE, SCREEN_HEIGHT - TILE_SIZE, SCREEN_WIDTH//TILE_SIZE, 1
self, TILE_SIZE, SCREEN_HEIGHT - TILE_SIZE, SCREEN_WIDTH, TILE_SIZE
),
Wall(self, SCREEN_WIDTH - TILE_SIZE, 0, 1, SCREEN_HEIGHT//TILE_SIZE),
Wall(self, 500, 500, 2, 2)
Wall(self, SCREEN_WIDTH - TILE_SIZE, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
Wall(self, 500, 500, 128, 128)
],
)
@ -126,6 +125,6 @@ game.run()
"""
Wie funktioniert Kollision mit Bildern?????????????????????????!!!!!!!!!!!!!!!!!!!!!!!!!!!
(Günter hat ein Tutorial)
Fertigen Raum machen.
Immer alles strukturieren
"""

View file

@ -5,17 +5,15 @@ from scripts.constants import *
class Player:
def __init__(self, pos: pygame.Vector2, width, height, image=None):
def __init__(self, pos: pygame.Vector2, width, height):
self.pos: Vector2 = pos
self.width: float = width
self.height: float = height
self.speed = 150
self.image = image
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(
@ -61,12 +59,5 @@ class Player:
self.rect.top = wall.bottom
self.pos.y = self.rect.centery
def render(self, surface: pygame.Surface):
if not self.image:
pygame.draw.rect(surface, self.color, self.rect)
else:
surface.blit(
self.image,
(self.pos[0]-TILE_SIZE/2, self.pos[1]-TILE_SIZE/2-10, self.image.get_width(), self.image.get_height()),
)
def render(self, surface):
pygame.draw.rect(surface, (255, 0, 0), self.rect)

View file

@ -4,32 +4,35 @@ from scripts.constants import *
class Wall:
def __init__(self, game, x: float, y: float, cols: int, rows: int):
def __init__(self, game, x: float, y: float, width: float, height: float):
self.game = game
self.x = x
self.y = y
self.cols = cols
self.rows = rows
self.rect = pygame.Rect(x, y, cols*TILE_SIZE, rows*TILE_SIZE)
self.drawed_rect = None
self.grid: list[list[pygame.Rect]] = []
self.width = width
self.height = height
self.rect = pygame.Rect(x, y, width, height)
for i in range(self.width):
if i % 64 == 0:
end_ergebnis_width = i
for row in range(self.rows): # rows
current_row = []
for col in range(self.cols): # cols
current_row.append(pygame.Rect(self.x+col*TILE_SIZE, self.y+row*TILE_SIZE, col*TILE_SIZE, row*TILE_SIZE))
for i in range(self.height):
if i % 64 == 0:
end_ergebnis_height = i
self.grid.append(current_row)
self.length: dict = {
"width": end_ergebnis_width+TILE_SIZE,
"height": end_ergebnis_height+TILE_SIZE,
}
def update(self):
pass
def render(self, surface: pygame.Surface):
for row in self.grid:
for wall_rect in row:
surface.blit(self.game.assets["wall"], wall_rect)
for x in range(self.length["width"]):
for y in range(self.length["height"]):
if y % TILE_SIZE == 0 and x % TILE_SIZE == 0:
surface.blit(self.game.assets["wall"], pygame.Rect(self.x+x, self.y+y, self.width, self.height))
def get_rect(self) -> pygame.Rect:
return self.rect
return self.rect