diff --git a/common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg b/common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg index 89c7554..b36e397 100644 Binary files a/common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg and b/common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg differ diff --git a/common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg b/common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg index 42905d6..886a14c 100644 Binary files a/common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg and b/common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg differ diff --git a/common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg b/common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg index 1635a92..7bde2bd 100644 Binary files a/common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg and b/common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg index e4eba01..60ae6fd 100644 Binary files a/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg and b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg index 1582477..956ffe9 100644 Binary files a/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg and b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg b/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg index 7de8797..eee1df4 100644 Binary files a/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg and b/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg b/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg index cb1f774..15a5070 100644 Binary files a/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg and b/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg differ diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 3c198e3..655242f 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -131,47 +131,52 @@ unique_name_in_owner = true [node name="BaseRelais" type="AudioStreamPlayer" parent="Ambiances" unique_id=1895636918] unique_name_in_owner = true stream = ExtResource("7_ge2sc") -volume_db = -2.0 +volume_db = -7.0 [node name="VendingRoom" type="AudioStreamPlayer" parent="Ambiances" unique_id=1478190718] unique_name_in_owner = true stream = ExtResource("7_ge2sc") -volume_db = -2.0 +volume_db = -7.0 [node name="Exterior" type="AudioStreamPlayer" parent="Ambiances" unique_id=1405716780] unique_name_in_owner = true stream = ExtResource("3_qvjf5") +volume_db = -5.0 [node name="ExteriorFoggy" type="AudioStreamPlayer" parent="Ambiances" unique_id=1741396762] unique_name_in_owner = true stream = ExtResource("4_ipd1r") -volume_db = -13.0 +volume_db = -18.0 [node name="ExteriorRaining" type="AudioStreamPlayer" parent="Ambiances" unique_id=1946725047] unique_name_in_owner = true stream = ExtResource("4_qvjf5") -volume_db = -10.0 +volume_db = -15.0 [node name="ExteriorWindy" type="AudioStreamPlayer" parent="Ambiances" unique_id=1287818982] unique_name_in_owner = true stream = ExtResource("5_ipd1r") -volume_db = -10.0 +volume_db = -15.0 [node name="Astra" type="AudioStreamPlayer" parent="Ambiances" unique_id=1244577212] unique_name_in_owner = true stream = ExtResource("5_8204s") +volume_db = -5.0 [node name="Demeter" type="AudioStreamPlayer" parent="Ambiances" unique_id=351918026] unique_name_in_owner = true stream = ExtResource("6_8204s") +volume_db = -5.0 [node name="Borea" type="AudioStreamPlayer" parent="Ambiances" unique_id=1857904648] unique_name_in_owner = true stream = ExtResource("7_spekb") +volume_db = -5.0 [node name="Ship" type="AudioStreamPlayer" parent="Ambiances" unique_id=1564186965] unique_name_in_owner = true stream = ExtResource("8_tuvql") +volume_db = -5.0 [node name="Musics" type="Node" parent="." unique_id=1450527710] unique_name_in_owner = true @@ -179,173 +184,198 @@ unique_name_in_owner = true [node name="RegionForestPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=1029114070] unique_name_in_owner = true stream = ExtResource("6_6o1yh") +volume_db = -5.0 [node name="RegionForestPhase2" type="AudioStreamPlayer" parent="Musics" unique_id=417543634] unique_name_in_owner = true stream = ExtResource("10_tq535") +volume_db = -5.0 [node name="RegionMinePhase1" type="AudioStreamPlayer" parent="Musics" unique_id=152032267] unique_name_in_owner = true stream = ExtResource("5_ajci6") +volume_db = -5.0 [node name="RegionMinePhase2" type="AudioStreamPlayer" parent="Musics" unique_id=348001141] unique_name_in_owner = true stream = ExtResource("4_2fduo") +volume_db = -5.0 [node name="RegionDesertPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=1222638526] unique_name_in_owner = true stream = ExtResource("11_yjs51") +volume_db = -5.0 [node name="RegionDesertPhase2" type="AudioStreamPlayer" parent="Musics" unique_id=2003475958] unique_name_in_owner = true stream = ExtResource("14_lwdce") +volume_db = -5.0 [node name="RegionForestLoop" type="AudioStreamPlayer" parent="Musics" unique_id=482654512] unique_name_in_owner = true stream = ExtResource("12_xmumj") +volume_db = -5.0 bus = &"Music" [node name="RegionMineLoop" type="AudioStreamPlayer" parent="Musics" unique_id=814165127] unique_name_in_owner = true stream = ExtResource("11_ngi21") +volume_db = -5.0 bus = &"Music" [node name="RegionDesertLoop" type="AudioStreamPlayer" parent="Musics" unique_id=1981071036] unique_name_in_owner = true stream = ExtResource("17_qvjf5") +volume_db = -5.0 [node name="Title" type="AudioStreamPlayer" parent="Musics" unique_id=2105759422] unique_name_in_owner = true stream = ExtResource("7_tuvql") +volume_db = -5.0 bus = &"Music" [node name="Demo_end" type="AudioStreamPlayer" parent="Musics" unique_id=261817716] unique_name_in_owner = true stream = ExtResource("14_h3tkm") +volume_db = -5.0 [node name="Sfx" type="Node" parent="." unique_id=2023641207] unique_name_in_owner = true [node name="Dig" type="AudioStreamPlayer" parent="Sfx" unique_id=486042600] stream = SubResource("AudioStreamRandomizer_6o1yh") +volume_db = -5.0 [node name="VendingMachineDrop" type="AudioStreamPlayer" parent="Sfx" unique_id=1161500181] stream = ExtResource("18_ehr7m") +volume_db = -5.0 pitch_scale = 0.81 [node name="VendingMachineOff" type="AudioStreamPlayer" parent="Sfx" unique_id=743754597] stream = ExtResource("19_ge2sc") +volume_db = -5.0 [node name="DoorOpen" type="AudioStreamPlayer" parent="Sfx" unique_id=1440910292] stream = ExtResource("20_yr73o") -volume_db = -1.0 +volume_db = -6.0 pitch_scale = 1.5 [node name="Recharge1" type="AudioStreamPlayer" parent="Sfx" unique_id=357905012] stream = ExtResource("18_j8acj") -volume_db = -5.0 +volume_db = -10.0 [node name="Recharge2" type="AudioStreamPlayer" parent="Sfx" unique_id=261310291] stream = ExtResource("19_yjs51") -volume_db = -5.0 +volume_db = -10.0 [node name="Recharge3" type="AudioStreamPlayer" parent="Sfx" unique_id=1559567919] stream = ExtResource("20_4ojdh") -volume_db = -5.0 +volume_db = -10.0 [node name="Recharge4" type="AudioStreamPlayer" parent="Sfx" unique_id=1697092547] stream = ExtResource("21_ehr7m") -volume_db = -5.0 +volume_db = -10.0 [node name="Recharge5" type="AudioStreamPlayer" parent="Sfx" unique_id=1385679733] stream = ExtResource("22_aedoe") -volume_db = -5.0 +volume_db = -10.0 [node name="Recharge6" type="AudioStreamPlayer" parent="Sfx" unique_id=391499157] stream = ExtResource("23_ge2sc") -volume_db = -5.0 +volume_db = -10.0 [node name="Recharge7" type="AudioStreamPlayer" parent="Sfx" unique_id=355754872] stream = ExtResource("24_yr73o") -volume_db = -5.0 +volume_db = -10.0 [node name="Rocks" type="AudioStreamPlayer" parent="Sfx" unique_id=1012908521] stream = SubResource("AudioStreamRandomizer_kfbah") +volume_db = -5.0 [node name="Respawn" type="AudioStreamPlayer" parent="Sfx" unique_id=1902559716] stream = ExtResource("16_xmumj") +volume_db = -5.0 [node name="Drop" type="AudioStreamPlayer" parent="Sfx" unique_id=1391500830] stream = SubResource("AudioStreamRandomizer_1w04j") -volume_db = -2.0 +volume_db = -7.0 [node name="Harvest" type="AudioStreamPlayer" parent="Sfx" unique_id=345539331] stream = SubResource("AudioStreamRandomizer_i4m0x") +volume_db = -5.0 [node name="PickUp" type="AudioStreamPlayer" parent="Sfx" unique_id=176915166] stream = SubResource("AudioStreamRandomizer_jjdv2") -volume_db = -11.0 +volume_db = -16.0 [node name="Announce" type="AudioStreamPlayer" parent="Sfx" unique_id=876644323] stream = ExtResource("22_btfwx") -volume_db = 8.627 +volume_db = 3.627 [node name="Astra_phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=721344636] stream = ExtResource("27_0rjel") +volume_db = -5.0 [node name="Phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=1668278453] stream = ExtResource("28_3dfjn") +volume_db = -5.0 [node name="PlantPoint" type="AudioStreamPlayer" parent="Sfx" unique_id=2044025024] stream = SubResource("AudioStreamRandomizer_qog4c") +volume_db = -5.0 [node name="Reveal" type="AudioStreamPlayer" parent="Sfx" unique_id=1597352608] stream = ExtResource("37_3dfjn") -volume_db = -3.0 +volume_db = -8.0 [node name="Ship_reveal" type="AudioStreamPlayer" parent="Sfx" unique_id=1121632306] stream = ExtResource("37_3dfjn") -volume_db = -3.0 +volume_db = -8.0 [node name="Signal" type="AudioStreamPlayer" parent="Sfx" unique_id=335682989] stream = ExtResource("41_iaiio") -volume_db = -10.0 +volume_db = -15.0 [node name="Atterrissage" type="AudioStreamPlayer" parent="Sfx" unique_id=2021186625] stream = ExtResource("40_h3tkm") +volume_db = -5.0 [node name="Decollage" type="AudioStreamPlayer" parent="Sfx" unique_id=581331122] stream = ExtResource("41_iyxkn") +volume_db = -5.0 [node name="Elevator" type="AudioStreamPlayer" parent="Sfx" unique_id=1345852969] stream = ExtResource("42_obkny") +volume_db = -5.0 [node name="Mining" type="AudioStreamPlayer" parent="Sfx" unique_id=1122216774] stream = SubResource("AudioStreamRandomizer_yjs51") +volume_db = -5.0 [node name="Screen_interaction" type="AudioStreamPlayer" parent="Sfx" unique_id=1140309368] stream = ExtResource("47_svctq") -volume_db = -8.0 +volume_db = -13.0 [node name="Ship_exit" type="AudioStreamPlayer" parent="Sfx" unique_id=615567072] stream = ExtResource("48_j8acj") -volume_db = 8.0 +volume_db = 3.0 [node name="Movement" type="AudioStreamPlayer" parent="Sfx" unique_id=1403498558] stream = ExtResource("51_iyxkn") -volume_db = -7.0 +volume_db = -12.0 [node name="Teleportation" type="AudioStreamPlayer" parent="Sfx" unique_id=369599456] stream = ExtResource("50_rlnfe") -volume_db = -6.0 +volume_db = -11.0 [node name="HoloAppear" type="AudioStreamPlayer" parent="Sfx" unique_id=637436824] stream = ExtResource("63_aedoe") -volume_db = -6.0 +volume_db = -11.0 [node name="HoloDisappear" type="AudioStreamPlayer" parent="Sfx" unique_id=1756615928] stream = ExtResource("64_ge2sc") -volume_db = -6.0 +volume_db = -11.0 [node name="Unlock_tool" type="AudioStreamPlayer" parent="Sfx" unique_id=667077616] stream = ExtResource("64_yr73o") +volume_db = -5.0 diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index cc34c10..058ed63 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -7,21 +7,21 @@ const MAX_VOLUME = 24. const DEFAULT_FADE_TIME : float = 5.0 const REGION_FIRST_PHASE = [ - "RegionDesertPhase1", - "RegionDesertPhase2", "RegionMinePhase1", "RegionMinePhase2", "RegionForestPhase1", "RegionForestPhase2", + "RegionDesertPhase1", + "RegionDesertPhase2", ] const REGION_LOOP_PHASE = [ - "RegionDesertLoop", - "RegionDesertLoop", "RegionMineLoop", "RegionMineLoop", "RegionForestLoop", "RegionForestLoop", + "RegionDesertLoop", + "RegionDesertLoop", ] @onready var settings : SettingsData = GameInfo.settings_data