zacharie/seeding-planets
2
2
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'musique_et_son_3' of https://git.zacharie-guet.fr/zacharie/seeding-planets into musique_et_son_3

Browse Source
This commit is contained in:
Nilou
2026-06-16 15:46:28 +02:00
parent 99f804b6e9 f7f1d2be2c
commit 9ab67f2b98
502 changed files with 11724 additions and 2254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/audio_manager/assets/morceaux/histoire/borea.ogg.import
View File

@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/borea.ogg-b575bef16c730ed2e0563c2eb6862766.og
[params]
loop=false
loop_offset=0
bpm=0
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4

10
common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import
View File

@@ -2,6 +2,7 @@
importer="wav"
type="AudioStreamWAV"
<<<<<<<< HEAD:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import
uid="uid://dh3oho0pis6jv"
path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"
@@ -9,6 +10,15 @@ path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.
source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav"
dest_files=["res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.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_cave_finalblow.wav"
dest_files=["res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"]
>>>>>>>> f7f1d2be2c5b797138414266ce6324e8a3ff748f:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import
[params]

10
common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import
View File

@@ -2,6 +2,7 @@
importer="wav"
type="AudioStreamWAV"
<<<<<<<< HEAD:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import
uid="uid://c6jdmdjncamcu"
path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"
@@ -9,6 +10,15 @@ path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a
source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav"
dest_files=["res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.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_cave_2.wav"
dest_files=["res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"]
>>>>>>>> f7f1d2be2c5b797138414266ce6324e8a3ff748f:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import
[params]

BIN
common/audio_manager/assets/sfx/tractor_beam/drop.wav Normal file
View File

Binary file not shown.

24
common/audio_manager/assets/sfx/tractor_beam/drop.wav.import Normal file
View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://cam4vv1am40dy"
path="res://.godot/imported/drop.wav-b76e8a2f6f5f0c41737e74496f01ceaa.sample"
[deps]
source_file="res://common/audio_manager/assets/sfx/tractor_beam/drop.wav"
dest_files=["res://.godot/imported/drop.wav-b76e8a2f6f5f0c41737e74496f01ceaa.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

BIN
common/audio_manager/assets/sfx/tractor_beam/take.wav Normal file
View File

Binary file not shown.

24
common/audio_manager/assets/sfx/tractor_beam/take.wav.import Normal file
View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://bdrdnli5k27a2"
path="res://.godot/imported/take.wav-d597c4daf1adbf3b061372ab36ef9940.sample"
[deps]
source_file="res://common/audio_manager/assets/sfx/tractor_beam/take.wav"
dest_files=["res://.godot/imported/take.wav-d597c4daf1adbf3b061372ab36ef9940.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

16
common/audio_manager/audio_manager.tscn
View File

@@ -69,6 +69,8 @@
[ext_resource type="AudioStream" uid="uid://53ixfbcd5qwu" path="res://common/audio_manager/assets/sfx/holo/holo_appear.wav" id="63_aedoe"]
[ext_resource type="AudioStream" uid="uid://dsijqgnnadgem" path="res://common/audio_manager/assets/sfx/holo/holo_disappear.wav" id="64_ge2sc"]
[ext_resource type="AudioStream" uid="uid://dscyqjujj1com" path="res://common/audio_manager/assets/sfx/unlock_tool/unlock_tool.wav" id="64_yr73o"]
[ext_resource type="AudioStream" uid="uid://bdrdnli5k27a2" path="res://common/audio_manager/assets/sfx/tractor_beam/take.wav" id="69_5rlid"]
[ext_resource type="AudioStream" uid="uid://cam4vv1am40dy" path="res://common/audio_manager/assets/sfx/tractor_beam/drop.wav" id="70_gfbcu"]
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_6o1yh"]
streams_count = 3
@@ -311,7 +313,7 @@ volume_db = -7.0
[node name="Harvest" type="AudioStreamPlayer" parent="Sfx" unique_id=345539331]
stream = SubResource("AudioStreamRandomizer_i4m0x")
volume_db = -5.0
volume_db = -7.0
[node name="PickUp" type="AudioStreamPlayer" parent="Sfx" unique_id=176915166]
stream = SubResource("AudioStreamRandomizer_jjdv2")
@@ -355,7 +357,7 @@ volume_db = -5.0
[node name="Elevator" type="AudioStreamPlayer" parent="Sfx" unique_id=1345852969]
stream = ExtResource("42_obkny")
volume_db = -5.0
pitch_scale = 1.1
[node name="Mining" type="AudioStreamPlayer" parent="Sfx" unique_id=1122216774]
stream = SubResource("AudioStreamRandomizer_yjs51")
@@ -387,4 +389,12 @@ volume_db = -11.0
[node name="Unlock_tool" type="AudioStreamPlayer" parent="Sfx" unique_id=667077616]
stream = ExtResource("64_yr73o")
volume_db = 3.0
volume_db = -5.0
[node name="TractorBeamTake" type="AudioStreamPlayer" parent="Sfx" unique_id=1321980229]
stream = ExtResource("69_5rlid")
volume_db = -5.0
[node name="TractorBeamDrop" type="AudioStreamPlayer" parent="Sfx" unique_id=2023233451]
stream = ExtResource("70_gfbcu")
volume_db = -5.0

9
common/audio_manager/scripts/audio_manager.gd
View File

@@ -40,7 +40,7 @@ func _on_change_scene(scene : Scene):
stop_all_ambiances()
if (scene is TitleScene):
play_music_alone("Title", false, 5.0)
play_music_alone("Title", false, 0.0)
elif scene is IntroScene:
stop_all_musics()
elif scene is RegionScene:
@@ -59,8 +59,8 @@ func _on_change_scene(scene : Scene):
stop_all_musics()
play_ambiance_alone("Astra", false)
elif scene is BoreaScene:
stop_all_musics()
play_ambiance_alone("Borea", false)
play_music_alone("Meeting_demeter")
stop_all_ambiances()
elif scene is VendingMachineScene:
stop_all_musics()
play_ambiance_alone("VendingRoom", false)
@@ -207,12 +207,13 @@ func change_ambiances_volume(db_change := 0., fade := DEFAULT_FADE_TIME):
# Joue un
# - player_name : Nom de la Node dans la scène Godot à jouer
func play_sfx(sfx_name : String):
func play_sfx(sfx_name : String, pitch = 1.):
var player := %Sfx.find_child(sfx_name) as AudioStreamPlayer
if player:
player.play()
else:
printerr("Sfx %s not found" % sfx_name)
# ----------------- Partie Technique (pas touche Niels ;D) ----------------