Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 07:41:12 +01:00 · 2024-03-12 07:41:12 +01:00 · 04e0b68cd7
commit 04e0b68cd7
parent d132757717 a13042ffdd
12 changed files with 3 additions and 0 deletions
--- a/art/images/people/vivi.png
+++ b/art/images/people/vivi.png
--- a/art/images/weapons/redblob.png
+++ b/art/images/weapons/redblob.png
--- a/audio/music/middleages(1.1).mp3
+++ b/audio/music/middleages(1.1).mp3
--- a/audio/music/middleages(1.2).mp3
+++ b/audio/music/middleages(1.2).mp3
--- a/audio/music/middleages(2.1).mp3
+++ b/audio/music/middleages(2.1).mp3
--- a/audio/music/middleages(2.2).mp3
+++ b/audio/music/middleages(2.2).mp3
--- a/audio/music/thebritons(1.1).mp3
+++ b/audio/music/thebritons(1.1).mp3
--- a/audio/music/thebritons(1.2).mp3
+++ b/audio/music/thebritons(1.2).mp3
--- a/audio/soundeffects/altefrauspeak.mp3
+++ b/audio/soundeffects/altefrauspeak.mp3
--- a/audio/soundeffects/dorfaeltesterspeak.mp3
+++ b/audio/soundeffects/dorfaeltesterspeak.mp3
--- a/audio/soundeffects/wind.mp3
+++ b/audio/soundeffects/wind.mp3
--- a/main.py
+++ b/main.py
@ -5,10 +5,13 @@ import time
 import random
 from classes import *
 from viecher import *
+from pygame import mixer
 fps = 60

 def setUp(config):
    pygame.init()
+    mixer.music.load('audio/music/thebritons(1.1).mp3')
+    mixer.music.play(-1)
    if config["fullscreen"]:
        screen = pygame.display.set_mode(config["res"], pygame.FULLSCREEN)
    else: