diff --git a/common/audio_manager/assets/sfx/phone/pickaxe_cave_1.wav b/common/audio_manager/assets/sfx/phone/pickaxe_cave_1.wav new file mode 100644 index 0000000..98c33fa Binary files /dev/null and b/common/audio_manager/assets/sfx/phone/pickaxe_cave_1.wav differ diff --git a/common/audio_manager/assets/sfx/phone/pickaxe_cave_1.wav.import b/common/audio_manager/assets/sfx/phone/pickaxe_cave_1.wav.import new file mode 100644 index 0000000..d5a9db8 --- /dev/null +++ b/common/audio_manager/assets/sfx/phone/pickaxe_cave_1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c18orgaa5yect" +path="res://.godot/imported/pickaxe_cave_1.wav-c2db6fad48f4457a7e47ef7fabdce2ca.sample" + +[deps] + +source_file="res://common/audio_manager/assets/sfx/phone/pickaxe_cave_1.wav" +dest_files=["res://.godot/imported/pickaxe_cave_1.wav-c2db6fad48f4457a7e47ef7fabdce2ca.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/phone/pickaxe_cave_2.wav b/common/audio_manager/assets/sfx/phone/pickaxe_cave_2.wav new file mode 100644 index 0000000..e6a7128 Binary files /dev/null and b/common/audio_manager/assets/sfx/phone/pickaxe_cave_2.wav differ diff --git a/common/audio_manager/assets/sfx/phone/pickaxe_cave_2.wav.import b/common/audio_manager/assets/sfx/phone/pickaxe_cave_2.wav.import new file mode 100644 index 0000000..63be812 --- /dev/null +++ b/common/audio_manager/assets/sfx/phone/pickaxe_cave_2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cbkg6v76a1d1q" +path="res://.godot/imported/pickaxe_cave_2.wav-72432422e9b9eac863b31c5dda4262c9.sample" + +[deps] + +source_file="res://common/audio_manager/assets/sfx/phone/pickaxe_cave_2.wav" +dest_files=["res://.godot/imported/pickaxe_cave_2.wav-72432422e9b9eac863b31c5dda4262c9.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/pickaxe/pickaxe_1_reverb.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav deleted file mode 100644 index c80a232..0000000 Binary files a/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav and /dev/null differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav deleted file mode 100644 index 70f2d95..0000000 Binary files a/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav and /dev/null differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav deleted file mode 100644 index 26c5cc0..0000000 Binary files a/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav and /dev/null differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav new file mode 100644 index 0000000..98c33fa Binary files /dev/null and b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav.import b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav.import similarity index 57% rename from common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav.import rename to common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav.import index ee4519a..692cea6 100644 --- a/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav.import +++ b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav.import @@ -2,13 +2,13 @@ importer="wav" type="AudioStreamWAV" -uid="uid://3c4nxjasebyk" -path="res://.godot/imported/pickaxe_1_reverb.wav-8d6172bc1e5c2f43ec5b5cf869d5b6e3.sample" +uid="uid://x36rvb4eso8q" +path="res://.godot/imported/pickaxe_cave_1.wav-5365b9250c03fe13766ad32a821704fa.sample" [deps] -source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav" -dest_files=["res://.godot/imported/pickaxe_1_reverb.wav-8d6172bc1e5c2f43ec5b5cf869d5b6e3.sample"] +source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav" +dest_files=["res://.godot/imported/pickaxe_cave_1.wav-5365b9250c03fe13766ad32a821704fa.sample"] [params] diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav new file mode 100644 index 0000000..e6a7128 Binary files /dev/null and b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav.import b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import similarity index 57% rename from common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav.import rename to common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import index 21a4dee..ae8a7b0 100644 --- a/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav.import +++ b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import @@ -2,13 +2,13 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bu278eqn8krnb" -path="res://.godot/imported/pickaxe_3_reverb.wav-d3e3d8b6b50a16c6757536f43c8c6ccd.sample" +uid="uid://dh3oho0pis6jv" +path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample" [deps] -source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav" -dest_files=["res://.godot/imported/pickaxe_3_reverb.wav-d3e3d8b6b50a16c6757536f43c8c6ccd.sample"] +source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav" +dest_files=["res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"] [params] diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav new file mode 100644 index 0000000..daf152d Binary files /dev/null and b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav.import b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import similarity index 55% rename from common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav.import rename to common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import index 588c4cb..c21c66f 100644 --- a/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav.import +++ b/common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import @@ -2,13 +2,13 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bs5ldhabymm5p" -path="res://.godot/imported/pickaxe_2_reverb.wav-c953afb7e49205a0f4377738e1135a5b.sample" +uid="uid://c6jdmdjncamcu" +path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample" [deps] -source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav" -dest_files=["res://.godot/imported/pickaxe_2_reverb.wav-c953afb7e49205a0f4377738e1135a5b.sample"] +source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav" +dest_files=["res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"] [params] diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 9364190..6a41361 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -383,4 +383,4 @@ volume_db = -11.0 [node name="Unlock_tool" type="AudioStreamPlayer" parent="Sfx" unique_id=667077616] stream = ExtResource("64_yr73o") -volume_db = -5.0 +volume_db = 3.0 diff --git a/entities/interactable_3d/cristal/cristal.tscn b/entities/interactable_3d/cristal/cristal.tscn index b50c951..bdddf91 100644 --- a/entities/interactable_3d/cristal/cristal.tscn +++ b/entities/interactable_3d/cristal/cristal.tscn @@ -1,19 +1,18 @@ [gd_scene format=3 uid="uid://8rorj31s3irn"] [ext_resource type="Script" uid="uid://dwn3g8c5sa0a2" path="res://entities/interactable_3d/cristal/scripts/cristal.gd" id="1_ci2hw"] -[ext_resource type="AudioStream" uid="uid://3c4nxjasebyk" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav" id="2_3rrt0"] +[ext_resource type="AudioStream" uid="uid://x36rvb4eso8q" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav" id="2_3rrt0"] [ext_resource type="PackedScene" uid="uid://mwk845fx5ye2" path="res://entities/interactable_3d/cristal/assets/cristal.blend" id="2_ci2hw"] [ext_resource type="PackedScene" uid="uid://c7p114rvk26xw" path="res://entities/interactable_3d/cristal/assets/cristal_crack.blend" id="2_vejte"] -[ext_resource type="AudioStream" uid="uid://bs5ldhabymm5p" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav" id="3_247i2"] -[ext_resource type="AudioStream" uid="uid://bu278eqn8krnb" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav" id="4_k7wsc"] +[ext_resource type="AudioStream" uid="uid://c6jdmdjncamcu" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav" id="4_k7wsc"] [ext_resource type="PackedScene" uid="uid://bhbc1monbgumh" path="res://entities/interactable_3d/cristal/artefact_announce.tscn" id="8_3rrt0"] [ext_resource type="PackedScene" uid="uid://brp1fpvasaims" path="res://entities/interactable_3d/cristal/mutation_announce.tscn" id="9_247i2"] -[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ojmpp"] -streams_count = 3 +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_amehi"] +playback_mode = 2 +streams_count = 2 stream_0/stream = ExtResource("2_3rrt0") -stream_1/stream = ExtResource("3_247i2") -stream_2/stream = ExtResource("4_k7wsc") +stream_1/stream = ExtResource("4_k7wsc") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ci2hw"] transparency = 1 @@ -39,7 +38,7 @@ metadata/_custom_type_script = "uid://bj4d1x8n8ina" [node name="BreackAudioPlayer" type="AudioStreamPlayer3D" parent="." unique_id=1190729820] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0430325, 0) -stream = SubResource("AudioStreamRandomizer_ojmpp") +stream = SubResource("AudioStreamRandomizer_amehi") [node name="BreakParticles" type="CPUParticles3D" parent="." unique_id=1968257379] unique_name_in_owner = true diff --git a/entities/interactable_3d/cristal/scripts/artefact_announce.gd b/entities/interactable_3d/cristal/scripts/artefact_announce.gd index ab7eaeb..f12d283 100644 --- a/entities/interactable_3d/cristal/scripts/artefact_announce.gd +++ b/entities/interactable_3d/cristal/scripts/artefact_announce.gd @@ -72,7 +72,7 @@ func set_announce_artefact(artefact := announce_artefact): if not visible: %AnimationPlayer.play("appear") Input.mouse_mode = Input.MOUSE_MODE_VISIBLE - AudioManager.play_sfx("Reveal") + AudioManager.play_sfx("Unlock_tool") elif artefact == null and visible: %AnimationPlayer.play_backwards("appear") diff --git a/entities/interactable_3d/cristal/scripts/mutation_announce.gd b/entities/interactable_3d/cristal/scripts/mutation_announce.gd index c606241..f5b5b13 100644 --- a/entities/interactable_3d/cristal/scripts/mutation_announce.gd +++ b/entities/interactable_3d/cristal/scripts/mutation_announce.gd @@ -68,7 +68,7 @@ func set_announce_mutation(mutation := announce_mutation): if not visible: %AnimationPlayer.play("appear") Input.mouse_mode = Input.MOUSE_MODE_VISIBLE - AudioManager.play_sfx("Reveal") + AudioManager.play_sfx("Unlock_tool") elif mutation == null and visible: %AnimationPlayer.play_backwards("appear")