From 41e2bdb3d62d6f3a1a1a9ade75721fb02cb34533 Mon Sep 17 00:00:00 2001 From: adastram Date: Sun, 14 Jan 2024 17:53:09 +0100 Subject: [PATCH] Fixed base music volume --- src/engine/sound_manager.py | 9 +++++---- src/main.py | 7 +++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/engine/sound_manager.py b/src/engine/sound_manager.py index db28590..8a953d2 100644 --- a/src/engine/sound_manager.py +++ b/src/engine/sound_manager.py @@ -20,7 +20,7 @@ class SoundManager: self.music_current_index = 0 self.music_shuffle_playlist = True self.music_next_request = False - self.music_set_volume(music_master_volume) + self.music_set_volume(100) self.music_before_pause_pos = 0 self.music_before_pause_song = "" @@ -51,14 +51,15 @@ class SoundManager: self.sound_hears_y = self.sound_hears_anchor.y for key in self.sound_global_currently_playing.keys(): # Son globaux - sound_container = self.sound_global_currently_playing[key] + sound_container: list[mixer.Sound, float, float] = self.sound_global_currently_playing[key] + if sound_container[2] > self.time: self.sound_global_currently_playing.pop(key) else: sound_container[0].set_volume(round(sound_global_master_volume / 100 * sound_container[1] / 100, 3)) for key in self.sound_currently_playing.keys(): # Son locaux - sound_container = self.sound_currently_playing[key] + sound_container: list[mixer.Sound, float, list[float, float], float] = self.sound_currently_playing[key] if sound_container[3] > self.time: # Timeout des sons self.sound_currently_playing.pop(key) @@ -110,7 +111,7 @@ class SoundManager: def music_set_volume(self, new_volume: float): """Définit le nouveau volume de la musique""" - mixer.music.set_volume((round(self.music_master_volume / 100 * new_volume / 100, 3))) + mixer.music.set_volume(round(self.music_master_volume / 100 * new_volume / 100, 3)) def music_pause(self, fade_s: float, restart_tolerance: float = 33): """Met en pause la musique, la musique reprendra à la fin de la musique moin la tolérance (en pourcentage)""" diff --git a/src/main.py b/src/main.py index 158c4f6..437a8e2 100644 --- a/src/main.py +++ b/src/main.py @@ -29,12 +29,19 @@ class Game(Engine): self.event_handler.register_button_area((0, 0, 0.1, 0.1), lambda : print("salut"), 0) + self.sound_manager.music_add_to_playlist(".\\assets\\OST\\Main Title (Y'as pas de boss la donc jpp le mettre pour un fight).mp3") + self.sound_manager.music_start_playlist() + self.setup_main_menu() def start_game(self): self.game_state = GameState.NORMAL self.menu_manager.hide() + self.sound_manager.music_remove_from_playlist(".\\assets\\OST\\Main Title (Y'as pas de boss la donc jpp le mettre pour un fight).mp3") + self.sound_manager.music_add_to_playlist(".\\assets\\OST\\Bruit de foret pour yannis.mp3") + self.sound_manager.music_next() + def setup_main_menu(self): """Crée les éléments du menu principal.""" menu = Menu()