diff --git a/common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg b/common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg new file mode 100644 index 0000000..1327327 Binary files /dev/null and b/common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg differ diff --git a/common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg.import b/common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg.import new file mode 100644 index 0000000..6184012 --- /dev/null +++ b/common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dq2nodhwnp73f" +path="res://.godot/imported/solarmusic-dripping-water-in-cave-114694.ogg-81f5d41775da1d0914399edcb9214d3c.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg" +dest_files=["res://.godot/imported/solarmusic-dripping-water-in-cave-114694.ogg-81f5d41775da1d0914399edcb9214d3c.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3 b/common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3 index c4fe0c9..59a602e 100644 Binary files a/common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3 and b/common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3 differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav new file mode 100644 index 0000000..c80a232 Binary files /dev/null and b/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav.import b/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav.import new file mode 100644 index 0000000..ee4519a --- /dev/null +++ b/common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://3c4nxjasebyk" +path="res://.godot/imported/pickaxe_1_reverb.wav-8d6172bc1e5c2f43ec5b5cf869d5b6e3.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"] + +[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_2_reverb.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav new file mode 100644 index 0000000..70f2d95 Binary files /dev/null and b/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav.import b/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav.import new file mode 100644 index 0000000..588c4cb --- /dev/null +++ b/common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bs5ldhabymm5p" +path="res://.godot/imported/pickaxe_2_reverb.wav-c953afb7e49205a0f4377738e1135a5b.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"] + +[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_3_reverb.wav b/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav new file mode 100644 index 0000000..26c5cc0 Binary files /dev/null and b/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav differ diff --git a/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav.import b/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav.import new file mode 100644 index 0000000..21a4dee --- /dev/null +++ b/common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bu278eqn8krnb" +path="res://.godot/imported/pickaxe_3_reverb.wav-d3e3d8b6b50a16c6757536f43c8c6ccd.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"] + +[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 94c2de0..de24960 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -1,6 +1,7 @@ [gd_scene format=3 uid="uid://b6hscxcrj065q"] [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://b1hut6lc1jevh" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg" id="4_2fduo"] [ext_resource type="AudioStream" uid="uid://bqmo8dqvbwrjy" path="res://common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3" id="4_aedoe"] @@ -123,6 +124,11 @@ script = ExtResource("1_0tvca") [node name="Ambiances" type="Node" parent="." unique_id=1989991562] unique_name_in_owner = true +[node name="Cave" type="AudioStreamPlayer" parent="Ambiances" unique_id=71769481] +stream = ExtResource("2_ge2sc") +volume_db = -7.195 +pitch_scale = 0.5 + [node name="BaseRelais" type="AudioStreamPlayer" parent="Ambiances" unique_id=1895636918] stream = ExtResource("7_ge2sc") diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index 40cbceb..161ef98 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -65,6 +65,9 @@ func _on_change_scene(scene : Scene): elif scene is RelayBaseScene: stop_all_musics() play_ambiance_alone("BaseRelais", false) + elif scene is CaveScene: + stop_all_musics() + play_ambiance_alone("Cave", false) # Fonction s'exécutant à chaque début de timeline func _on_timeline_started(): diff --git a/common/game_data/scripts/story/story_step.gd b/common/game_data/scripts/story/story_step.gd index d945dd3..9b1ecdb 100644 --- a/common/game_data/scripts/story/story_step.gd +++ b/common/game_data/scripts/story/story_step.gd @@ -50,11 +50,11 @@ func get_charge_number(_level : int) -> int: func get_objective_for_region(level : int) -> int: match level: 1: return 10 - 2: return 12 - 3: return 16 - 4: return 22 - 5: return 30 - _: return get_objective_for_region(level-1) + (level-3) * 5 + 2: return 15 + 3: return 20 + 4: return 30 + 5: return 45 + _: return get_objective_for_region(level-1) + (level-2) * 5 func get_story_modifiers_for_region(level : int) -> Array[RegionModifier]: var modifiers : Array[RegionModifier] = [] diff --git a/entities/interactable_3d/cristal/cristal.tscn b/entities/interactable_3d/cristal/cristal.tscn index 735b8f7..006d233 100644 --- a/entities/interactable_3d/cristal/cristal.tscn +++ b/entities/interactable_3d/cristal/cristal.tscn @@ -1,21 +1,19 @@ [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://ctfaxvblcg5lc" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_1.wav" id="2_247i2"] +[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="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_3.blend" id="2_vejte"] -[ext_resource type="AudioStream" uid="uid://c1dnklmka2ccn" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_2.wav" id="3_k7wsc"] +[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="PackedScene" uid="uid://d0sdfjneo8rjj" path="res://entities/interactable_3d/cristal/assets/cristal_crack_1.blend" id="3_nvfy2"] -[ext_resource type="AudioStream" uid="uid://dd1uu6dd6sloe" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3.wav" id="4_qeist"] -[ext_resource type="AudioStream" uid="uid://eq7wufwnolto" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_4.wav" id="5_22ghi"] +[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="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 = 4 -stream_0/stream = ExtResource("2_247i2") -stream_1/stream = ExtResource("3_k7wsc") -stream_2/stream = ExtResource("4_qeist") -stream_3/stream = ExtResource("5_22ghi") +streams_count = 3 +stream_0/stream = ExtResource("2_3rrt0") +stream_1/stream = ExtResource("3_247i2") +stream_2/stream = ExtResource("4_k7wsc") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ci2hw"] transparency = 1