potion sfx + bugfix

diff --git a/Assets/Music/Credits.txt b/Assets/Music/Credits.txt
index 4be39f059b91880ac2f4cb2faac155ae091d0bfb..ea80edca0cbc851b5a5a98897f9a4e5f7b79e3b8 100644 (file)
--- a/Assets/Music/Credits.txt
+++ b/Assets/Music/Credits.txt
@@ -2,4 +2,12 @@ Main Menu Music - 'Pirates Of The Quarantine' by Alexander Nakarada
 Sky Music - 'Adrift' by Hayden Folker
 Overworld Music - 'Spirit' by Alex Productions
 Cave Music - 'Don't Die On Me' by @Myuu
-Combat Music - 'Explorer' by Alexander Nakarada
\ No newline at end of file
+Combat Music - 'Explorer' by Alexander Nakarada
+
+Potion SFX - Jochi SFX (https://www.youtube.com/watch?v=5eiVPlE8l14)
+Player Grunt - LT Sound Effects (https://www.youtube.com/watch?v=Zefbs_qvP_s)
+Goon Grunt - Sounds (https://www.youtube.com/watch?v=kgJX1I7DwKc)
+Skeleton Sound - Cribbler (https://freesound.org/people/cribbler/sounds/381859/)
+Landing SFX - Gaming Sound Effects Library (https://www.youtube.com/watch?v=0ZoNxpX1bpY)
+Swing SFX - SOUND and IMAGE FX (https://www.youtube.com/watch?v=Psn_Mvmqua0)
+Walking Sound - Sound Library (https://www.youtube.com/watch?v=cXHvtvjRq_M)
\ No newline at end of file

diff --git a/Assets/SFX/Potion Drink.wav b/Assets/SFX/Potion Drink.wav
new file mode 100644 (file)
index 0000000..9fdbc08
Binary files /dev/null and b/Assets/SFX/Potion Drink.wav differ

diff --git a/Game.py b/Game.py
index b09cbda235e556449b877ea3b1a0f9f052f82b9b..003d1668a91f290d6722a189f78b3c65139ce30d 100644 (file)
--- a/Game.py
+++ b/Game.py
@@ -132,6 +132,7 @@ class Game:
             pass
         elif self.player.dead:
             self.level = self.scene.level
+            pg.mixer.stop()
             pass;
         else:
             Setup.camera_offset = self.player.update(delta)

diff --git a/Player.py b/Player.py
index 06b4bd664e71cd4ab5c9b8d5a4a8798bb690e6b3..5a99d495ac391c7ca8df50db2621e7688994fcc4 100644 (file)
--- a/Player.py
+++ b/Player.py
@@ -37,6 +37,7 @@ class Player(Actor):
     sword_swing_channel = pg.mixer.Channel(2)
     landing_sound = pg.mixer.Sound("Assets/SFX/Jump_Landing.wav")
     landing_sound_channel = pg.mixer.Channel(3)
+    potion_drink_sound = pg.mixer.Sound("Assets/SFX/Potion Drink.wav")
     # Enemy SFX
     grunt_sound = pg.mixer.Sound("Assets/SFX/Grunt Sound.wav")
     skeleton_damaged_sound = pg.mixer.Sound("Assets/SFX/Skeleton_Damaged.wav")

diff --git a/Potion.py b/Potion.py
index c3131ccc9935cbf7e90ab8b764496d743186d70f..f63d6ef4f4c949311bee51d4597e2f99a9d2b042 100644 (file)
--- a/Potion.py
+++ b/Potion.py
@@ -13,6 +13,7 @@ class Potion:
             self.consume_potion(player)
     
     def consume_potion(self, player):
+        pg.mixer.Sound.play(player.potion_drink_sound)
         player.health += self.heal
         if player.health > 100:
             player.health = 100