diff --git a/assets/Audio/CIN_INTRO_Pitch mission.ogg b/assets/Audio/CIN_INTRO_Pitch mission.ogg new file mode 100644 index 0000000..a2f83af Binary files /dev/null and b/assets/Audio/CIN_INTRO_Pitch mission.ogg differ diff --git a/assets/Audio/CIN_INTRO_Pitch mission.ogg.import b/assets/Audio/CIN_INTRO_Pitch mission.ogg.import new file mode 100644 index 0000000..54484b7 --- /dev/null +++ b/assets/Audio/CIN_INTRO_Pitch mission.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dcylcol0nj0pv" +path="res://.godot/imported/CIN_INTRO_Pitch mission.ogg-4b569bdb43235b38f5baa7a3f9997ccb.oggvorbisstr" + +[deps] + +source_file="res://assets/Audio/CIN_INTRO_Pitch mission.ogg" +dest_files=["res://.godot/imported/CIN_INTRO_Pitch mission.ogg-4b569bdb43235b38f5baa7a3f9997ccb.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/default_bus_layout.tres b/default_bus_layout.tres new file mode 100644 index 0000000..2ece56f --- /dev/null +++ b/default_bus_layout.tres @@ -0,0 +1,33 @@ +[gd_resource type="AudioBusLayout" format=3 uid="uid://cd43qm20mmsb4"] + +[resource] +bus/1/name = &"Cinematique" +bus/1/solo = false +bus/1/mute = false +bus/1/bypass_fx = false +bus/1/volume_db = 0.0 +bus/1/send = &"Master" +bus/2/name = &"Character" +bus/2/solo = false +bus/2/mute = false +bus/2/bypass_fx = false +bus/2/volume_db = 0.0 +bus/2/send = &"Master" +bus/3/name = &"VoiceOver" +bus/3/solo = false +bus/3/mute = false +bus/3/bypass_fx = false +bus/3/volume_db = 0.0 +bus/3/send = &"Master" +bus/4/name = &"UI" +bus/4/solo = false +bus/4/mute = false +bus/4/bypass_fx = false +bus/4/volume_db = 0.0 +bus/4/send = &"Master" +bus/5/name = &"Music" +bus/5/solo = false +bus/5/mute = false +bus/5/bypass_fx = false +bus/5/volume_db = 0.0 +bus/5/send = &"Master" diff --git a/scenes/text_wrappers/intro.gd b/scenes/text_wrappers/intro.gd index f8f98e2..fa38e82 100644 --- a/scenes/text_wrappers/intro.gd +++ b/scenes/text_wrappers/intro.gd @@ -21,7 +21,6 @@ var text_showing = false func _ready() -> void: text_split = message.text.split("---") text_fine_split = text_split[2].split(" ") - print(len(text_fine_split)) message.text = "" accept_button_1.visible = false @@ -34,7 +33,6 @@ func _on_start_connexion_timeout() -> void: message.text = text_split[0] further_connexion.start() - func _on_further_connexion_timeout() -> void: message.text = text_split[1] text_start.start() @@ -43,9 +41,9 @@ func _on_text_start_timeout() -> void: message.text = "" time_between_words.start() - func _on_time_between_words_timeout() -> void: if text_fine_split.is_empty(): + time_between_words.stop() time_before_show_buttons.start() return diff --git a/scenes/text_wrappers/intro.tscn b/scenes/text_wrappers/intro.tscn index 511e8d5..4fec3d8 100644 --- a/scenes/text_wrappers/intro.tscn +++ b/scenes/text_wrappers/intro.tscn @@ -1,16 +1,18 @@ -[gd_scene load_steps=5 format=3 uid="uid://djmvj0uqw26dg"] +[gd_scene load_steps=6 format=3 uid="uid://djmvj0uqw26dg"] [ext_resource type="PackedScene" uid="uid://bhhphcagggc1" path="res://template/scenes/credits/scrolling_credits.tscn" id="1_ftj6e"] [ext_resource type="Script" uid="uid://bwr3tliac4mo2" path="res://scenes/text_wrappers/intro.gd" id="2_sbctf"] [ext_resource type="PackedScene" uid="uid://bkcsjsk2ciff" path="res://addons/maaacks_menus_template/base/scenes/music_players/background_music_player.tscn" id="3_pbsew"] [ext_resource type="Script" uid="uid://1nf36h0gms3q" path="res://addons/maaacks_menus_template/base/scripts/capture_focus.gd" id="4_23spi"] +[ext_resource type="AudioStream" uid="uid://dcylcol0nj0pv" path="res://assets/Audio/CIN_INTRO_Pitch mission.ogg" id="4_mudqr"] [node name="Intro" instance=ExtResource("1_ftj6e")] script = ExtResource("2_sbctf") scene_to_trigger = "uid://s1cx1gvt4bed" [node name="BackgroundMusicPlayer" parent="." index="0" instance=ExtResource("3_pbsew")] -bus = &"Master" +stream = ExtResource("4_mudqr") +bus = &"Cinematique" [node name="BackgroundColor" type="ColorRect" parent="." index="1"] layout_mode = 1 @@ -117,7 +119,7 @@ wait_time = 7.0 one_shot = true [node name="TimeBetweenWords" type="Timer" parent="." index="8"] -wait_time = 0.41 +wait_time = 0.4 [node name="TimeBeforeShowButtons" type="Timer" parent="." index="9"] wait_time = 2.0