Issue 377 (#383)

* feat: Implements speech fixes #377

* docs: Automatic update of API docs

* chore: Updated speech translation.

Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: dploeger <dploeger@users.noreply.github.com>
This commit is contained in:
Dennis Ploeger
2021-09-06 08:52:16 +02:00
committed by GitHub
parent 3dc779311c
commit c8958e7454
54 changed files with 279 additions and 85 deletions

2
game/rooms/room01/esc/right_exit.esc Executable file → Normal file
View File

@@ -1,3 +1,3 @@
:exit_scene
set_sound_state bg_sound res://game/sfx/sounds/doorOpen_2.ogg false
set_sound_state _sound res://game/sfx/sounds/doorOpen_2.ogg false
change_scene "res://game/rooms/room02/room02.tscn"

2
game/rooms/room01/esc/room01.esc Executable file → Normal file
View File

@@ -11,7 +11,7 @@
:ready
set_sound_state bg_music res://game/sfx/contemplation.ogg true
set_sound_state _music res://game/sfx/contemplation.ogg true
> [!room1_visited]
set_global room1_visited true

2
game/rooms/room02/esc/left_exit.esc Executable file → Normal file
View File

@@ -1,3 +1,3 @@
:exit_scene
set_sound_state bg_sound res://game/sfx/sounds/doorOpen_2.ogg false
set_sound_state _sound res://game/sfx/sounds/doorOpen_2.ogg false
change_scene "res://game/rooms/room01/room01.tscn"

2
game/rooms/room02/esc/right_exit.esc Executable file → Normal file
View File

@@ -1,3 +1,3 @@
:exit_scene
set_sound_state bg_sound res://game/sfx/sounds/doorOpen_2.ogg false
set_sound_state _sound res://game/sfx/sounds/doorOpen_2.ogg false
change_scene "res://game/rooms/room03/room03.tscn"

View File

@@ -1,2 +1,2 @@
:use
set_sound_state bg_music res://game/sfx/contemplation.ogg true
set_sound_state _music res://game/sfx/contemplation.ogg true

View File

@@ -1,2 +1,2 @@
:use
set_sound_state bg_music off true
set_sound_state _music off true

2
game/rooms/room10/esc/left_exit.esc Executable file → Normal file
View File

@@ -1,5 +1,5 @@
:exit_scene
set_sound_state bg_sound res://game/sfx/sounds/doorOpen_2.ogg false
set_sound_state _sound res://game/sfx/sounds/doorOpen_2.ogg false
change_scene "res://game/rooms/room09/room09.tscn"

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -10,6 +10,7 @@ OPTIONS_LANGUAGE,Language,Langue,Sprache
GENERAL_VOLUME,General,Général,Allgemein
MUSIC_VOLUME,Music,Musique,Musik
SOUND_VOLUME,Sound effects,Effets sonores,Soundeffekte
SPEECH_VOLUME,Speech,Voix,Sprachausgabe
CANCEL,Cancel,Annuler,Abbrechen
OK,OK,Ok,Ok
ENTER_SAVE_NAME,Enter the save name:,Entrez un nom de sauvegarde,Bitte gib einen Namen für das Spiel ein:
1 keys en fr de
10 GENERAL_VOLUME General Général Allgemein
11 MUSIC_VOLUME Music Musique Musik
12 SOUND_VOLUME Sound effects Effets sonores Soundeffekte
13 SPEECH_VOLUME Speech Voix Sprachausgabe
14 CANCEL Cancel Annuler Abbrechen
15 OK OK Ok Ok
16 ENTER_SAVE_NAME Enter the save name: Entrez un nom de sauvegarde Bitte gib einen Namen für das Spiel ein:

View File

@@ -5,7 +5,7 @@ func _ready():
var event = ESCEvent.new(":music")
event.statements.append(
ESCCommand.new(
"set_sound_state bg_music res://game/sfx/Game-Menu_Looping.mp3 true"
"set_sound_state _music res://game/sfx/Game-Menu_Looping.mp3 true"
)
)
escoria.event_manager.queue_event(event)

View File

@@ -40,6 +40,7 @@ func initialize_options(p_settings):
_options.get_node("general_volume").value = p_settings["master_volume"]
_options.get_node("sound_volume").value = p_settings["sfx_volume"]
_options.get_node("music_volume").value = p_settings["music_volume"]
_options.get_node("speech_volume").value = p_settings["speech_volume"]
func _on_language_input(event: InputEvent, language: String):
@@ -77,3 +78,9 @@ func _on_back_pressed():
escoria.settings = backup_settings
escoria._on_settings_loaded(escoria.settings)
emit_signal("back_button_pressed")
func _on_speech_volume_value_changed(value: float) -> void:
escoria.settings["speech_volume"] = value
escoria._on_settings_loaded(escoria.settings)
settings_changed = true

View File

@@ -19,16 +19,16 @@ size_flags_vertical = 3
[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
margin_left = 482.0
margin_top = 366.0
margin_top = 354.0
margin_right = 798.0
margin_bottom = 533.0
margin_bottom = 546.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/VBoxContainer"]
margin_right = 316.0
margin_bottom = 136.0
margin_bottom = 161.0
size_flags_vertical = 6
custom_constants/margin_right = 20
custom_constants/margin_top = 20
@@ -39,7 +39,7 @@ custom_constants/margin_bottom = 20
margin_left = 20.0
margin_top = 20.0
margin_right = 296.0
margin_bottom = 116.0
margin_bottom = 141.0
size_flags_vertical = 6
custom_constants/hseparation = 40
columns = 2
@@ -115,10 +115,28 @@ max_value = 1.0
step = 0.001
value = 0.001
[node name="label5" type="Label" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
margin_top = 100.0
margin_right = 220.0
margin_bottom = 121.0
custom_fonts/font = ExtResource( 1 )
text = "SPEECH_VOLUME"
[node name="speech_volume" type="HSlider" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
margin_left = 260.0
margin_top = 100.0
margin_right = 276.0
margin_bottom = 116.0
size_flags_horizontal = 3
min_value = 0.001
max_value = 1.0
step = 0.001
value = 0.001
[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
margin_top = 140.0
margin_top = 165.0
margin_right = 316.0
margin_bottom = 167.0
margin_bottom = 192.0
custom_constants/separation = 20
alignment = 1
@@ -145,5 +163,6 @@ __meta__ = {
[connection signal="value_changed" from="CenterContainer/VBoxContainer/MarginContainer/options/general_volume" to="." method="_on_general_volume_changed"]
[connection signal="value_changed" from="CenterContainer/VBoxContainer/MarginContainer/options/sound_volume" to="." method="_on_sound_volume_changed"]
[connection signal="value_changed" from="CenterContainer/VBoxContainer/MarginContainer/options/music_volume" to="." method="_on_music_volume_changed"]
[connection signal="value_changed" from="CenterContainer/VBoxContainer/MarginContainer/options/speech_volume" to="." method="_on_speech_volume_value_changed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/HBoxContainer/back" to="." method="_on_back_pressed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/HBoxContainer/apply" to="." method="_on_apply_pressed"]