bhinz/Ninja-Jump-and-run
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Leaf-Spawner aus Baum-Tiles erzeugen

Browse source
This commit is contained in:
Benjamin 2026-05-20 17:23:09 +02:00
parent f7f8dffaaa
commit dfd2baad7a
2 changed files with 49 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
editor.py
View file

@ -14,23 +14,23 @@ class Editor:
pygame.display.set_caption("Editor") pygame.display.set_caption("Editor")
self.screen: pygame.Surface = pygame.display.set_mode((640, 480)) self.screen: pygame.Surface = pygame.display.set_mode((640, 480))
self.display: pygame.Surface = pygame.Surface((320, 240)) self.display: pygame.Surface = pygame.Surface((self.screen.get_width()//2, self.screen.get_height()//2))
self.clock: pygame.time.Clock = pygame.time.Clock() self.clock: pygame.time.Clock = pygame.time.Clock()
self.assets: dict[str, list[pygame.Surface]] = { self.assets: dict[str, list[pygame.Surface]] = {
"decor": load_images("tiles/decor"), "decor": load_images(path="tiles/decor"),
"grass": load_images("tiles/grass"), "grass": load_images(path="tiles/grass"),
"large_decor": load_images("tiles/large_decor"), "large_decor": load_images(path="tiles/large_decor"),
"stone": load_images("tiles/stone"), "stone": load_images(path="tiles/stone"),
} }
self.movement: list[bool] = [False, False, False, False] self.movement: list[bool] = [False, False, False, False]
self.tilemap: Tilemap = Tilemap(self, tile_size=16) self.tilemap: Tilemap = Tilemap(game=self, tile_size=16)
try: try:
self.tilemap.load("map.json") self.tilemap.load(path="map.json")
except FileNotFoundError: except FileNotFoundError:
pass pass
@ -58,10 +58,10 @@ class Editor:
# Scroll-Offset fürs Rendern # Scroll-Offset fürs Rendern
render_scroll: tuple[int, int] = (int(self.scroll[0]), int(self.scroll[1])) render_scroll: tuple[int, int] = (int(self.scroll[0]), int(self.scroll[1]))
# #
self.tilemap.render(self.display, offset=render_scroll) self.tilemap.render(surface=self.display, offset=render_scroll)
# Aktuelle Kachel (Kopie) # Aktuelle Kachel (Kopie)
current_tile_img = self.assets[self.tile_list[self.tile_group]][ current_tile_img: pygame.Surface = self.assets[self.tile_list[self.tile_group]][
self.tile_variant self.tile_variant
].copy() ].copy()
# Halbtransparent # Halbtransparent
@ -104,7 +104,7 @@ class Editor:
) )
else: else:
# Offgrid Tile direkt platzieren # Offgrid Tile direkt platzieren
world_pos = ( world_pos: tuple[int, int] = (
int(mpos[0] + self.scroll[0]), int(mpos[0] + self.scroll[0]),
int(mpos[1] + self.scroll[1]), int(mpos[1] + self.scroll[1]),
) )
@ -118,7 +118,7 @@ class Editor:
# Rechtsklick: Lösche Tile # Rechtsklick: Lösche Tile
if self.right_clicking: if self.right_clicking:
# Hole Position des anvisierten Tile-Objekts # Hole Position des anvisierten Tile-Objekts
tile_loc: str = str(tile_pos[0]) + ";" + str(tile_pos[1]) tile_loc: str = str(object=tile_pos[0]) + ";" + str(tile_pos[1])
# Wenn Tile in Tilemap existiert, lösche es. # Wenn Tile in Tilemap existiert, lösche es.
if tile_loc in self.tilemap.tilemap: if tile_loc in self.tilemap.tilemap:
del self.tilemap.tilemap[tile_loc] del self.tilemap.tilemap[tile_loc]
@ -215,7 +215,7 @@ class Editor:
self.tilemap.autotile() self.tilemap.autotile()
if event.key == pygame.K_o: if event.key == pygame.K_o:
print("Map saved.") print("Map saved.")
self.tilemap.save("map.json") self.tilemap.save(path="map.json")
if event.key in (pygame.K_LSHIFT, pygame.K_RSHIFT): if event.key in (pygame.K_LSHIFT, pygame.K_RSHIFT):
self.shift: bool = True self.shift: bool = True
if event.type == pygame.KEYUP: if event.type == pygame.KEYUP:

60
game.py
View file

@ -1,4 +1,4 @@
import pygame import pygame # ty: ignore[unresolved-import]
import sys import sys
from scripts.entities import Player from scripts.entities import Player
from scripts.utils import load_image from scripts.utils import load_image
@ -7,14 +7,16 @@ from scripts.tilemap import Tilemap
from scripts.clouds import Clouds from scripts.clouds import Clouds
from scripts.animation import Animation from scripts.animation import Animation
SCREEN_WIDTH = 640
SCREEN_HEIGHT = 480
class Game: class Game:
def __init__(self): def __init__(self):
pygame.init() pygame.init()
pygame.display.set_caption("Jump and run spiel") pygame.display.set_caption("Jump and run spiel")
self.screen: pygame.Surface = pygame.display.set_mode((640, 480)) self.screen: pygame.Surface = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT))
self.display: pygame.Surface = pygame.Surface((320, 240)) self.display: pygame.Surface = pygame.Surface((self.screen.get_width()//2, self.screen.get_height()//2))
self.clock: pygame.time.Clock = pygame.time.Clock() self.clock: pygame.time.Clock = pygame.time.Clock()
self.running: bool = True self.running: bool = True
@ -24,36 +26,45 @@ class Game:
self.assets: dict = { self.assets: dict = {
# Andere Dinge # Andere Dinge
"background": load_image("background.png"), "background": load_image(path="background.png"),
"decor": load_images("tiles/decor"), "decor": load_images(path="tiles/decor"),
"grass": load_images("tiles/grass"), "grass": load_images(path="tiles/grass"),
"large_decor": load_images("tiles/large_decor"), "large_decor": load_images(path="tiles/large_decor"),
"stone": load_images("tiles/stone"), "stone": load_images(path="tiles/stone"),
"clouds": load_images("clouds"), "clouds": load_images(path="clouds"),
# Spieler # Spieler
"player/idle": Animation( "player/idle": Animation(
load_images("entities/player/idle"), image_duration=6 load_images(path="entities/player/idle"), image_duration=6
), ),
"player/run": Animation( "player/run": Animation(
load_images("entities/player/run"), image_duration=4 load_images(path="entities/player/run"), image_duration=4
), ),
"player/jump": Animation(load_images("entities/player/jump")), "player/jump": Animation(load_images(path="entities/player/jump")),
"player/slide": Animation(load_images("entities/player/slide")), "player/slide": Animation(load_images(path="entities/player/slide")),
"player/wall_slide": Animation(load_images("entities/player/wall_slide")), "player/wall_slide": Animation(load_images(path="entities/player/wall_slide")),
"particles/leaf": Animation(load_images("particles/leaf"), image_duration=20, loop=False), "particles/leaf": Animation(load_images(path="particles/leaf"), image_duration=20, loop=False),
} }
self.player: Player = Player(self, (50, 50), (8, 15)) self.player: Player = Player(game=self, pos=(50, 50), size=(8, 15))
self.tilemap: Tilemap = Tilemap(game=self, tile_size=16)
self.leaf_spawners: list[pygame.Rect] = []
self.particles = []
self.tilemap: Tilemap = Tilemap(self, 16)
try: try:
self.tilemap.load("map.json") self.tilemap.load(path="map.json")
except FileNotFoundError: except FileNotFoundError:
pass pass
self.clouds: Clouds = Clouds(self.assets["clouds"], count=16) for tree in self.tilemap.extract([("large_decor", 2)], keep=True):
self.leaf_spawners.append(pygame.Rect(left=4 + tree['pos'][0], top=4 + tree['pos'][1], width=23, height=13))
print(len(self.leaf_spawners), "Baum-Spawner gefunden")
self.clouds: Clouds = Clouds(cloud_images=self.assets["clouds"], count=16)
self.isJumping: bool = False self.isJumping: bool = False
self.scroll: list[float] = [0, 0] self.scroll: list[float] = [0, 0]
def run(self) -> None: def run(self) -> None:
while self.running: while self.running:
self.display.blit(self.assets["background"], (0, 0)) self.display.blit(self.assets["background"], (0, 0))
@ -68,17 +79,18 @@ class Game:
- self.display.get_height() / 2 - self.display.get_height() / 2
- self.scroll[1] - self.scroll[1]
) / 30 ) / 30
render_scroll = (int(self.scroll[0]), int(self.scroll[1])) render_scroll: tuple[int, int] = (int(self.scroll[0]), int(self.scroll[1]))
self.clouds.update() self.clouds.update()
self.clouds.render(self.display, offset=render_scroll) self.clouds.render(surface=self.display, offset=render_scroll)
self.tilemap.render(self.display, offset=render_scroll) self.tilemap.render(surface=self.display, offset=render_scroll)
self.player.update(self.tilemap, ((self.movement[1] - self.movement[0]), 0)) self.player.update(self.tilemap, movement=((self.movement[1] - self.movement[0]), 0))
self.player.render(self.display, offset=render_scroll) self.player.render(surface=self.display, offset=render_scroll)
# print(int(self.player.pos[0])) # print(int(self.player.pos[0]))
# print(int(self.player.pos[1])) # print(int(self.player.pos[1]))
# print(self.tilemap.tiles_around(self.player.pos)) # print(self.tilemap.tiles_around(self.player.pos))
for event in pygame.event.get(): for event in pygame.event.get():
if event.type == pygame.QUIT: if event.type == pygame.QUIT:
self.running = False self.running = False