rfg/nsi-rpg
3
2
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Fixed base music volume

Browse source
This commit is contained in:
Adastram 2024-01-14 17:53:09 +01:00
parent 02df5fd97e
commit 41e2bdb3d6
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/engine/sound_manager.py
View file

@ -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)"""

7
src/main.py
View file

@ -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()