diff --git a/common/audio_manager/assets/morceaux/histoire/subterra.ogg b/common/audio_manager/assets/morceaux/histoire/subterra.ogg new file mode 100644 index 0000000..6753f6f Binary files /dev/null and b/common/audio_manager/assets/morceaux/histoire/subterra.ogg differ diff --git a/common/audio_manager/assets/morceaux/histoire/subterra.ogg.import b/common/audio_manager/assets/morceaux/histoire/subterra.ogg.import new file mode 100644 index 0000000..d016c25 --- /dev/null +++ b/common/audio_manager/assets/morceaux/histoire/subterra.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bdsghxlbtduuy" +path="res://.godot/imported/subterra.ogg-458c2f15c134af211d5a71b5819758c5.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/morceaux/histoire/subterra.ogg" +dest_files=["res://.godot/imported/subterra.ogg-458c2f15c134af211d5a71b5819758c5.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 6a41361..9459063 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -184,6 +184,9 @@ unique_name_in_owner = true stream = ExtResource("8_tuvql") volume_db = -5.0 +[node name="Subterra" type="AudioStreamPlayer" parent="Ambiances" unique_id=2019011683] +unique_name_in_owner = true + [node name="Musics" type="Node" parent="." unique_id=1450527710] unique_name_in_owner = true diff --git a/gui/game/announce/scripts/announce.gd b/gui/game/announce/scripts/announce.gd index 05a3417..2f13f0d 100644 --- a/gui/game/announce/scripts/announce.gd +++ b/gui/game/announce/scripts/announce.gd @@ -91,7 +91,6 @@ func set_announce_object(object := announce_object): if not visible: %AnimationPlayer.play("appear") Pointer.action_disabled = true - AudioManager.play_sfx("Reveal") elif object == null and visible: %AnimationPlayer.play_backwards("appear") get_tree().create_timer(0.2).timeout.connect( # Put a delay to not interfere with the ok button click diff --git a/gui/game/tutorial/scripts/tutorial.gd b/gui/game/tutorial/scripts/tutorial.gd index da5bbb4..4d3b5bb 100644 --- a/gui/game/tutorial/scripts/tutorial.gd +++ b/gui/game/tutorial/scripts/tutorial.gd @@ -147,14 +147,12 @@ func finish_tutorial(): func display_plant_info_tutorial(with_card_info : CardInfo): %PlantInfoCard.info = with_card_info - AudioManager.play_sfx("Reveal") %PlantInfoCard.update() %PlantInfoTutorialAnimationPlayer.play("appear") Pointer.action_disabled = true func display_mutations_tutorial(with_card_info : CardInfo): %MutationCard.info = with_card_info - AudioManager.play_sfx("Reveal") %MutationCard.update() %MutationTutorialAnimationPlayer.play("appear") Pointer.action_disabled = true diff --git a/stages/3d_scenes/cockpit_scene/scripts/ship_tutorial.gd b/stages/3d_scenes/cockpit_scene/scripts/ship_tutorial.gd index e9e41cb..33ab2c0 100644 --- a/stages/3d_scenes/cockpit_scene/scripts/ship_tutorial.gd +++ b/stages/3d_scenes/cockpit_scene/scripts/ship_tutorial.gd @@ -23,7 +23,7 @@ func _ready(): ok_button.button_down.connect(_on_ok_button_button_down) func appear(): - AudioManager.play_sfx("Reveal") + AudioManager.play_sfx("Unlock_tool") animation_player.play("appear") Input.mouse_mode = Input.MOUSE_MODE_VISIBLE player.controlling_player=false