diff --git a/common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg b/common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg new file mode 100644 index 0000000..c96faa0 Binary files /dev/null and b/common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg differ diff --git a/common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg.import b/common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg.import new file mode 100644 index 0000000..9b8cf75 --- /dev/null +++ b/common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://du3hfjbaoyc8" +path="res://.godot/imported/fin_de_map.ogg-62fbcdd24bc4df66b50e9a969579e8d9.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg" +dest_files=["res://.godot/imported/fin_de_map.ogg-62fbcdd24bc4df66b50e9a969579e8d9.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/sfx/phone/phone_call.wav b/common/audio_manager/assets/sfx/phone/phone_call.wav new file mode 100644 index 0000000..92dc627 Binary files /dev/null and b/common/audio_manager/assets/sfx/phone/phone_call.wav differ diff --git a/common/audio_manager/assets/sfx/phone/phone_call.wav.import b/common/audio_manager/assets/sfx/phone/phone_call.wav.import new file mode 100644 index 0000000..6ce9695 --- /dev/null +++ b/common/audio_manager/assets/sfx/phone/phone_call.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://budu0cym6ximv" +path="res://.godot/imported/phone_call.wav-5f6468b6c2e194f4077a966b2b8ed027.sample" + +[deps] + +source_file="res://common/audio_manager/assets/sfx/phone/phone_call.wav" +dest_files=["res://.godot/imported/phone_call.wav-5f6468b6c2e194f4077a966b2b8ed027.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 793147e..9364190 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -2,7 +2,6 @@ [ext_resource type="Script" uid="uid://2p5d6vogtn82" path="res://common/audio_manager/scripts/audio_manager.gd" id="1_0tvca"] [ext_resource type="AudioStream" uid="uid://dq2nodhwnp73f" path="res://common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg" id="2_ge2sc"] -[ext_resource type="AudioStream" uid="uid://dipnmlprwfo12" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg" id="2_tuvql"] [ext_resource type="AudioStream" uid="uid://dipnmlprwfo12" path="res://common/audio_manager/assets/ambiance/niveau/ambiance.ogg" id="3_qvjf5"] [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://cdohaice7nc8d" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg" id="4_ipd1r"] @@ -23,7 +22,6 @@ [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://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://crncg0mdx1fdw" path="res://common/audio_manager/assets/morceaux/demo/ending.ogg" id="14_h3tkm"] [ext_resource type="AudioStream" uid="uid://dsfqhcrard8o4" path="res://common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg" id="14_lwdce"] [ext_resource type="AudioStream" uid="uid://eh3dbuxu5qtw" path="res://common/audio_manager/assets/sfx/harvest/harvest_3.wav" id="15_ynvb4"] [ext_resource type="AudioStream" uid="uid://bown4yipeef8l" path="res://common/audio_manager/assets/sfx/harvest/harvest_4.wav" id="16_obeji"] @@ -45,8 +43,6 @@ [ext_resource type="AudioStream" uid="uid://ch8wnrckanydg" path="res://common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg" id="22_mrdk3"] [ext_resource type="AudioStream" uid="uid://bnwtgp8t46xwc" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_6.wav" id="23_ge2sc"] [ext_resource type="AudioStream" uid="uid://bp3wsncvda5gl" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_7.wav" id="24_yr73o"] -[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"] @@ -65,6 +61,7 @@ [ext_resource type="AudioStream" uid="uid://dd1uu6dd6sloe" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3.wav" id="45_mur2l"] [ext_resource type="AudioStream" uid="uid://eq7wufwnolto" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_4.wav" id="46_t0v4u"] [ext_resource type="AudioStream" uid="uid://cv7sj8n5oo1i8" path="res://common/audio_manager/assets/sfx/screen_bip/screen_bip.wav" id="47_svctq"] +[ext_resource type="AudioStream" uid="uid://budu0cym6ximv" path="res://common/audio_manager/assets/sfx/phone/phone_call.wav" id="48_ipd1r"] [ext_resource type="AudioStream" uid="uid://sgwvpxiul5x5" path="res://common/audio_manager/assets/sfx/ship_exit/ship_exit.wav" id="48_j8acj"] [ext_resource type="AudioStream" uid="uid://ca0wonha334cl" path="res://common/audio_manager/assets/sfx/teleportation/teleport.wav" id="50_rlnfe"] [ext_resource type="AudioStream" uid="uid://cv5avkd3qekt7" path="res://common/audio_manager/assets/sfx/movement/movement.wav" id="51_iyxkn"] @@ -132,6 +129,7 @@ script = ExtResource("1_0tvca") unique_name_in_owner = true [node name="Cave" type="AudioStreamPlayer" parent="Ambiances" unique_id=71769481] +unique_name_in_owner = true stream = ExtResource("2_ge2sc") volume_db = -7.195 pitch_scale = 0.5 @@ -242,11 +240,6 @@ 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="Meeting_demeter" type="AudioStreamPlayer" parent="Musics" unique_id=1066359159] unique_name_in_owner = true stream = ExtResource("22_mrdk3") @@ -325,11 +318,11 @@ stream = ExtResource("22_btfwx") volume_db = 3.627 [node name="Astra_phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=721344636] -stream = ExtResource("27_0rjel") +stream = ExtResource("48_ipd1r") volume_db = -5.0 [node name="Phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=1668278453] -stream = ExtResource("28_3dfjn") +stream = ExtResource("48_ipd1r") volume_db = -5.0 [node name="PlantPoint" type="AudioStreamPlayer" parent="Sfx" unique_id=2044025024] diff --git a/entities/interactables/win_cristal/win_cristal.tscn b/entities/interactables/win_cristal/win_cristal.tscn index eacf25a..85923a1 100644 --- a/entities/interactables/win_cristal/win_cristal.tscn +++ b/entities/interactables/win_cristal/win_cristal.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cismap3cn5e36" path="res://entities/interactables/win_cristal/scripts/win_cristal.gd" id="1_yb2ta"] [ext_resource type="Script" uid="uid://cos0ennmyfvc2" path="res://entities/interactables/win_cristal/scripts/win_cristal_data.gd" id="2_vkbio"] [ext_resource type="Texture2D" uid="uid://dslagvhodlepi" path="res://entities/interactables/win_cristal/assets/sprites/asset_cristals.png" id="2_yb2ta"] -[ext_resource type="AudioStream" uid="uid://dnqq2sy3dxrb2" path="res://common/audio_manager/assets/sfx/cristal/freesound_community-wine-glass-clink-36036.mp3" id="3_vkbio"] +[ext_resource type="AudioStream" uid="uid://du3hfjbaoyc8" path="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg" id="4_vkbio"] [sub_resource type="Resource" id="Resource_5lni1"] script = ExtResource("2_vkbio") @@ -30,11 +30,6 @@ region = Rect2(75, 527, 316, 399) atlas = ExtResource("2_yb2ta") region = Rect2(462, 542, 286, 387) -[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_tfnwb"] -random_pitch = 1.4142135 -streams_count = 1 -stream_0/stream = ExtResource("3_vkbio") - [node name="WinCristal" type="Area2D" unique_id=247353676] script = ExtResource("1_yb2ta") data = SubResource("Resource_5lni1") @@ -50,6 +45,7 @@ shape = SubResource("CapsuleShape2D_vkbio") unique_name_in_owner = true [node name="AssetCristals" type="Sprite2D" parent="Sprites" unique_id=2111863528] +visible = false scale = Vector2(0.4, 0.4) texture = SubResource("AtlasTexture_5lni1") offset = Vector2(0, -139.255) @@ -63,7 +59,6 @@ offset = Vector2(0, -149) flip_h = true [node name="AssetCristals3" type="Sprite2D" parent="Sprites" unique_id=2082980627] -visible = false scale = Vector2(0.3, 0.3) texture = SubResource("AtlasTexture_t34j2") offset = Vector2(0, -150) @@ -78,5 +73,5 @@ flip_h = true [node name="CristalPlayer" type="AudioStreamPlayer2D" parent="." unique_id=1879646229] unique_name_in_owner = true -stream = SubResource("AudioStreamRandomizer_tfnwb") +stream = ExtResource("4_vkbio") bus = &"Sfx"