implemented music

diff --git a/Assets/Music/Cave_Music.mp3 b/Assets/Music/Cave_Music.mp3
deleted file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
index 503ca80..0000000
Binary files a/Assets/Music/Sky_Music.mp3 and /dev/null differ

diff --git a/DevLevelSelect.py b/DevLevelSelect.py
index 788c2c8cf3acb88a3b59bcdda4d9c19307cbd10a..3ce3797eefd033af26649b02c1252106836227e0 100644 (file)
--- 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 fce880e73fadb53227ea5a25ffef434299f4611d..8026868c2bf672e0593f24cc34a164840ee634eb 100644 (file)
--- 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 350b13e9f50dd3712cf6881b1e81f669c88132b5..91a01120e2a01bcd6291051433d01757052f9f1f 100644 (file)
--- 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):