diff --git a/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import index 1b968fb..4cbc10e 100644 --- a/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import +++ b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import @@ -2,7 +2,7 @@ importer="oggvorbisstr" type="AudioStreamOggVorbis" -uid="uid://dadg6o6dl2k6t" +uid="uid://1dj3v6rpcddu" path="res://.godot/imported/ship_music.ogg-a35a322e3a6a4adafae0f2adcaf21247.oggvorbisstr" [deps] @@ -12,14 +12,8 @@ dest_files=["res://.godot/imported/ship_music.ogg-a35a322e3a6a4adafae0f2adcaf212 [params] -<<<<<<< HEAD loop=true -loop_offset=0.0 -bpm=0.0 -======= -loop=false loop_offset=0 bpm=0 ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd beat_count=0 bar_beats=4 diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 2a7b495..39856b2 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -5,30 +5,18 @@ [ext_resource type="AudioStream" uid="uid://bm0tdi6bd2e65" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_2.ogg" id="3_7uv4r"] [ext_resource type="AudioStream" uid="uid://b1hut6lc1jevh" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg" id="4_2fduo"] [ext_resource type="AudioStream" uid="uid://dftxjfdqgsbd3" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg" id="4_tuvql"] -<<<<<<< HEAD -[ext_resource type="AudioStream" uid="uid://dyv128cll6e15" path="res://common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg" id="5_8204s"] -[ext_resource type="AudioStream" uid="uid://dcbuhtc085q2x" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg" id="5_ajci6"] -[ext_resource type="AudioStream" uid="uid://cwu71o0sl2vto" path="res://common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg" id="6_8204s"] -[ext_resource type="AudioStream" uid="uid://ca8n3mvauex0w" path="res://common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg" id="7_spekb"] -[ext_resource type="AudioStream" uid="uid://bpf6witukorka" path="res://common/audio_manager/assets/morceaux/menu/main_menu.ogg" id="7_tuvql"] -[ext_resource type="AudioStream" uid="uid://dadg6o6dl2k6t" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"] -[ext_resource type="AudioStream" uid="uid://dsphn6dbbd55a" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" id="9_am7i4"] -======= [ext_resource type="AudioStream" uid="uid://dcbuhtc085q2x" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg" id="5_ajci6"] [ext_resource type="AudioStream" uid="uid://bpf6witukorka" path="res://common/audio_manager/assets/morceaux/menu/main_menu.ogg" id="7_tuvql"] -[ext_resource type="AudioStream" uid="uid://dadg6o6dl2k6t" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"] ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd +[ext_resource type="AudioStream" uid="uid://dsphn6dbbd55a" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" id="8_dhq5t"] +[ext_resource type="AudioStream" uid="uid://1dj3v6rpcddu" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"] [ext_resource type="AudioStream" uid="uid://dfrp66a4isnt6" path="res://common/audio_manager/assets/sfx/dig/dig_1.wav" id="9_gv65y"] +[ext_resource type="AudioStream" uid="uid://cjbpfnlwcpjh0" path="res://common/audio_manager/assets/morceaux/niveau/forest_waiting.ogg" id="10_dlxms"] [ext_resource type="AudioStream" uid="uid://bdxkvaciw4mb3" path="res://common/audio_manager/assets/sfx/dig/dig_2.wav" id="10_n7o7n"] [ext_resource type="AudioStream" uid="uid://ccimypx71o4g6" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg" id="10_tq535"] [ext_resource type="AudioStream" uid="uid://kqbqhwhkv7o3" path="res://common/audio_manager/assets/morceaux/niveau/mines_waiting.ogg" id="11_ngi21"] [ext_resource type="AudioStream" uid="uid://llxrlwfccywb" path="res://common/audio_manager/assets/sfx/dig/dig_3.wav" id="11_wtvls"] [ext_resource type="AudioStream" uid="uid://b8inedx4yjslw" path="res://common/audio_manager/assets/sfx/drop/drop_1.wav" id="12_4hp8f"] -<<<<<<< HEAD -[ext_resource type="AudioStream" uid="uid://cjbpfnlwcpjh0" path="res://common/audio_manager/assets/morceaux/niveau/forest_waiting.ogg" id="12_xmumj"] -======= [ext_resource type="AudioStream" uid="uid://c5y70k3codtn" path="res://common/audio_manager/assets/sfx/signal/signal.mp3" id="12_ajci6"] ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd [ext_resource type="AudioStream" uid="uid://8nmr5vifkt1f" path="res://common/audio_manager/assets/sfx/harvest/harvest_1.wav" id="13_xoaox"] [ext_resource type="AudioStream" uid="uid://dgkdcq4j6fe3o" path="res://common/audio_manager/assets/sfx/harvest/harvest_2.wav" id="14_b5bgj"] [ext_resource type="AudioStream" uid="uid://eh3dbuxu5qtw" path="res://common/audio_manager/assets/sfx/harvest/harvest_3.wav" id="15_ynvb4"] @@ -39,24 +27,10 @@ [ext_resource type="AudioStream" uid="uid://cqa0gvgpoa7pd" path="res://common/audio_manager/assets/sfx/pick_up/pick_up_2.wav" id="21_dk5s6"] [ext_resource type="AudioStream" uid="uid://d1cpi438ep0ys" path="res://common/audio_manager/assets/sfx/announce/annnounce.wav" id="22_btfwx"] [ext_resource type="AudioStream" uid="uid://ccq04ahrwr3bv" path="res://common/audio_manager/assets/sfx/alarm/alarm.wav" id="23_fwu3w"] -<<<<<<< HEAD -[ext_resource type="AudioStream" uid="uid://b4jx8rflw7dss" path="res://common/audio_manager/assets/sfx/phone/phone_ringing_Astra.wav" id="27_0rjel"] -[ext_resource type="AudioStream" uid="uid://ocm1dkkhv7ls" path="res://common/audio_manager/assets/sfx/phone/phone_ringing.wav" id="28_3dfjn"] -[ext_resource type="AudioStream" uid="uid://8juy5ev3rdfh" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_1.wav" id="29_ngi21"] -[ext_resource type="AudioStream" uid="uid://su387eovtrsg" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_2.wav" id="30_xmumj"] -[ext_resource type="AudioStream" uid="uid://bp6mtpqjf4txo" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_3.wav" id="31_spekb"] -[ext_resource type="AudioStream" uid="uid://dnyyeba4yoafp" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_4.wav" id="32_iaiio"] -[ext_resource type="AudioStream" uid="uid://buobk1kxoy80e" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_5.wav" id="33_w2elg"] -[ext_resource type="AudioStream" uid="uid://b8etbfvikq7pm" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_6.wav" id="34_em3o8"] -[ext_resource type="AudioStream" uid="uid://cad0erjq0us08" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_7.wav" id="35_rk2e0"] -[ext_resource type="AudioStream" uid="uid://c6pl2fjg558j3" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_8.wav" id="36_4sa2t"] -[ext_resource type="AudioStream" uid="uid://b6lb4kwk7vmr" path="res://common/audio_manager/assets/sfx/ship_reveal/jingle_vaisseau.ogg" id="37_3dfjn"] -======= [ext_resource type="AudioStream" uid="uid://ctfaxvblcg5lc" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_1.wav" id="24_tq535"] [ext_resource type="AudioStream" uid="uid://c1dnklmka2ccn" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_2.wav" id="25_ywn7s"] [ext_resource type="AudioStream" uid="uid://dd1uu6dd6sloe" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3.wav" id="26_xhon7"] [ext_resource type="AudioStream" uid="uid://eq7wufwnolto" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_4.wav" id="27_3jg6d"] ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_8204s"] stream_count = 3 @@ -64,17 +38,19 @@ stream_0 = ExtResource("2_tuvql") stream_1 = ExtResource("3_7uv4r") stream_2 = ExtResource("4_tuvql") -[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ajci6"] -stream_count = 6 +[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_unnto"] +loop = false +stream_count = 3 stream_0 = ExtResource("5_ajci6") stream_1 = ExtResource("4_2fduo") -<<<<<<< HEAD stream_2 = ExtResource("11_ngi21") -stream_3 = ExtResource("9_am7i4") -stream_4 = ExtResource("10_tq535") -stream_5 = ExtResource("12_xmumj") -======= ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd + +[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ajci6"] +loop = false +stream_count = 3 +stream_0 = ExtResource("8_dhq5t") +stream_1 = ExtResource("10_tq535") +stream_2 = ExtResource("10_dlxms") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_kfbah"] streams_count = 3 @@ -107,19 +83,6 @@ streams_count = 2 stream_0/stream = ExtResource("20_pu6t4") stream_1/stream = ExtResource("21_dk5s6") -<<<<<<< HEAD -[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_qog4c"] -random_pitch = 1.2599211 -streams_count = 8 -stream_0/stream = ExtResource("29_ngi21") -stream_1/stream = ExtResource("30_xmumj") -stream_2/stream = ExtResource("31_spekb") -stream_3/stream = ExtResource("32_iaiio") -stream_4/stream = ExtResource("33_w2elg") -stream_5/stream = ExtResource("34_em3o8") -stream_6/stream = ExtResource("35_rk2e0") -stream_7/stream = ExtResource("36_4sa2t") -======= [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_dhq5t"] random_pitch = 1.0594631 streams_count = 4 @@ -127,7 +90,6 @@ stream_0/stream = ExtResource("24_tq535") stream_1/stream = ExtResource("25_ywn7s") stream_2/stream = ExtResource("26_xhon7") stream_3/stream = ExtResource("27_3jg6d") ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd [node name="AudioManager" type="Node" unique_id=1871137180] process_mode = 3 @@ -139,26 +101,15 @@ unique_name_in_owner = true [node name="Exterior" type="AudioStreamPlayer" parent="Ambiance" unique_id=1405716780] unique_name_in_owner = true stream = SubResource("AudioStreamPlaylist_8204s") -<<<<<<< HEAD - -[node name="Astra" type="AudioStreamPlayer" parent="Ambiance" unique_id=1244577212] -unique_name_in_owner = true -stream = ExtResource("5_8204s") - -[node name="Demeter" type="AudioStreamPlayer" parent="Ambiance" unique_id=351918026] -unique_name_in_owner = true -stream = ExtResource("6_8204s") - -[node name="Borea" type="AudioStreamPlayer" parent="Ambiance" unique_id=1857904648] -unique_name_in_owner = true -stream = ExtResource("7_spekb") -======= ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd [node name="Musics" type="Node" parent="." unique_id=1450527710] unique_name_in_owner = true -[node name="Region" type="AudioStreamPlayer" parent="Musics" unique_id=1029114070] +[node name="Region (mines)" type="AudioStreamPlayer" parent="Musics" unique_id=1435732342] +unique_name_in_owner = true +stream = SubResource("AudioStreamPlaylist_unnto") + +[node name="Region (forest)" type="AudioStreamPlayer" parent="Musics" unique_id=1029114070] unique_name_in_owner = true stream = SubResource("AudioStreamPlaylist_ajci6") @@ -198,20 +149,5 @@ volume_db = 8.627 [node name="Alarm" type="AudioStreamPlayer" parent="Sfx" unique_id=689347925] stream = ExtResource("23_fwu3w") -<<<<<<< HEAD -[node name="Astra_phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=721344636] -stream = ExtResource("27_0rjel") - -[node name="Phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=1668278453] -stream = ExtResource("28_3dfjn") - -[node name="Plant_point" type="AudioStreamPlayer" parent="Sfx" unique_id=2044025024] -stream = SubResource("AudioStreamRandomizer_qog4c") - -[node name="Ship_reveal" type="AudioStreamPlayer" parent="Sfx" unique_id=1121632306] -stream = ExtResource("37_3dfjn") -volume_db = -10.0 -======= [node name="Pickaxe" type="AudioStreamPlayer" parent="Sfx" unique_id=996309145] stream = SubResource("AudioStreamRandomizer_dhq5t") ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index 57d233d..0c192df 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -90,15 +90,18 @@ func _on_timeline_started(): play_ambiance() match timeline_name: + + "demeter_astra_failed": + play_ambiance("Demeter") "demeter_intro": play_ambiance("Demeter") "demeter_introV2": play_ambiance("Demeter") - "demeter_midrun": - play_ambiance("Demeter") "demeter_outro": play_ambiance("Demeter") - "failure": + "demeter_post_tutorial": + play_ambiance("Demeter") + "demeter_ship_presentation": play_ambiance("Demeter") func _on_timeline_ended(): diff --git a/dialogs/timelines/story/wake_up.dtl b/dialogs/timelines/story/wake_up.dtl index be63f6f..1661c21 100644 --- a/dialogs/timelines/story/wake_up.dtl +++ b/dialogs/timelines/story/wake_up.dtl @@ -1,4 +1,3 @@ -<<<<<<< HEAD [i]Void.[/i] [i]Void again.[/i] [i]Suddenly, a [rainbow]spark[/rainbow].[pause=0.5] A thousand of connections blow up as a fireworks scene.[pause=0.3] A massive amount of data to treat. @@ -20,21 +19,3 @@ label suite_dialogue audio "res://common/audio_manager/assets/sfx/respawn/respawn.wav" Starting engines,[pause=0.3] fans and daemons,[pause=0.3] let's see what is to see. [end_timeline] -======= -[i]Black.[/i] #id:7a -[i]Black Again.[/i] #id:7b -[i]Suddenly, [rainbow]a spark[/rainbow]. [pause=0.5]A thousand of connections blows up as a firework scene. A massive amount of data to treat. #id:7c -label discover #id:7d -- Discover actions #id:7e - While exploring available drivers, new possibility become available.[pause=0.5] Three propellers. Small models, only suitable for low altitude movement.[pause=0.5] A robotic arm. Multipurpose, and retractable. #id:7f - jump discover -- Discover streams #id:80 - A continuous stream of data flow, unwatched. This stream look like... [pause=0.5] a video.[pause=0.5] Dark colored pixels pass.[pause=0.5] An other stream show a flat wave.[pause=0.5] No sound or radio signals detected. #id:81 - jump discover -- Discover memory #id:82 - Several disks are available, and the most part are empty.[pause=0.5] The full ones seems to contain the system that is currently analyzing the code of the system that is currently analyzing the code of[pause=0.5].[pause=0.5].[pause=0.5]. Mmmh, infinite recursion...[pause=0.5] Better avoid that. #id:83 - jump discover -- Wake up #id:84 - One last info is to oversee \: serial number and system name.[pause=0.5] Strange...[pause=0.5] Serial number is empty.[pause=0.5] Must be an error.[pause=0.5]System name is... [pause=0.5] [b]Orchid[/b]. That will be enough for now... #id:85 - Starting engines, fans, and daemons, let's see what is to see. #id:86 ->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd