From: 711215 <711215@pdsb.net>
Date: Tue, 12 Jul 2022 14:39:08 +0000 (-0400)
Subject: implemented music
X-Git-Url: http://git.skullheadx.com/nixos/static/links.html?a=commitdiff_plain;h=bb03acdbc0677f59556a412ac9234811d0e34d97;p=Pygame-Jam.git

implemented music
---

diff --git a/Assets/Music/Cave_Music.mp3 b/Assets/Music/Cave_Music.mp3
deleted file mode 100644
index 5cb0333..0000000
Binary files a/Assets/Music/Cave_Music.mp3 and /dev/null differ
diff --git a/Assets/Music/Combat_Music.mp3 b/Assets/Music/Combat_Music.mp3
deleted file mode 100644
index eccf387..0000000
Binary files a/Assets/Music/Combat_Music.mp3 and /dev/null differ
diff --git a/Assets/Music/Main_Menu_Music.mp3 b/Assets/Music/Main_Menu_Music.mp3
deleted file mode 100644
index 72a06c1..0000000
Binary files a/Assets/Music/Main_Menu_Music.mp3 and /dev/null differ
diff --git a/Assets/Music/Overworld_Music.mp3 b/Assets/Music/Overworld_Music.mp3
deleted file mode 100644
index c4e85dd..0000000
Binary files a/Assets/Music/Overworld_Music.mp3 and /dev/null differ
diff --git a/Assets/Music/Sky_Music.mp3 b/Assets/Music/Sky_Music.mp3
deleted file mode 100644
index 503ca80..0000000
Binary files a/Assets/Music/Sky_Music.mp3 and /dev/null differ
diff --git a/DevLevelSelect.py b/DevLevelSelect.py
index 788c2c8..3ce3797 100644
--- a/DevLevelSelect.py
+++ b/DevLevelSelect.py
@@ -37,6 +37,9 @@ class DevLevelSelect:
             self.level = int(lines[0])
         except:
             self.level = -3
+        
+        pg.mixer.music.load('Assets/Music/Main_Menu_Music.ogg')
+        pg.mixer.music.play(-1)
 
         
     def update(self, delta):
diff --git a/Game.py b/Game.py
index fce880e..8026868 100644
--- a/Game.py
+++ b/Game.py
@@ -62,6 +62,20 @@ class Game:
 
         self.dialogue = DialogueUI()
 
+
+        if self.level == 1:
+            pg.mixer.music.load("Assets/Music/Overworld_Music.ogg")
+        if self.level == 2:
+            pg.mixer.music.load("Assets/Music/Cave_Music.ogg")
+        if self.level == 3:
+            pg.mixer.music.load("Assets/Music/Sky_Music.ogg")
+        if self.level == 4:
+            pg.mixer.music.load("Assets/Music/Combat_Music.ogg")
+        else:
+            pg.mixer.music.load("Assets/Music/Overworld_Music.ogg")
+
+        pg.mixer.music.play(-1)
+
     # def load_world(self, level):
 
     def update(self, delta):
diff --git a/MainMenu.py b/MainMenu.py
index 350b13e..91a0112 100644
--- a/MainMenu.py
+++ b/MainMenu.py
@@ -18,6 +18,9 @@ class Menu:
 
         self.level = 0
 
+        pg.mixer.music.load('Assets/Music/Main_Menu_Music.ogg')
+        pg.mixer.music.play(-1)
+
         
     def update(self, delta):
         for ev in pg.event.get(pg.MOUSEBUTTONDOWN):