Encore du dev beta 1.4
* réparation de la scène région * quand toutes les mutation sont découvertes, les cristaux offrent un artefact (le relai Talion) * changer le volume dans les settings fait jouer un son de test * fix d'une traduction sur le relai de Talion
This commit is contained in:
@@ -45,10 +45,16 @@ func _on_full_screen_check_box_toggled(toggled_on: bool):
|
||||
settings.full_screen = toggled_on
|
||||
|
||||
func _on_music_slider_value_changed(value: float):
|
||||
if value != settings.music_volume:
|
||||
%MusicTestPlayer.play()
|
||||
settings.music_volume = min(1.0, value)
|
||||
|
||||
func _on_env_slider_value_changed(value: float):
|
||||
if value != settings.ambiance_volume:
|
||||
%AudioStreamPlayer.play()
|
||||
settings.ambiance_volume = min(1.0, value)
|
||||
|
||||
func _on_sfx_slider_value_changed(value: float):
|
||||
if value != settings.sfx_volume:
|
||||
%SfxTestPlayer.play()
|
||||
settings.sfx_volume = min(1.0, value)
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
[gd_scene load_steps=6 format=3 uid="uid://g6lbgg1fhc25"]
|
||||
[gd_scene format=3 uid="uid://g6lbgg1fhc25"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://bms0xtv8vh2qg" path="res://gui/menu/settings/scripts/settings.gd" id="1_7t8mv"]
|
||||
[ext_resource type="PackedScene" uid="uid://brxrl7sipyy6k" path="res://gui/menu/window/window.tscn" id="1_gkn1k"]
|
||||
[ext_resource type="Theme" uid="uid://bgcmd213j6gk1" path="res://gui/ressources/hud.tres" id="2_7t8mv"]
|
||||
[ext_resource type="PackedScene" uid="uid://cvjqp3oewr3rv" path="res://gui/menu/window/content_title.tscn" id="3_rbiwc"]
|
||||
[ext_resource type="PackedScene" uid="uid://d3agt2njfgddb" path="res://gui/menu/window/content_label.tscn" id="4_rbiwc"]
|
||||
[ext_resource type="AudioStream" uid="uid://8juy5ev3rdfh" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_1.wav" id="6_8f00b"]
|
||||
|
||||
[node name="Settings" type="Control"]
|
||||
[node name="Settings" type="Control" unique_id=1832300574]
|
||||
process_mode = 3
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
@@ -19,7 +20,7 @@ size_flags_vertical = 3
|
||||
mouse_filter = 1
|
||||
script = ExtResource("1_7t8mv")
|
||||
|
||||
[node name="SettingsWindow" parent="." instance=ExtResource("1_gkn1k")]
|
||||
[node name="SettingsWindow" parent="." unique_id=798514856 instance=ExtResource("1_gkn1k")]
|
||||
unique_name_in_owner = true
|
||||
process_mode = 3
|
||||
layout_mode = 1
|
||||
@@ -31,30 +32,30 @@ title = "SETTINGS"
|
||||
[node name="WindowTitle" parent="SettingsWindow/WindowHeader/MarginContainer" index="0"]
|
||||
text = "SETTINGS"
|
||||
|
||||
[node name="MarginContainer" type="MarginContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer" index="0"]
|
||||
[node name="MarginContainer" type="MarginContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer" index="0" unique_id=871158801]
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 3
|
||||
size_flags_vertical = 3
|
||||
theme_override_constants/margin_left = 5
|
||||
theme_override_constants/margin_top = 0
|
||||
|
||||
[node name="SettingsContent" type="VBoxContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer"]
|
||||
[node name="SettingsContent" type="VBoxContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer" unique_id=1219194290]
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 3
|
||||
size_flags_vertical = 3
|
||||
|
||||
[node name="LanguageTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" instance=ExtResource("3_rbiwc")]
|
||||
[node name="LanguageTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=327370385 instance=ExtResource("3_rbiwc")]
|
||||
layout_mode = 2
|
||||
title = "LANGUAGE"
|
||||
|
||||
[node name="LanguageSettings" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent"]
|
||||
[node name="LanguageSettings" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=1441746682]
|
||||
layout_mode = 2
|
||||
columns = 2
|
||||
|
||||
[node name="LanguageText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings" instance=ExtResource("4_rbiwc")]
|
||||
[node name="LanguageText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings" unique_id=1716488893 instance=ExtResource("4_rbiwc")]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="LanguageOptionButton" type="OptionButton" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings"]
|
||||
[node name="LanguageOptionButton" type="OptionButton" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings" unique_id=1927908163]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 3
|
||||
@@ -67,19 +68,19 @@ popup/item_0/id = 0
|
||||
popup/item_1/text = "Français"
|
||||
popup/item_1/id = 1
|
||||
|
||||
[node name="SoundTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" instance=ExtResource("3_rbiwc")]
|
||||
[node name="SoundTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=1397576206 instance=ExtResource("3_rbiwc")]
|
||||
layout_mode = 2
|
||||
title = "SOUND"
|
||||
|
||||
[node name="SoundSliders" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent"]
|
||||
[node name="SoundSliders" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=1765279832]
|
||||
layout_mode = 2
|
||||
columns = 2
|
||||
|
||||
[node name="MusicText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" instance=ExtResource("4_rbiwc")]
|
||||
[node name="MusicText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=282651139 instance=ExtResource("4_rbiwc")]
|
||||
layout_mode = 2
|
||||
text = "MUSIC_VOLUME"
|
||||
|
||||
[node name="MusicSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders"]
|
||||
[node name="MusicSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=685809540]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 3
|
||||
@@ -89,47 +90,62 @@ max_value = 1.0
|
||||
step = 0.01
|
||||
value = 1.0
|
||||
|
||||
[node name="EvironmentText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" instance=ExtResource("4_rbiwc")]
|
||||
[node name="EvironmentText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=378240691 instance=ExtResource("4_rbiwc")]
|
||||
layout_mode = 2
|
||||
text = "ENVIRONMENT_VOLUME"
|
||||
|
||||
[node name="EnvSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders"]
|
||||
[node name="EnvSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=1793576476]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_vertical = 1
|
||||
max_value = 1.0
|
||||
step = 0.01
|
||||
|
||||
[node name="SFXText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" instance=ExtResource("4_rbiwc")]
|
||||
[node name="SFXText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=720423882 instance=ExtResource("4_rbiwc")]
|
||||
layout_mode = 2
|
||||
text = "SFX_VOLUME"
|
||||
|
||||
[node name="SFXSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders"]
|
||||
[node name="SFXSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=1992740216]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_vertical = 1
|
||||
max_value = 1.0
|
||||
step = 0.01
|
||||
|
||||
[node name="VideoTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" instance=ExtResource("3_rbiwc")]
|
||||
[node name="VideoTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=1107495854 instance=ExtResource("3_rbiwc")]
|
||||
layout_mode = 2
|
||||
title = "VIDEO"
|
||||
|
||||
[node name="VideoSettings" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent"]
|
||||
[node name="VideoSettings" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=781693505]
|
||||
layout_mode = 2
|
||||
columns = 2
|
||||
|
||||
[node name="FullScreenText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/VideoSettings" instance=ExtResource("4_rbiwc")]
|
||||
[node name="FullScreenText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/VideoSettings" unique_id=1915748714 instance=ExtResource("4_rbiwc")]
|
||||
layout_mode = 2
|
||||
text = "FULLSCREEN"
|
||||
|
||||
[node name="FullScreenCheckBox" type="CheckBox" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/VideoSettings"]
|
||||
[node name="FullScreenCheckBox" type="CheckBox" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/VideoSettings" unique_id=1501477055]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 10
|
||||
size_flags_vertical = 4
|
||||
theme = ExtResource("2_7t8mv")
|
||||
|
||||
[node name="MusicTestPlayer" type="AudioStreamPlayer" parent="." unique_id=1716804039]
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("6_8f00b")
|
||||
bus = &"Music"
|
||||
|
||||
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." unique_id=658541025]
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("6_8f00b")
|
||||
bus = &"Ambiance"
|
||||
|
||||
[node name="SfxTestPlayer" type="AudioStreamPlayer" parent="." unique_id=2061345469]
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("6_8f00b")
|
||||
bus = &"Sfx"
|
||||
|
||||
[connection signal="item_selected" from="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings/LanguageOptionButton" to="." method="_on_language_option_button_item_selected"]
|
||||
[connection signal="value_changed" from="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders/MusicSlider" to="." method="_on_music_slider_value_changed"]
|
||||
[connection signal="value_changed" from="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders/EnvSlider" to="." method="_on_env_slider_value_changed"]
|
||||
|
||||
Reference in New Issue
Block a user