From f6dae54fd054cb22c6e0afdd1fe2eea22dbbfe2e Mon Sep 17 00:00:00 2001 From: minimata Date: Sun, 29 Jun 2025 14:58:36 +0200 Subject: [PATCH] fix: added voiceline and removed broken credits --- default_bus_layout.tres | 4 +- scenes/indoors/last.gd | 8 +++ scenes/indoors/last.tscn | 16 +++++- scenes/interactibles/interactible.tscn | 2 +- scenes/text_wrappers/success.tscn | 42 ++++++++++++++- .../scenes/credits/scrollable_credits.tscn | 44 ++++------------ .../scenes/credits/scrolling_credits.tscn | 51 +++++++------------ .../main_menu/main_menu_with_animations.tscn | 1 + 8 files changed, 95 insertions(+), 73 deletions(-) diff --git a/default_bus_layout.tres b/default_bus_layout.tres index cb8dcfe..12f21a9 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -11,7 +11,7 @@ bus/2/name = &"VoiceOver" bus/2/solo = false bus/2/mute = false bus/2/bypass_fx = false -bus/2/volume_db = 2.1515 +bus/2/volume_db = -0.0327301 bus/2/send = &"Master" bus/3/name = &"UI" bus/3/solo = false @@ -23,7 +23,7 @@ bus/4/name = &"Music" bus/4/solo = false bus/4/mute = false bus/4/bypass_fx = false -bus/4/volume_db = -3.11736 +bus/4/volume_db = -2.51026 bus/4/send = &"Master" bus/5/name = &"Ambiance" bus/5/solo = false diff --git a/scenes/indoors/last.gd b/scenes/indoors/last.gd index 631d8c2..ec1b15f 100644 --- a/scenes/indoors/last.gd +++ b/scenes/indoors/last.gd @@ -21,6 +21,7 @@ var current_info: int = 0 var is_over = false var currently_playing: AudioStreamPlayer2D +@onready var vo_light_off: AudioStreamPlayer2D = $Hack/VOLightOff @onready var vo_prise_tiree: AudioStreamPlayer2D = $Hack/VOPriseTiree @onready var vo_interjection: AudioStreamPlayer2D = $Hack/VOInterjection @onready var interact: AudioStreamPlayer2D = $Player/Interact @@ -66,6 +67,13 @@ func _on_prise_interacted(event_id: String) -> void: right_hack.activate() for light in lights.get_children(): light.visible = false + + if currently_playing != null and currently_playing.playing: + currently_playing.stop() + + interact.play() + vo_light_off.play() + currently_playing = vo_light_off func made_mistake() -> void: vies -= 1 diff --git a/scenes/indoors/last.tscn b/scenes/indoors/last.tscn index bfc4060..2ab0f93 100644 --- a/scenes/indoors/last.tscn +++ b/scenes/indoors/last.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=126 format=4 uid="uid://bnba2vd0m0qao"] +[gd_scene load_steps=130 format=4 uid="uid://bnba2vd0m0qao"] [ext_resource type="Script" uid="uid://c232mm5h43ed4" path="res://scenes/indoors/last.gd" id="1_cad5s"] [ext_resource type="Resource" uid="uid://7bmpcn0dxwr8" path="res://scenes/player/base.tres" id="2_1lxr4"] @@ -17,11 +17,14 @@ [ext_resource type="Texture2D" uid="uid://cy676d54gxhp5" path="res://assets/Modern_Interiors_Free_v2.2/Modern tiles_Free/Characters_free/Amelia_idle_anim_16x16.png" id="12_o1p8b"] [ext_resource type="AudioStream" uid="uid://c2bsxskwgk3ks" path="res://assets/Audio/VO_ALL_Interjection_02.ogg" id="13_58lim"] [ext_resource type="AudioStream" uid="uid://cybluyseasy6g" path="res://assets/Audio/VO_ALL_Interjection_11.ogg" id="14_mvenc"] +[ext_resource type="AudioStream" uid="uid://d1l01jcxol3a" path="res://assets/Audio/VO_LVL3_EVENT_Lumiere OFF_01.ogg" id="15_5tmip"] [ext_resource type="AudioStream" uid="uid://dwrc0uynvsikh" path="res://assets/Audio/INT_Generic.ogg" id="15_7ac63"] [ext_resource type="AudioStream" uid="uid://mbumd1hnp7yd" path="res://assets/Audio/VO_ALL_Interjection_12.ogg" id="15_8buf1"] [ext_resource type="AudioStream" uid="uid://rcmjxqjbrt7d" path="res://assets/Audio/VO_LVL3_EVENT_Bravo reussite mission_01.ogg" id="15_jetft"] [ext_resource type="AudioStream" uid="uid://ddgkyj2ild8k0" path="res://assets/Audio/VO_ALL_Interjection_13.ogg" id="16_24pah"] [ext_resource type="AudioStream" uid="uid://ct4yty72wtrsc" path="res://assets/Audio/VO_LVL3_EVENT_Bravo reussite mission_02.ogg" id="16_o22xi"] +[ext_resource type="AudioStream" uid="uid://5ma04xnl6b1i" path="res://assets/Audio/VO_LVL3_EVENT_Lumiere OFF_02.ogg" id="16_o58id"] +[ext_resource type="AudioStream" uid="uid://c02pmrw6lt1t0" path="res://assets/Audio/VO_LVL3_EVENT_Lumiere OFF_03.ogg" id="17_nnla5"] [ext_resource type="AudioStream" uid="uid://bdaercty8ftg8" path="res://assets/Audio/VO_ALL_Interjection_14.ogg" id="17_tw0ei"] [ext_resource type="AudioStream" uid="uid://b5uy0xmuve4kr" path="res://assets/Audio/VO_LVL3_EVENT_Bravo reussite mission_03.ogg" id="17_xiu81"] [ext_resource type="AudioStream" uid="uid://by52l5u55nf5b" path="res://assets/Audio/VO_ALL_Interjection_15.ogg" id="18_vb2ul"] @@ -184,6 +187,7 @@ texture = ExtResource("3_vefux") 2:7/0 = 0 2:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:7/0 = 0 +3:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-4, -8, 8, -8, 8, 8, -4, 8) 4:7/0 = 0 5:7/0 = 0 6:7/0 = 0 @@ -2364,6 +2368,12 @@ stream_0/stream = ExtResource("31_7oook") stream_1/stream = ExtResource("32_yqvmc") stream_2/stream = ExtResource("33_ola0d") +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_0bwp0"] +streams_count = 3 +stream_0/stream = ExtResource("15_5tmip") +stream_1/stream = ExtResource("16_o58id") +stream_2/stream = ExtResource("17_nnla5") + [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_w3s5w"] streams_count = 3 stream_0/stream = ExtResource("15_jetft") @@ -2770,6 +2780,10 @@ is_item = true stream = SubResource("AudioStreamRandomizer_jetft") bus = &"VoiceOver" +[node name="VOLightOff" type="AudioStreamPlayer2D" parent="Hack"] +stream = SubResource("AudioStreamRandomizer_0bwp0") +bus = &"VoiceOver" + [node name="VOPriseTiree" type="AudioStreamPlayer2D" parent="Hack"] stream = SubResource("AudioStreamRandomizer_w3s5w") bus = &"VoiceOver" diff --git a/scenes/interactibles/interactible.tscn b/scenes/interactibles/interactible.tscn index a3720ed..aaf2265 100644 --- a/scenes/interactibles/interactible.tscn +++ b/scenes/interactibles/interactible.tscn @@ -97,7 +97,7 @@ visible = false layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -text = "Oups..." +text = "OK" [connection signal="body_entered" from="." to="." method="_on_body_entered"] [connection signal="body_exited" from="." to="." method="_on_body_exited"] diff --git a/scenes/text_wrappers/success.tscn b/scenes/text_wrappers/success.tscn index fd0c96c..1e9a46e 100644 --- a/scenes/text_wrappers/success.tscn +++ b/scenes/text_wrappers/success.tscn @@ -7,7 +7,7 @@ [node name="Gole" instance=ExtResource("1_rvkw6")] script = ExtResource("2_wp36u") -scene_to_trigger = "uid://domqqvcqatme5" +scene_to_trigger = "uid://ck5glr84c7e25" [node name="FailedAudio" type="AudioStreamPlayer2D" parent="." index="0"] bus = &"VoiceOver" @@ -42,6 +42,46 @@ stretch_mode = 5 visible = false scroll_vertical = 0 +[node name="CreditsLabel" parent="ScrollContainer/VBoxContainer" index="1"] +text = "[center][font_size=48]Collaborators[/font_size] + +[font_size=32]Role[/font_size] +Person 1 +Person 2 +[url=]Person w/ Link[/url] + +[font_size=48]Sourced[/font_size] +[font_size=32]Asset Type[/font_size] +[font_size=24]Use Case[/font_size] +Author: [url=]Name[/url] +Source: [url=]Domain : webpage.html[/url] +License: [url=]License[/url] + +[font_size=24]Godot Engine Logo[/font_size] +Author: Andrea Calabró +Source: [url=https://godotengine.org/press/]godotengine.org : press[/url] +License: [url=https://github.com/godotengine/godot/blob/master/LOGO_LICENSE.txt]CC BY 4.0 International[/url] + +[font_size=48]Tools[/font_size] +[font_size=24]Godot[/font_size] +[img=80]res:///template/assets/godot_engine_logo/logo_vertical_color_dark.png[/img] +Author: [url=https://godotengine.org/contact]Juan Linietsky, Ariel Manzur, and contributors[/url] +Source: [url=https://godotengine.org/]godotengine.org[/url] +License: [url=https://github.com/godotengine/godot/blob/master/LICENSE.txt]MIT License[/url] + +[font_size=24]Godot Menus Template[/font_size] +[img=80]res:///template/assets/plugin_logo/logo.png[/img] +Author: [url=https://github.com/Maaack/Godot-Menus-Template/graphs/contributors]Marek Belski and contributors[/url] +Source: [url=https://github.com/Maaack/Godot-Menus-Template]github: Godot-Menus-Template[/url] +License: [url=LICENSE.txt]MIT License[/url] + +[font_size=24]Git[/font_size] +[img=80]res:///template/assets/git_logo/Git-Logo-2Color.png[/img] +Author: [url=https://github.com/torvalds]Linus Torvalds[/url] +Source: [url=https://git-scm.com/downloads]git-scm.com[/url] +License: [url=https://opensource.org/licenses/GPL-2.0]GNU General Public License version 2[/url] +[/center]" + [node name="CenterContainer" type="CenterContainer" parent="." index="6"] layout_mode = 0 anchor_right = 1.0 diff --git a/template/scenes/credits/scrollable_credits.tscn b/template/scenes/credits/scrollable_credits.tscn index 8a30b5e..bc3be7b 100644 --- a/template/scenes/credits/scrollable_credits.tscn +++ b/template/scenes/credits/scrollable_credits.tscn @@ -1,48 +1,24 @@ [gd_scene load_steps=3 format=3 uid="uid://b7v0tjak702f1"] -[ext_resource type="PackedScene" path="res://addons/maaacks_menus_template/base/scenes/credits/scrollable_credits.tscn" id="1_asmyn"] -[ext_resource type="Script" path="res://template/scenes/credits/scrollable_credits.gd" id="2_wmmti"] +[ext_resource type="PackedScene" uid="uid://osxulxw2oas3" path="res://addons/maaacks_menus_template/base/scenes/credits/scrollable_credits.tscn" id="1_asmyn"] +[ext_resource type="Script" uid="uid://b178v1bnhgdq0" path="res://template/scenes/credits/scrollable_credits.gd" id="2_wmmti"] [node name="ScrollableCredits" instance=ExtResource("1_asmyn")] script = ExtResource("2_wmmti") [node name="CreditsLabel" parent="." index="0"] -text = "[center][font_size=48]Collaborators[/font_size] +text = "[center][font_size=48]DÉVELOPPEUR-EUSE-S[/font_size] -[font_size=32]Role[/font_size] -Person 1 -Person 2 -[url=]Person w/ Link[/url] +[font_size=32]ECRITURE, VOIX-OFF ET VISUELS ADDITIONELS[/font_size] +GARANCE MULLER-SEREX -[font_size=48]Sourced[/font_size] -[font_size=32]Asset Type[/font_size] -[font_size=24]Use Case[/font_size] -Author: [url=]Name[/url] -Source: [url=]Domain : webpage.html[/url] -License: [url=]License[/url] +[font_size=32]SOUND DESIGN ET MUSIQUE[/font_size] +QUENTIN HUEGI -[font_size=24]Godot Engine Logo[/font_size] -Author: Andrea Calabró -Source: [url=https://godotengine.org/press/]godotengine.org : press[/url] -License: [url=https://github.com/godotengine/godot/blob/master/LOGO_LICENSE.txt]CC BY 4.0 International[/url] +[font_size=32]PROGRAMMATION ET LEVEL DESIGN[/font_size] +ALEXANDRE SEREX-MULLER -[font_size=48]Tools[/font_size] -[font_size=24]Godot[/font_size] -[img=80]res:///template/assets/godot_engine_logo/logo_vertical_color_dark.png[/img] -Author: [url=https://godotengine.org/contact]Juan Linietsky, Ariel Manzur, and contributors[/url] -Source: [url=https://godotengine.org/]godotengine.org[/url] -License: [url=https://github.com/godotengine/godot/blob/master/LICENSE.txt]MIT License[/url] +[font_size=48]MERCI D'AVOIR JOUÉ![/font_size] -[font_size=24]Godot Menus Template[/font_size] -[img=80]res:///template/assets/plugin_logo/logo.png[/img] -Author: [url=https://github.com/Maaack/Godot-Menus-Template/graphs/contributors]Marek Belski and contributors[/url] -Source: [url=https://github.com/Maaack/Godot-Menus-Template]github: Godot-Menus-Template[/url] -License: [url=LICENSE.txt]MIT License[/url] - -[font_size=24]Git[/font_size] -[img=80]res:///template/assets/git_logo/Git-Logo-2Color.png[/img] -Author: [url=https://github.com/torvalds]Linus Torvalds[/url] -Source: [url=https://git-scm.com/downloads]git-scm.com[/url] -License: [url=https://opensource.org/licenses/GPL-2.0]GNU General Public License version 2[/url] [/center]" attribution_file_path = "res://template/ATTRIBUTION.md" diff --git a/template/scenes/credits/scrolling_credits.tscn b/template/scenes/credits/scrolling_credits.tscn index c94ee50..533fc8b 100644 --- a/template/scenes/credits/scrolling_credits.tscn +++ b/template/scenes/credits/scrolling_credits.tscn @@ -1,48 +1,31 @@ [gd_scene load_steps=3 format=3 uid="uid://bhhphcagggc1"] -[ext_resource type="PackedScene" path="res://addons/maaacks_menus_template/base/scenes/credits/scrolling_credits.tscn" id="1_fg7j8"] -[ext_resource type="Script" path="res://template/scenes/credits/scrolling_credits.gd" id="2_xylwq"] +[ext_resource type="PackedScene" uid="uid://t2dui8ppm3a4" path="res://addons/maaacks_menus_template/base/scenes/credits/scrolling_credits.tscn" id="1_fg7j8"] +[ext_resource type="Script" uid="uid://cpvk33v5wr35r" path="res://template/scenes/credits/scrolling_credits.gd" id="2_xylwq"] [node name="ScrollingCredits" instance=ExtResource("1_fg7j8")] script = ExtResource("2_xylwq") +[node name="HeaderSpace" parent="ScrollContainer/VBoxContainer" index="0"] +custom_minimum_size = Vector2(0, 360) + [node name="CreditsLabel" parent="ScrollContainer/VBoxContainer" index="1"] -text = "[center][font_size=48]Collaborators[/font_size] +custom_minimum_size = Vector2(640, 0) +text = "[center][font_size=48]DÉVELOPPEUR-EUSE-S[/font_size] -[font_size=32]Role[/font_size] -Person 1 -Person 2 -[url=]Person w/ Link[/url] +[font_size=32]ECRITURE, VOIX-OFF ET VISUELS ADDITIONELS[/font_size] +GARANCE MULLER-SEREX -[font_size=48]Sourced[/font_size] -[font_size=32]Asset Type[/font_size] -[font_size=24]Use Case[/font_size] -Author: [url=]Name[/url] -Source: [url=]Domain : webpage.html[/url] -License: [url=]License[/url] +[font_size=32]SOUND DESIGN ET MUSIQUE[/font_size] +QUENTIN HUEGI -[font_size=24]Godot Engine Logo[/font_size] -Author: Andrea Calabró -Source: [url=https://godotengine.org/press/]godotengine.org : press[/url] -License: [url=https://github.com/godotengine/godot/blob/master/LOGO_LICENSE.txt]CC BY 4.0 International[/url] +[font_size=32]PROGRAMMATION ET LEVEL DESIGN[/font_size] +ALEXANDRE SEREX-MULLER -[font_size=48]Tools[/font_size] -[font_size=24]Godot[/font_size] -[img=80]res:///template/assets/godot_engine_logo/logo_vertical_color_dark.png[/img] -Author: [url=https://godotengine.org/contact]Juan Linietsky, Ariel Manzur, and contributors[/url] -Source: [url=https://godotengine.org/]godotengine.org[/url] -License: [url=https://github.com/godotengine/godot/blob/master/LICENSE.txt]MIT License[/url] +[font_size=48]MERCI D'AVOIR JOUÉ![/font_size] -[font_size=24]Godot Menus Template[/font_size] -[img=80]res:///template/assets/plugin_logo/logo.png[/img] -Author: [url=https://github.com/Maaack/Godot-Menus-Template/graphs/contributors]Marek Belski and contributors[/url] -Source: [url=https://github.com/Maaack/Godot-Menus-Template]github: Godot-Menus-Template[/url] -License: [url=LICENSE.txt]MIT License[/url] - -[font_size=24]Git[/font_size] -[img=80]res:///template/assets/git_logo/Git-Logo-2Color.png[/img] -Author: [url=https://github.com/torvalds]Linus Torvalds[/url] -Source: [url=https://git-scm.com/downloads]git-scm.com[/url] -License: [url=https://opensource.org/licenses/GPL-2.0]GNU General Public License version 2[/url] [/center]" attribution_file_path = "res://template/ATTRIBUTION.md" + +[node name="FooterSpace" parent="ScrollContainer/VBoxContainer" index="2"] +custom_minimum_size = Vector2(0, 360) diff --git a/template/scenes/menus/main_menu/main_menu_with_animations.tscn b/template/scenes/menus/main_menu/main_menu_with_animations.tscn index a65576b..10d0270 100644 --- a/template/scenes/menus/main_menu/main_menu_with_animations.tscn +++ b/template/scenes/menus/main_menu/main_menu_with_animations.tscn @@ -400,6 +400,7 @@ text = "Continue" visible = false [node name="CreditsButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="3"] +visible = false text = "CREDITS" [node name="ExitButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="4"]