Browse Source

http://gogs.es-lab.de/tuemler_j/Dungeon_SS2022.git

Xue Zhao 1 year ago
parent
commit
eeaf3e9b64

+ 6 - 0
GameOver.py

@@ -24,6 +24,12 @@ from screen import screen
 def gameOver(spieler):
     screen.blit(pygame.image.load("Bilder/GameOver.png"), (0, 0))
     pygame.display.update()
+    pygame.time.wait(500)
+    pygame.mixer.music.stop()
+    pygame.mixer.music.load("Sound/Gameover2.wav")
+    pygame.mixer.music.play(-1, 0.0)
+    pygame.mixer.music.set_volume(1)
+    pygame.display.update()
     pygame.time.wait(2000)
     pygame.mixer.music.stop()
     pygame.mixer.music.load("Sound/level.mp3")

+ 3 - 5
KlasseHarpyie.py

@@ -28,6 +28,7 @@ from random import randint
 from KlasseMagie import Magie
 from KlasseHeld import Held
 import sounds
+from sounds import soundGewonnen
 
 class Harpyie(Monster):                                                                       #erbt vom Monster
     def __init__(self, x, y, geschw, breite, hoehe, level, bildFigur, zeitMonster):
@@ -106,10 +107,7 @@ class Harpyie(Monster):
             if self.rechteck.colliderect(k.kugelRec):                              #Wenn Hapyie gestorben: gewonnen-Sound wird aktiviert
                 self.heldDaten.kugeln.remove(k)                                    #Codequelle:GameOver und KlasseMonster
                 self.leben = False
-                pygame.display.update()
-                pygame.mixer.music.stop()
-                pygame.mixer.music.load("Sound/Victory1.wav")
-                pygame.mixer.music.play(-1, 0.0)
-                pygame.mixer.music.set_volume(1)
+                soundGewonnen()
+
         
 

+ 26 - 1
Spiel_Daten.csv

@@ -57,4 +57,29 @@
 2022,5,10,21,15,27,1,7,7,8,16,0
 2022,5,10,21,17,12,1,4,6,9,15,0
 2022,5,10,21,38,49,1,2,11,0,11,1
-2022,5,10,21,39,41,2,17,22,26,48,0
+2022,5,10,21,39,41,2,17,22,26,48,0
+2022,5,11,8,50,55,3,0,7,0,7,1
+2022,5,11,8,53,24,2,0,7,0,7,1
+2022,5,11,9,1,55,5,0,8,0,8,1
+2022,5,11,9,2,54,1,0,8,0,8,1
+2022,5,11,9,3,26,2,0,9,0,9,1
+2022,5,11,9,4,24,7,0,8,0,8,1
+2022,5,11,9,5,5,0,0,7,0,8,1
+2022,5,11,9,5,41,7,0,9,0,9,1
+2022,5,11,9,7,27,7,11,26,15,42,0
+2022,5,11,9,8,42,1,6,15,0,16,1
+2022,5,11,9,9,50,0,24,38,26,64,0
+2022,5,11,9,11,11,3,11,15,25,41,0
+2022,5,11,9,13,49,5,21,41,23,64,0
+2022,5,11,9,16,13,7,23,24,19,43,0
+2022,5,11,9,18,28,4,16,28,6,34,3
+2022,5,11,9,18,59,1,6,12,14,27,0
+2022,5,11,9,20,43,2,8,16,0,16,1
+2022,5,11,9,21,32,2,12,17,28,45,0
+2022,5,11,9,29,50,3,26,33,0,33,1
+2022,5,11,9,30,4,5,8,10,0,10,1
+2022,5,11,9,32,47,5,30,31,22,54,0
+2022,5,11,9,33,46,3,14,12,22,35,0
+2022,5,11,9,35,46,0,22,32,15,48,0
+2022,5,20,13,53,46,2,16,23,15,38,0
+2022,5,20,13,54,7,4,0,9,0,9,1

BIN
__pycache__/GameOver.cpython-310.pyc


BIN
__pycache__/KlasseHarpyie.cpython-310.pyc


BIN
__pycache__/KlasseHeld.cpython-310.pyc