From a72349f7dfd232d8eda98a137b731fdcd1b6c7a3 Mon Sep 17 00:00:00 2001 From: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:45:52 +0100 Subject: [PATCH] changed to normal version again (no dev shortcuts) changed font for Think (because the f looked like a p) uploaded bossbar images Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> --- art/images/box/bossbar_edge.png | Bin 0 -> 208 bytes art/images/box/bossbar_empty.png | Bin 0 -> 203 bytes art/images/box/bossbar_full.png | Bin 0 -> 159 bytes classes.py | 4 ++-- main.py | 8 ++++---- 5 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 art/images/box/bossbar_edge.png create mode 100644 art/images/box/bossbar_empty.png create mode 100644 art/images/box/bossbar_full.png diff --git a/art/images/box/bossbar_edge.png b/art/images/box/bossbar_edge.png new file mode 100644 index 0000000000000000000000000000000000000000..61423c088a0c6a7ea40229953e7eefd36fca43aa GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K51UT4$0sJ%JQwfk$L90|S2|2s5s*U!DmR zZ1Qw*45^5FdwZi`lY>B8;Q5VQTt-Vow+L{@Grhm+7kz1BV)efDePh30sJ%JQwfk$L90|S2|2s5s*U!DmR zto3wp45^5FdwZi`lY>B8V1mY_jSRsXgbcSbuyYw~HI+zFnDXb}_olrmkM(!0wZB}x zuEFE2)x7TybNDrUzQ5Scux8!%)B9r=D7?S^qk8sa+XV?s3bP0l+XkK#(G2( literal 0 HcmV?d00001 diff --git a/art/images/box/bossbar_full.png b/art/images/box/bossbar_full.png new file mode 100644 index 0000000000000000000000000000000000000000..1222b9c5dc31f0195c7fa68ed8cb50edac5dd558 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K51UT4$0sJ%JQwfk$L90|S2|2s5s*U!DmR z4D@ty45^5Fd&Q9PfC9sT4Tj|rM+8^RX!&chv$}lE&hyMFd+Qks^qCtBh(jCr_3D^T U`zS9j0UFNW>FVdQ&MBb@0Eq`Hpa1{> literal 0 HcmV?d00001 diff --git a/classes.py b/classes.py index 30aa290..22964e4 100644 --- a/classes.py +++ b/classes.py @@ -748,7 +748,7 @@ class Level(Label): super().draw(screen) class Thinks(Label): - def __init__(self, x, y, width, height, text, font='simple', font_size=15, font_color='#000000', sprite='thinks.png') -> None: + def __init__(self, x, y, width, height, text, font='simple_round', font_size=12, font_color='#000000', sprite='thinks.png') -> None: super().__init__(x, y, width, height, text, font, font_size, font_color, sprite) self.scene = 0 @@ -770,7 +770,7 @@ class Thinks(Label): if self.scene == 1: touches = pygame.sprite.spritecollideany(main, objects[2]) if touches is not None and isinstance(touches, NPC): - self.text = 'I should press \"f\"' + self.text = 'I should press "f"' self.hidden = False else: self.hidden = False diff --git a/main.py b/main.py index d89cf4e..21df3d2 100644 --- a/main.py +++ b/main.py @@ -38,8 +38,8 @@ def genRooms(WIDTH, HEIGHT, type:str, objects:list): room_objects.append(Obstacle('river', 'water', 'art/images/background/river.png', True, random.randint(32, round(WIDTH * 0.75)), 32, WIDTH=96, HEIGHT=round(HEIGHT * 0.66))) room_backgrounds = [f'art/images/background/{type}{i}.png' for i in range(1)] rooms = [ - Room(type, 'normal', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], objects[2], objects[3], objects[4] + [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, j) - for j in range(random.randint(1, 1)) + Room(type, 'normal', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], objects[2], objects[3], objects[4] + [room_objects[random.randint(0, 0)] for _ in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, j) + for j in range(random.randint(5, 10)) ] rooms.append(Room(type, 'boss', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], [], [], objects[4] + [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, 88)) #rooms = [Room(type, 'boss', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], [], [], objects[4] + [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, 88)] @@ -315,7 +315,7 @@ def options(screen, clock, running, background, isblack, WIDTH, HEIGHT): def menu(screen, clock, running, background, isblack, WIDTH, HEIGHT): objects = [] - objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2, 160, 64, 'textbox.png', 'medieval', 48, "Play", play, attributes=[screen, clock, running, background, isblack, WIDTH, HEIGHT])) + objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2, 160, 64, 'textbox.png', 'medieval', 48, "Play", village, attributes=[screen, clock, running, background, isblack, WIDTH, HEIGHT])) #objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2 - 72, 160, 64, 'textbox.png', 'medieval', 48, "Options", uwu)) objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2 + 72, 160, 64, 'textbox.png', 'medieval', 48, "Exit game", quitGame)) while running: @@ -339,7 +339,7 @@ def menu(screen, clock, running, background, isblack, WIDTH, HEIGHT): def test(screen, clock, running, background, isblack, WIDTH, HEIGHT): main = [MainCharacter('Herbert', 100, 'oldman.png', 500, 500, 20, 5, 1, 1, 50)] - mobs = [Skeleton(i, random.randint(40, 60), 'reddy.png', random.randint(20,1000), random.randint(20,700), 5, 1, 1, 1, 200) for i in range(0,random.randint(2, 8))] + mobs = [Skeleton(i, random.randint(40, 60), 'reddy.png', random.randint(20,1000), random.randint(20,700), 5, 1, 1, 1, 200) for i in range(0, random.randint(2, 8))] others = [] npcs = [NPC('name', 100, 'reddy.png', 1, 200, 200)] objects = [main, mobs, npcs, others]