diff --git a/common/audio_manager/assets/sfx/movement/movement.wav b/common/audio_manager/assets/sfx/movement/movement.wav deleted file mode 100644 index 50e3c6a..0000000 Binary files a/common/audio_manager/assets/sfx/movement/movement.wav and /dev/null differ diff --git a/common/audio_manager/assets/sfx/movement/movement.wav.import b/common/audio_manager/assets/sfx/movement/movement.wav.import deleted file mode 100644 index 23fec34..0000000 --- a/common/audio_manager/assets/sfx/movement/movement.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://b4sxly5jsvlkr" -path="res://.godot/imported/movement.wav-5172908d78e3619625b5599572afbbff.sample" - -[deps] - -source_file="res://common/audio_manager/assets/sfx/movement/movement.wav" -dest_files=["res://.godot/imported/movement.wav-5172908d78e3619625b5599572afbbff.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/assets/sfx/truck_moving.wav b/common/audio_manager/assets/sfx/truck_moving.wav new file mode 100644 index 0000000..337080b Binary files /dev/null and b/common/audio_manager/assets/sfx/truck_moving.wav differ diff --git a/common/audio_manager/assets/sfx/truck_moving.wav.import b/common/audio_manager/assets/sfx/truck_moving.wav.import new file mode 100644 index 0000000..1d080a5 --- /dev/null +++ b/common/audio_manager/assets/sfx/truck_moving.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://djjt2atdlodvq" +path="res://.godot/imported/truck_moving.wav-608d3f268d80c20ff62c8c70504d07b7.sample" + +[deps] + +source_file="res://common/audio_manager/assets/sfx/truck_moving.wav" +dest_files=["res://.godot/imported/truck_moving.wav-608d3f268d80c20ff62c8c70504d07b7.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 c170449..1bc4dd1 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -8,6 +8,7 @@ [ext_resource type="AudioStream" uid="uid://bqwiaek5b5q00" path="res://common/audio_manager/assets/morceaux/forest_phase_2.ogg" id="6_ldyhq"] [ext_resource type="AudioStream" uid="uid://d4lqhgf0lhgge" path="res://common/audio_manager/assets/morceaux/forest_phase_3.ogg" id="7_ol34x"] [ext_resource type="AudioStream" uid="uid://brtjlgjqnrvcb" path="res://common/audio_manager/assets/morceaux/truck_music.ogg" id="8_0e5ja"] +[ext_resource type="AudioStream" uid="uid://bnxsnege8qq6e" path="res://common/audio_manager/assets/morceaux/forest_phase_4.ogg" id="8_ajci6"] [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://llxrlwfccywb" path="res://common/audio_manager/assets/sfx/dig/dig_3.wav" id="11_wtvls"] @@ -18,7 +19,6 @@ [ext_resource type="AudioStream" uid="uid://bown4yipeef8l" path="res://common/audio_manager/assets/sfx/harvest/harvest_4.wav" id="16_obeji"] [ext_resource type="AudioStream" uid="uid://cbo4ld2yypmte" path="res://common/audio_manager/assets/sfx/harvest/harvest_5.wav" id="17_6w0re"] [ext_resource type="AudioStream" uid="uid://c5nfoa6v3r5f7" path="res://common/audio_manager/assets/sfx/harvest/harvest_6.wav" id="18_o4guq"] -[ext_resource type="AudioStream" uid="uid://b4sxly5jsvlkr" path="res://common/audio_manager/assets/sfx/movement/movement.wav" id="19_m4obf"] [ext_resource type="AudioStream" uid="uid://bjind1iji0gt7" path="res://common/audio_manager/assets/sfx/pick_up/pick_up_1.wav" id="20_pu6t4"] [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/annnounce.wav" id="22_btfwx"] @@ -34,10 +34,11 @@ stream_2/stream = ExtResource("4_athui") stream_2/volume = -60.0 [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ajci6"] -stream_count = 3 +stream_count = 4 stream_0 = ExtResource("5_4kks7") stream_1 = ExtResource("6_ldyhq") stream_2 = ExtResource("7_ol34x") +stream_3 = ExtResource("8_ajci6") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_kfbah"] streams_count = 3 @@ -46,6 +47,7 @@ stream_1/stream = ExtResource("10_n7o7n") stream_2/stream = ExtResource("11_wtvls") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_1w04j"] +random_pitch = 1.2 streams_count = 1 stream_0/stream = ExtResource("12_4hp8f") @@ -59,6 +61,7 @@ stream_4/stream = ExtResource("17_6w0re") stream_5/stream = ExtResource("18_o4guq") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_jjdv2"] +random_pitch = 1.2 streams_count = 2 stream_0/stream = ExtResource("20_pu6t4") stream_1/stream = ExtResource("21_dk5s6") @@ -66,6 +69,7 @@ stream_1/stream = ExtResource("21_dk5s6") [node name="AudioManager" type="Node" node_paths=PackedStringArray("playing_soundtracks")] process_mode = 3 script = ExtResource("1_0tvca") +default_fade_time = 2.0 garden_phases_scores = Array[int]([0, 10, 30]) playing_soundtracks = [NodePath("Ambiance/Default")] @@ -102,9 +106,6 @@ stream = SubResource("AudioStreamRandomizer_1w04j") [node name="Harvest" type="AudioStreamPlayer" parent="Sfx"] stream = SubResource("AudioStreamRandomizer_i4m0x") -[node name="Move" type="AudioStreamPlayer" parent="Sfx"] -stream = ExtResource("19_m4obf") - [node name="PickUp" type="AudioStreamPlayer" parent="Sfx"] stream = SubResource("AudioStreamRandomizer_jjdv2") volume_db = -10.0