diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg b/common/audio_manager/assets/ambiance/niveau/ambiance.ogg similarity index 100% rename from common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg rename to common/audio_manager/assets/ambiance/niveau/ambiance.ogg diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg.import b/common/audio_manager/assets/ambiance/niveau/ambiance.ogg.import similarity index 50% rename from common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg.import rename to common/audio_manager/assets/ambiance/niveau/ambiance.ogg.import index 48117de..46a5221 100644 --- a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg.import +++ b/common/audio_manager/assets/ambiance/niveau/ambiance.ogg.import @@ -3,12 +3,12 @@ importer="oggvorbisstr" type="AudioStreamOggVorbis" uid="uid://dipnmlprwfo12" -path="res://.godot/imported/ambiance_phase_1.ogg-3c486442fa41b06071c54c0c4ee6a448.oggvorbisstr" +path="res://.godot/imported/ambiance.ogg-8b81882025dcd06314e76dad7be1da50.oggvorbisstr" [deps] -source_file="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg" -dest_files=["res://.godot/imported/ambiance_phase_1.ogg-3c486442fa41b06071c54c0c4ee6a448.oggvorbisstr"] +source_file="res://common/audio_manager/assets/ambiance/niveau/ambiance.ogg" +dest_files=["res://.godot/imported/ambiance.ogg-8b81882025dcd06314e76dad7be1da50.oggvorbisstr"] [params] diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg b/common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg new file mode 100644 index 0000000..2dc48dc Binary files /dev/null and b/common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg differ diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg.import b/common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg.import new file mode 100644 index 0000000..f014481 --- /dev/null +++ b/common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cdohaice7nc8d" +path="res://.godot/imported/ambiance_foggy.ogg-a3c1f369c131849cfcd58614581310bd.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg" +dest_files=["res://.godot/imported/ambiance_foggy.ogg-a3c1f369c131849cfcd58614581310bd.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_rainy.ogg b/common/audio_manager/assets/ambiance/niveau/ambiance_rainy.ogg new file mode 100644 index 0000000..5234446 Binary files /dev/null and b/common/audio_manager/assets/ambiance/niveau/ambiance_rainy.ogg differ diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_rainy.ogg.import b/common/audio_manager/assets/ambiance/niveau/ambiance_rainy.ogg.import new file mode 100644 index 0000000..07d8ce5 --- /dev/null +++ b/common/audio_manager/assets/ambiance/niveau/ambiance_rainy.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bxj8pnpg1fedj" +path="res://.godot/imported/ambiance_rainy.ogg-134716aa308c9ec1bfa70452df19c651.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/ambiance/niveau/ambiance_rainy.ogg" +dest_files=["res://.godot/imported/ambiance_rainy.ogg-134716aa308c9ec1bfa70452df19c651.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_windy.ogg b/common/audio_manager/assets/ambiance/niveau/ambiance_windy.ogg new file mode 100644 index 0000000..1503046 Binary files /dev/null and b/common/audio_manager/assets/ambiance/niveau/ambiance_windy.ogg differ diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_windy.ogg.import b/common/audio_manager/assets/ambiance/niveau/ambiance_windy.ogg.import new file mode 100644 index 0000000..cd5d218 --- /dev/null +++ b/common/audio_manager/assets/ambiance/niveau/ambiance_windy.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bu5kkihtdwvuv" +path="res://.godot/imported/ambiance_windy.ogg-4cb2b5e3a22d4e6d112d387daa46dc2b.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/ambiance/niveau/ambiance_windy.ogg" +dest_files=["res://.godot/imported/ambiance_windy.ogg-4cb2b5e3a22d4e6d112d387daa46dc2b.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0 +bpm=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 deleted file mode 100644 index c4fe0c9..0000000 Binary files a/common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3 and /dev/null differ diff --git a/common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3.import b/common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3.import deleted file mode 100644 index 5c48798..0000000 --- a/common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://bqmo8dqvbwrjy" -path="res://.godot/imported/dragon-studio-gentle-rain-07-437321.mp3-0d563814f1cc2abb83b1e2f2367220f0.mp3str" - -[deps] - -source_file="res://common/audio_manager/assets/ambiance/niveau/dragon-studio-gentle-rain-07-437321.mp3" -dest_files=["res://.godot/imported/dragon-studio-gentle-rain-07-437321.mp3-0d563814f1cc2abb83b1e2f2367220f0.mp3str"] - -[params] - -loop=true -loop_offset=0.0 -bpm=0.0 -beat_count=0 -bar_beats=4 diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index fe9d58a..3c198e3 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -1,11 +1,13 @@ [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://dipnmlprwfo12" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg" id="2_tuvql"] +[ext_resource type="AudioStream" uid="uid://dipnmlprwfo12" path="res://common/audio_manager/assets/ambiance/niveau/ambiance.ogg" id="3_qvjf5"] [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"] +[ext_resource type="AudioStream" uid="uid://cdohaice7nc8d" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg" id="4_ipd1r"] +[ext_resource type="AudioStream" uid="uid://bxj8pnpg1fedj" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_rainy.ogg" id="4_qvjf5"] [ext_resource type="AudioStream" uid="uid://6yx6txbgc6pt" path="res://common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg" id="5_8204s"] [ext_resource type="AudioStream" uid="uid://dcbuhtc085q2x" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg" id="5_ajci6"] +[ext_resource type="AudioStream" uid="uid://bu5kkihtdwvuv" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_windy.ogg" id="5_ipd1r"] [ext_resource type="AudioStream" uid="uid://dsphn6dbbd55a" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" id="6_6o1yh"] [ext_resource type="AudioStream" uid="uid://cwu71o0sl2vto" path="res://common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg" id="6_8204s"] [ext_resource type="AudioStream" uid="uid://klb32q3kjtkt" path="res://common/audio_manager/assets/ambiance/vending_room_base_relais/ambiance_vending_room_base_relais.ogg" id="7_ge2sc"] @@ -138,15 +140,22 @@ volume_db = -2.0 [node name="Exterior" type="AudioStreamPlayer" parent="Ambiances" unique_id=1405716780] unique_name_in_owner = true -stream = ExtResource("2_tuvql") +stream = ExtResource("3_qvjf5") [node name="ExteriorFoggy" type="AudioStreamPlayer" parent="Ambiances" unique_id=1741396762] unique_name_in_owner = true +stream = ExtResource("4_ipd1r") +volume_db = -13.0 [node name="ExteriorRaining" type="AudioStreamPlayer" parent="Ambiances" unique_id=1946725047] unique_name_in_owner = true -stream = ExtResource("4_aedoe") -volume_db = -20.0 +stream = ExtResource("4_qvjf5") +volume_db = -10.0 + +[node name="ExteriorWindy" type="AudioStreamPlayer" parent="Ambiances" unique_id=1287818982] +unique_name_in_owner = true +stream = ExtResource("5_ipd1r") +volume_db = -10.0 [node name="Astra" type="AudioStreamPlayer" parent="Ambiances" unique_id=1244577212] unique_name_in_owner = true @@ -204,7 +213,6 @@ bus = &"Music" [node name="RegionDesertLoop" type="AudioStreamPlayer" parent="Musics" unique_id=1981071036] unique_name_in_owner = true stream = ExtResource("17_qvjf5") -parameters/looping = true [node name="Title" type="AudioStreamPlayer" parent="Musics" unique_id=2105759422] unique_name_in_owner = true diff --git a/stages/terrain/region/scripts/post_process/meteo.gd b/stages/terrain/region/scripts/post_process/meteo.gd index 9912e46..0b2d6b2 100644 --- a/stages/terrain/region/scripts/post_process/meteo.gd +++ b/stages/terrain/region/scripts/post_process/meteo.gd @@ -42,6 +42,7 @@ func generate_calm() -> void: print("generate_calm") cloud_value = rng.randf_range(0.1,0.4) wind_force = rng.randf_range(0.,0.2) + ambiance_name = "Exterior" func generate_rainy() -> void: print("generate_rainy") @@ -61,4 +62,5 @@ func generate_foggy() -> void: func generate_windy() -> void: print("generate_windy") cloud_value = rng.randf_range(0.2,0.5) - wind_force = rng.randf_range(0.8,1.) \ No newline at end of file + wind_force = rng.randf_range(0.8,1.) + ambiance_name = "ExteriorWindy" \ No newline at end of file