zacharie/seeding-planets
2
2
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Ferme les fenêtres (des paramètres) sans mettre pause

Browse Source
This commit is contained in:
Altaezio
2026-07-20 18:13:47 +02:00
parent 50b517f7ea
commit 2b98447b41
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/game_data/scripts/settings_data.gd
+1
View File
@@ -1,6 +1,7 @@
extends Resource extends Resource
class_name SettingsData class_name SettingsData
const MASTER_BUS_ID = 0
const MUSIC_BUS_ID = 1 const MUSIC_BUS_ID = 1
const SFX_BUS_ID = 2 const SFX_BUS_ID = 2
const AMBIANCE_BUS_ID = 3 const AMBIANCE_BUS_ID = 3
common/game_info/game_info.gd
+1 -1
View File
@@ -92,7 +92,7 @@ func _on_settings_language_changed(s : SettingsData):
update_language_settings(s) update_language_settings(s)
func _on_settings_sound_changed(s : SettingsData): func _on_settings_sound_changed(s : SettingsData):
AudioServer.set_bus_volume_db(0, linear_to_db(s.master_volume)) AudioServer.set_bus_volume_db(SettingsData.MASTER_BUS_ID, linear_to_db(s.master_volume))
AudioServer.set_bus_volume_db(SettingsData.MUSIC_BUS_ID, linear_to_db(s.music_volume)) AudioServer.set_bus_volume_db(SettingsData.MUSIC_BUS_ID, linear_to_db(s.music_volume))
AudioServer.set_bus_volume_db(SettingsData.SFX_BUS_ID, linear_to_db(s.sfx_volume)) AudioServer.set_bus_volume_db(SettingsData.SFX_BUS_ID, linear_to_db(s.sfx_volume))
AudioServer.set_bus_volume_db(SettingsData.AMBIANCE_BUS_ID, linear_to_db(s.ambiance_volume)) AudioServer.set_bus_volume_db(SettingsData.AMBIANCE_BUS_ID, linear_to_db(s.ambiance_volume))
gui/menu/window/scripts/window.gd
+4
View File
@@ -11,6 +11,10 @@ signal closed
func _ready(): func _ready():
update_title(title) update_title(title)
func _input(_event: InputEvent) -> void:
if is_visible_in_tree() and Input.is_action_just_pressed("pause"):
close_window()
func update_title(text : String): func update_title(text : String):
title = text title = text
if (is_node_ready()): if (is_node_ready()):
gui/pause/scripts/pause.gd
+6 -1
View File
@@ -32,7 +32,12 @@ func set_pause(p):
GameInfo.save_settings() GameInfo.save_settings()
func _input(_event): func _input(_event):
if Input.is_action_just_pressed("pause"): if (SceneManager.actual_scene
and SceneManager.actual_scene.get_scene_id() != "TITLE"
and Input.is_action_just_pressed("pause")
and not %Settings.is_visible_in_tree()
and not %Controls.is_visible_in_tree()
):
pause = not pause pause = not pause
func _on_timeline_ended(): func _on_timeline_ended():
translation/game/gui.csv
+1
View File
@@ -210,6 +210,7 @@ NO_ENERGY_LEFT," (no energy left)", " (pas d'énergie restante)"
SETTINGS,Settings,Paramètres SETTINGS,Settings,Paramètres
LANGUAGE,Language,Langage LANGUAGE,Language,Langage
SOUND,Sound,Son SOUND,Sound,Son
MASTER_VOLUME,Master volume,Volume principal
MUSIC_VOLUME,Music volume,Volume de la musique MUSIC_VOLUME,Music volume,Volume de la musique
ENVIRONMENT_VOLUME,Environment Volume,Volume de l'environnement ENVIRONMENT_VOLUME,Environment Volume,Volume de l'environnement
SFX_VOLUME,Sfx Volume,Volume des bruitages SFX_VOLUME,Sfx Volume,Volume des bruitages
1 keys en fr
210 SETTINGS Settings Paramètres
211 LANGUAGE Language Langage
212 SOUND Sound Son
213 MASTER_VOLUME Master volume Volume principal
214 MUSIC_VOLUME Music volume Volume de la musique
215 ENVIRONMENT_VOLUME Environment Volume Volume de l'environnement
216 SFX_VOLUME Sfx Volume Volume des bruitages