InfoProjekt/game
3
0
Fork 3
Code Issues 17 Pull requests Projects Releases 1 Packages Wiki Activity

Compare commits

base: InfoProjekt:3448ec41209cc785eda8996f16edd5d8ecd11df5
Branches Tags
InfoProjekt:main
InfoProjekt:Development
InfoProjekt:Alpha
...
compare: InfoProjekt:e383c8afed56805b765e0480d433f7efd2df923e
Branches Tags
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha

3 commits
3448ec4120 ... e383c8afed

Author SHA1 Message Date
Spafi
e383c8afed Merge pull request 'changed to normal version again (no dev shortcuts)' (#84) from Spafi/game:main into Development 
Reviewed-on: #84
 2024-03-12 20:51:23 +00:00
SpagettiFisch
64a3381eb9 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-12 21:50:04 +01:00
SpagettiFisch
a72349f7df 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>
 2024-03-12 21:45:52 +01:00
7 changed files with 6 additions and 6 deletions
Show stats Expand all files Collapse all files

BIN
art/images/box/bossbar_edge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 208 B

BIN
art/images/box/bossbar_empty.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 203 B

BIN
art/images/box/bossbar_full.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 159 B

BIN
audio/soundeffects/altefrauspeak.mp3 Normal file
View file

Binary file not shown.

BIN
audio/soundeffects/dorfaeltesterspeak.mp3 Normal file
View file

Binary file not shown.

4
classes.py
View file

@ -768,7 +768,7 @@ class Level(Label):
super().draw(screen) super().draw(screen)
class Thinks(Label): 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) super().__init__(x, y, width, height, text, font, font_size, font_color, sprite)
self.scene = 0 self.scene = 0
@ -790,7 +790,7 @@ class Thinks(Label):
if self.scene == 1: if self.scene == 1:
touches = pygame.sprite.spritecollideany(main, objects[2]) touches = pygame.sprite.spritecollideany(main, objects[2])
if touches is not None and isinstance(touches, NPC): if touches is not None and isinstance(touches, NPC):
self.text = 'I should press \"f\"' self.text = 'I should press "f"'
self.hidden = False self.hidden = False
else: else:
self.hidden = False self.hidden = False

8
main.py
View file

@ -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_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)] room_backgrounds = [f'art/images/background/{type}{i}.png' for i in range(1)]
rooms = [ 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) 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(1, 1)) 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.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)] #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): def menu(screen, clock, running, background, isblack, WIDTH, HEIGHT):
objects = [] 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, "Options", uwu))
objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2 + 72, 160, 64, 'textbox.png', 'medieval', 48, "Exit game", quitGame)) objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2 + 72, 160, 64, 'textbox.png', 'medieval', 48, "Exit game", quitGame))
while running: while running:
@ -339,7 +339,7 @@ def menu(screen, clock, running, background, isblack, WIDTH, HEIGHT):
def test(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)] 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 = [] others = []
npcs = [NPC('name', 100, 'reddy.png', 1, 200, 200)] npcs = [NPC('name', 100, 'reddy.png', 1, 200, 200)]
objects = [main, mobs, npcs, others] objects = [main, mobs, npcs, others]