zacharie/seeding-planets
2
2
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

correction de l'audio et des dialogues

Browse Source
This commit was merged in pull request #149.
This commit is contained in:
Zacharie Guet
2026-02-21 16:56:48 +01:00
parent 7254ca1ce3
commit eb48a095de
22 changed files with 164 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg.import
View File

@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/ambiance_phase_1.ogg-3c486442fa41b06071c54c0c
[params]
loop=false
loop=true
loop_offset=0.0
bpm=0.0
beat_count=0

2
common/audio_manager/assets/ambiance/niveau/ambiance_phase_2.ogg.import
View File

@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/ambiance_phase_2.ogg-a28969a5c2d756a0073623a6
[params]
loop=false
loop=true
loop_offset=0.0
bpm=0.0
beat_count=0

4
common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg.import
View File

@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/ambiance_phase_3.ogg-66c917f6ee1dc2ac31474ae7
[params]
loop=true
loop_offset=0
bpm=0
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4

8
common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import
View File

@@ -2,7 +2,7 @@
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://dadg6o6dl2k6t"
uid="uid://bmwaw1yb8hucf"
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

2
common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import
View File

@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_1.ogg-6fd2e255642e47e98a5560b5a2
[params]
loop=false
loop=true
loop_offset=0
bpm=0
beat_count=0

2
common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import
View File

@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_2.ogg-1497e4a80f7f2adb0670888710
[params]
loop=false
loop=true
loop_offset=0
bpm=0
beat_count=0

2
common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg.import
View File

@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/mines_phase_1.ogg-992232f16d175421a148ea48885
[params]
loop=false
loop=true
loop_offset=0
bpm=0
beat_count=0

2
common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg.import
View File

@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/mines_phase_2.ogg-f9104b757c31bcfc711d0517d98
[params]
loop=false
loop=true
loop_offset=0
bpm=0
beat_count=0

62
common/audio_manager/audio_manager.tscn
View File

@@ -5,30 +5,17 @@
[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://bmwaw1yb8hucf" 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://dfrp66a4isnt6" path="res://common/audio_manager/assets/sfx/dig/dig_1.wav" id="9_gv65y"]
[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,7 +26,6 @@
[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"]
@@ -50,13 +36,8 @@
[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
[ext_resource type="AudioStream" uid="uid://6id31r7o6trc" path="res://common/audio_manager/assets/sfx/ship_reveal/jingle_vaisseau.wav" id="37_3dfjn"]
[ext_resource type="AudioStream" uid="uid://c5y70k3codtn" path="res://common/audio_manager/assets/sfx/signal/signal.mp3" id="41_iaiio"]
[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_8204s"]
stream_count = 3
@@ -68,24 +49,12 @@ stream_2 = ExtResource("4_tuvql")
stream_count = 6
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="AudioStreamRandomizer" id="AudioStreamRandomizer_kfbah"]
streams_count = 3
stream_0/stream = ExtResource("9_gv65y")
stream_1/stream = ExtResource("10_n7o7n")
stream_2/stream = ExtResource("11_wtvls")
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_8204s"]
random_pitch = 1.0594631
streams_count = 1
stream_0/stream = ExtResource("12_ajci6")
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_1w04j"]
random_pitch = 1.2
@@ -107,7 +76,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
@@ -119,15 +87,6 @@ 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
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,7 +98,6 @@ 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
@@ -152,8 +110,6 @@ 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
@@ -178,9 +134,6 @@ unique_name_in_owner = true
[node name="Dig" type="AudioStreamPlayer" parent="Sfx" unique_id=486042600]
stream = SubResource("AudioStreamRandomizer_kfbah")
[node name="Signal" type="AudioStreamPlayer" parent="Sfx" unique_id=641246368]
stream = SubResource("AudioStreamRandomizer_8204s")
[node name="Drop" type="AudioStreamPlayer" parent="Sfx" unique_id=1391500830]
stream = SubResource("AudioStreamRandomizer_1w04j")
@@ -198,7 +151,6 @@ 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")
@@ -211,7 +163,7 @@ 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
[node name="Signal" type="AudioStreamPlayer" parent="Sfx" unique_id=335682989]
stream = ExtResource("41_iaiio")
volume_db = -10.0

23
common/audio_manager/scripts/audio_manager.gd
View File

@@ -79,22 +79,34 @@ func _on_change_scene(scene : Scene):
match scene.scene_id:
"TITLE":
play_music("Title", false, 0.0)
"INTRO":
stop_music()
"REGION":
play_music("Region", true)
play_ambiance("Exterior", true)
play_ambiance("Exterior")
"COCKPIT":
play_music("Ship")
"ASTRA":
stop_music()
play_ambiance("Astra")
"GARAGE":
stop_music()
"BOREA":
stop_music()
play_ambiance("Borea")
func _on_timeline_started():
var timeline_name = Dialogic.current_timeline.resource_path.split("/")[-1].trim_suffix(".dtl")
play_ambiance()
stop_ambiance()
match timeline_name:
"demeter_astra_failed":
play_ambiance("Demeter")
"demeter_ship_presentation":
play_ambiance("Demeter")
"demeter_intro":
play_ambiance("Demeter")
"demeter_introV2":
play_ambiance("Demeter")
"demeter_midrun":
"demeter_post_tutorial":
play_ambiance("Demeter")
"demeter_outro":
play_ambiance("Demeter")
@@ -187,6 +199,7 @@ func reset_volume(player : AudioStreamPlayer):
player.volume_db = get_volume(player)
func play_sfx(sfx_name : String):
print(sfx_name)
var player := %Sfx.find_child(sfx_name) as AudioStreamPlayer
if player:
player.play()