diff --git a/common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg b/common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg index 3b89a87..b36e397 100644 Binary files a/common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg and b/common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg differ diff --git a/common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg b/common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg index c80a0c5..886a14c 100644 Binary files a/common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg and b/common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg differ diff --git a/common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg b/common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg index 1635a92..7bde2bd 100644 Binary files a/common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg and b/common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg differ 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 59a602e..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/assets/ambiance/vaisseau/ship_music.ogg b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg index fd459f5..eaad0b7 100644 Binary files a/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg and b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg differ diff --git a/common/audio_manager/assets/ambiance/vending_room_base_relais/ambiance_vending_room_base_relais.ogg b/common/audio_manager/assets/ambiance/vending_room_base_relais/ambiance_vending_room_base_relais.ogg index 6e51ff8..333c32b 100644 Binary files a/common/audio_manager/assets/ambiance/vending_room_base_relais/ambiance_vending_room_base_relais.ogg and b/common/audio_manager/assets/ambiance/vending_room_base_relais/ambiance_vending_room_base_relais.ogg differ diff --git a/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg b/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg new file mode 100644 index 0000000..92946ae Binary files /dev/null and b/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg differ diff --git a/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg.import b/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg.import new file mode 100644 index 0000000..6a79d3f --- /dev/null +++ b/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ch8wnrckanydg" +path="res://.godot/imported/meeting_demeter.ogg-7dd58073d2ef5705a374bd8bb3634d37.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg" +dest_files=["res://.godot/imported/meeting_demeter.ogg-7dd58073d2ef5705a374bd8bb3634d37.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg b/common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg new file mode 100644 index 0000000..cadfb61 Binary files /dev/null and b/common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg.import b/common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg.import new file mode 100644 index 0000000..2345c93 --- /dev/null +++ b/common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dsfqhcrard8o4" +path="res://.godot/imported/desert_phase_2.ogg-fe1f29fc0b3d46aaaea2ecc57a37cb8a.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg" +dest_files=["res://.godot/imported/desert_phase_2.ogg-fe1f29fc0b3d46aaaea2ecc57a37cb8a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/morceaux/niveau/desert_waiting.ogg b/common/audio_manager/assets/morceaux/niveau/desert_waiting.ogg new file mode 100644 index 0000000..2e5e1d7 Binary files /dev/null and b/common/audio_manager/assets/morceaux/niveau/desert_waiting.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/desert_waiting.ogg.import b/common/audio_manager/assets/morceaux/niveau/desert_waiting.ogg.import new file mode 100644 index 0000000..079cb6c --- /dev/null +++ b/common/audio_manager/assets/morceaux/niveau/desert_waiting.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dimev7sij7crl" +path="res://.godot/imported/desert_waiting.ogg-dc035370eae222fee4cc7ea608e0a7ff.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/morceaux/niveau/desert_waiting.ogg" +dest_files=["res://.godot/imported/desert_waiting.ogg-dc035370eae222fee4cc7ea608e0a7ff.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg index e4eba01..60ae6fd 100644 Binary files a/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg and b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg index 1582477..956ffe9 100644 Binary files a/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg and b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg b/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg index 7de8797..eee1df4 100644 Binary files a/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg and b/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg b/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg index cb1f774..15a5070 100644 Binary files a/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg and b/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg differ diff --git a/common/audio_manager/assets/sfx/get_item/get_item_1.wav b/common/audio_manager/assets/sfx/get_item/get_item_1.wav deleted file mode 100644 index 2913b51..0000000 Binary files a/common/audio_manager/assets/sfx/get_item/get_item_1.wav and /dev/null differ diff --git a/common/audio_manager/assets/sfx/get_item/get_item_1.wav.import b/common/audio_manager/assets/sfx/get_item/get_item_1.wav.import deleted file mode 100644 index 0ad7a5c..0000000 --- a/common/audio_manager/assets/sfx/get_item/get_item_1.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://u44wh180os3n" -path="res://.godot/imported/get_item_1.wav-f624a08053ccc90a130932edf6e93c74.sample" - -[deps] - -source_file="res://common/audio_manager/assets/sfx/get_item/get_item_1.wav" -dest_files=["res://.godot/imported/get_item_1.wav-f624a08053ccc90a130932edf6e93c74.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/unlock_tool/unlock_tool.wav b/common/audio_manager/assets/sfx/unlock_tool/unlock_tool.wav new file mode 100644 index 0000000..4caaf24 Binary files /dev/null and b/common/audio_manager/assets/sfx/unlock_tool/unlock_tool.wav differ diff --git a/common/audio_manager/assets/sfx/unlock_tool/unlock_tool.wav.import b/common/audio_manager/assets/sfx/unlock_tool/unlock_tool.wav.import new file mode 100644 index 0000000..0303bb0 --- /dev/null +++ b/common/audio_manager/assets/sfx/unlock_tool/unlock_tool.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dscyqjujj1com" +path="res://.godot/imported/unlock_tool.wav-27b017d6f16de7402a6aa9283c5a050d.sample" + +[deps] + +source_file="res://common/audio_manager/assets/sfx/unlock_tool/unlock_tool.wav" +dest_files=["res://.godot/imported/unlock_tool.wav-27b017d6f16de7402a6aa9283c5a050d.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 de24960..793147e 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -3,10 +3,13 @@ [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://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"] @@ -21,14 +24,16 @@ [ext_resource type="AudioStream" uid="uid://8nmr5vifkt1f" path="res://common/audio_manager/assets/sfx/harvest/harvest_1.wav" id="13_xoaox"] [ext_resource type="AudioStream" uid="uid://dgkdcq4j6fe3o" path="res://common/audio_manager/assets/sfx/harvest/harvest_2.wav" id="14_b5bgj"] [ext_resource type="AudioStream" uid="uid://crncg0mdx1fdw" path="res://common/audio_manager/assets/morceaux/demo/ending.ogg" id="14_h3tkm"] +[ext_resource type="AudioStream" uid="uid://dsfqhcrard8o4" path="res://common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg" id="14_lwdce"] [ext_resource type="AudioStream" uid="uid://eh3dbuxu5qtw" path="res://common/audio_manager/assets/sfx/harvest/harvest_3.wav" id="15_ynvb4"] [ext_resource type="AudioStream" uid="uid://bown4yipeef8l" path="res://common/audio_manager/assets/sfx/harvest/harvest_4.wav" id="16_obeji"] [ext_resource type="AudioStream" uid="uid://delq7gsdeqjq2" path="res://common/audio_manager/assets/sfx/respawn/respawn.wav" id="16_xmumj"] [ext_resource type="AudioStream" uid="uid://cbo4ld2yypmte" path="res://common/audio_manager/assets/sfx/harvest/harvest_5.wav" id="17_6w0re"] +[ext_resource type="AudioStream" uid="uid://dimev7sij7crl" path="res://common/audio_manager/assets/morceaux/niveau/desert_waiting.ogg" id="17_qvjf5"] [ext_resource type="AudioStream" uid="uid://da3srn8vx4erd" path="res://common/audio_manager/assets/sfx/vending_machine/item-drop.wav" id="18_ehr7m"] [ext_resource type="AudioStream" uid="uid://cs4y6sinpth8e" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_1.wav" id="18_j8acj"] [ext_resource type="AudioStream" uid="uid://c5nfoa6v3r5f7" path="res://common/audio_manager/assets/sfx/harvest/harvest_6.wav" id="18_o4guq"] -[ext_resource type="AudioStream" uid="uid://cbre45rky1f4v" path="res://common/audio_manager/assets/sfx/vending_machine/dragon-studio-power-off-386180.mp3" id="19_aedoe"] +[ext_resource type="AudioStream" uid="uid://dgs7j7itgedoy" path="res://common/audio_manager/assets/sfx/vending_machine/VM_power_off.wav" id="19_ge2sc"] [ext_resource type="AudioStream" uid="uid://bbhkivgarlhqm" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_2.wav" id="19_yjs51"] [ext_resource type="AudioStream" uid="uid://ccfubsk6135qy" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_3.wav" id="20_4ojdh"] [ext_resource type="AudioStream" uid="uid://bjind1iji0gt7" path="res://common/audio_manager/assets/sfx/pick_up/pick_up_1.wav" id="20_pu6t4"] @@ -37,6 +42,7 @@ [ext_resource type="AudioStream" uid="uid://cbm4r5bf7py11" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_4.wav" id="21_ehr7m"] [ext_resource type="AudioStream" uid="uid://dq5qwydrca3vy" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_5.wav" id="22_aedoe"] [ext_resource type="AudioStream" uid="uid://d1cpi438ep0ys" path="res://common/audio_manager/assets/sfx/announce/annnounce.wav" id="22_btfwx"] +[ext_resource type="AudioStream" uid="uid://ch8wnrckanydg" path="res://common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg" id="22_mrdk3"] [ext_resource type="AudioStream" uid="uid://bnwtgp8t46xwc" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_6.wav" id="23_ge2sc"] [ext_resource type="AudioStream" uid="uid://bp3wsncvda5gl" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_7.wav" id="24_yr73o"] [ext_resource type="AudioStream" uid="uid://b4jx8rflw7dss" path="res://common/audio_manager/assets/sfx/phone/phone_ringing_Astra.wav" id="27_0rjel"] @@ -64,6 +70,7 @@ [ext_resource type="AudioStream" uid="uid://cv5avkd3qekt7" path="res://common/audio_manager/assets/sfx/movement/movement.wav" id="51_iyxkn"] [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"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_6o1yh"] streams_count = 3 @@ -130,195 +137,257 @@ volume_db = -7.195 pitch_scale = 0.5 [node name="BaseRelais" type="AudioStreamPlayer" parent="Ambiances" unique_id=1895636918] +unique_name_in_owner = true stream = ExtResource("7_ge2sc") +volume_db = -7.0 [node name="VendingRoom" type="AudioStreamPlayer" parent="Ambiances" unique_id=1478190718] +unique_name_in_owner = true stream = ExtResource("7_ge2sc") +volume_db = -7.0 [node name="Exterior" type="AudioStreamPlayer" parent="Ambiances" unique_id=1405716780] unique_name_in_owner = true -stream = ExtResource("2_tuvql") +stream = ExtResource("3_qvjf5") +volume_db = -5.0 [node name="ExteriorFoggy" type="AudioStreamPlayer" parent="Ambiances" unique_id=1741396762] unique_name_in_owner = true +stream = ExtResource("4_ipd1r") +volume_db = -18.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 = -15.0 + +[node name="ExteriorWindy" type="AudioStreamPlayer" parent="Ambiances" unique_id=1287818982] +unique_name_in_owner = true +stream = ExtResource("5_ipd1r") +volume_db = -15.0 [node name="Astra" type="AudioStreamPlayer" parent="Ambiances" unique_id=1244577212] unique_name_in_owner = true stream = ExtResource("5_8204s") +volume_db = -5.0 [node name="Demeter" type="AudioStreamPlayer" parent="Ambiances" unique_id=351918026] unique_name_in_owner = true stream = ExtResource("6_8204s") +volume_db = -5.0 [node name="Borea" type="AudioStreamPlayer" parent="Ambiances" unique_id=1857904648] unique_name_in_owner = true stream = ExtResource("7_spekb") +volume_db = -5.0 [node name="Ship" type="AudioStreamPlayer" parent="Ambiances" unique_id=1564186965] unique_name_in_owner = true stream = ExtResource("8_tuvql") +volume_db = -5.0 [node name="Musics" type="Node" parent="." unique_id=1450527710] unique_name_in_owner = true -[node name="RegionDesertPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=1222638526] -unique_name_in_owner = true -stream = ExtResource("11_yjs51") - [node name="RegionForestPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=1029114070] unique_name_in_owner = true stream = ExtResource("6_6o1yh") +volume_db = -5.0 [node name="RegionForestPhase2" type="AudioStreamPlayer" parent="Musics" unique_id=417543634] unique_name_in_owner = true stream = ExtResource("10_tq535") +volume_db = -5.0 [node name="RegionMinePhase1" type="AudioStreamPlayer" parent="Musics" unique_id=152032267] unique_name_in_owner = true stream = ExtResource("5_ajci6") +volume_db = -5.0 [node name="RegionMinePhase2" type="AudioStreamPlayer" parent="Musics" unique_id=348001141] unique_name_in_owner = true stream = ExtResource("4_2fduo") +volume_db = -5.0 + +[node name="RegionDesertPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=1222638526] +unique_name_in_owner = true +stream = ExtResource("11_yjs51") +volume_db = -5.0 + +[node name="RegionDesertPhase2" type="AudioStreamPlayer" parent="Musics" unique_id=2003475958] +unique_name_in_owner = true +stream = ExtResource("14_lwdce") +volume_db = -5.0 [node name="RegionForestLoop" type="AudioStreamPlayer" parent="Musics" unique_id=482654512] unique_name_in_owner = true stream = ExtResource("12_xmumj") +volume_db = -5.0 bus = &"Music" [node name="RegionMineLoop" type="AudioStreamPlayer" parent="Musics" unique_id=814165127] unique_name_in_owner = true stream = ExtResource("11_ngi21") +volume_db = -5.0 bus = &"Music" +[node name="RegionDesertLoop" type="AudioStreamPlayer" parent="Musics" unique_id=1981071036] +unique_name_in_owner = true +stream = ExtResource("17_qvjf5") +volume_db = -5.0 + [node name="Title" type="AudioStreamPlayer" parent="Musics" unique_id=2105759422] unique_name_in_owner = true stream = ExtResource("7_tuvql") +volume_db = -5.0 bus = &"Music" [node name="Demo_end" type="AudioStreamPlayer" parent="Musics" unique_id=261817716] unique_name_in_owner = true stream = ExtResource("14_h3tkm") +volume_db = -5.0 + +[node name="Meeting_demeter" type="AudioStreamPlayer" parent="Musics" unique_id=1066359159] +unique_name_in_owner = true +stream = ExtResource("22_mrdk3") [node name="Sfx" type="Node" parent="." unique_id=2023641207] unique_name_in_owner = true [node name="Dig" type="AudioStreamPlayer" parent="Sfx" unique_id=486042600] stream = SubResource("AudioStreamRandomizer_6o1yh") +volume_db = -5.0 [node name="VendingMachineDrop" type="AudioStreamPlayer" parent="Sfx" unique_id=1161500181] stream = ExtResource("18_ehr7m") +volume_db = -5.0 pitch_scale = 0.81 [node name="VendingMachineOff" type="AudioStreamPlayer" parent="Sfx" unique_id=743754597] -stream = ExtResource("19_aedoe") -volume_db = -14.149 -pitch_scale = 0.75 +stream = ExtResource("19_ge2sc") +volume_db = -5.0 [node name="DoorOpen" type="AudioStreamPlayer" parent="Sfx" unique_id=1440910292] stream = ExtResource("20_yr73o") +volume_db = -6.0 pitch_scale = 1.5 [node name="Recharge1" type="AudioStreamPlayer" parent="Sfx" unique_id=357905012] stream = ExtResource("18_j8acj") +volume_db = -10.0 [node name="Recharge2" type="AudioStreamPlayer" parent="Sfx" unique_id=261310291] stream = ExtResource("19_yjs51") +volume_db = -10.0 [node name="Recharge3" type="AudioStreamPlayer" parent="Sfx" unique_id=1559567919] stream = ExtResource("20_4ojdh") +volume_db = -10.0 [node name="Recharge4" type="AudioStreamPlayer" parent="Sfx" unique_id=1697092547] stream = ExtResource("21_ehr7m") +volume_db = -10.0 [node name="Recharge5" type="AudioStreamPlayer" parent="Sfx" unique_id=1385679733] stream = ExtResource("22_aedoe") +volume_db = -10.0 [node name="Recharge6" type="AudioStreamPlayer" parent="Sfx" unique_id=391499157] stream = ExtResource("23_ge2sc") +volume_db = -10.0 [node name="Recharge7" type="AudioStreamPlayer" parent="Sfx" unique_id=355754872] stream = ExtResource("24_yr73o") +volume_db = -10.0 [node name="Rocks" type="AudioStreamPlayer" parent="Sfx" unique_id=1012908521] stream = SubResource("AudioStreamRandomizer_kfbah") +volume_db = -5.0 [node name="Respawn" type="AudioStreamPlayer" parent="Sfx" unique_id=1902559716] stream = ExtResource("16_xmumj") +volume_db = -5.0 [node name="Drop" type="AudioStreamPlayer" parent="Sfx" unique_id=1391500830] stream = SubResource("AudioStreamRandomizer_1w04j") -volume_db = -2.0 +volume_db = -7.0 [node name="Harvest" type="AudioStreamPlayer" parent="Sfx" unique_id=345539331] stream = SubResource("AudioStreamRandomizer_i4m0x") +volume_db = -5.0 [node name="PickUp" type="AudioStreamPlayer" parent="Sfx" unique_id=176915166] stream = SubResource("AudioStreamRandomizer_jjdv2") -volume_db = -11.0 +volume_db = -16.0 [node name="Announce" type="AudioStreamPlayer" parent="Sfx" unique_id=876644323] stream = ExtResource("22_btfwx") -volume_db = 8.627 +volume_db = 3.627 [node name="Astra_phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=721344636] stream = ExtResource("27_0rjel") +volume_db = -5.0 [node name="Phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=1668278453] stream = ExtResource("28_3dfjn") +volume_db = -5.0 [node name="PlantPoint" type="AudioStreamPlayer" parent="Sfx" unique_id=2044025024] stream = SubResource("AudioStreamRandomizer_qog4c") +volume_db = -5.0 [node name="Reveal" type="AudioStreamPlayer" parent="Sfx" unique_id=1597352608] stream = ExtResource("37_3dfjn") -volume_db = -3.0 +volume_db = -8.0 [node name="Ship_reveal" type="AudioStreamPlayer" parent="Sfx" unique_id=1121632306] stream = ExtResource("37_3dfjn") -volume_db = -3.0 +volume_db = -8.0 [node name="Signal" type="AudioStreamPlayer" parent="Sfx" unique_id=335682989] stream = ExtResource("41_iaiio") -volume_db = -10.0 +volume_db = -15.0 [node name="Atterrissage" type="AudioStreamPlayer" parent="Sfx" unique_id=2021186625] stream = ExtResource("40_h3tkm") +volume_db = -5.0 [node name="Decollage" type="AudioStreamPlayer" parent="Sfx" unique_id=581331122] stream = ExtResource("41_iyxkn") +volume_db = -5.0 [node name="Elevator" type="AudioStreamPlayer" parent="Sfx" unique_id=1345852969] stream = ExtResource("42_obkny") +volume_db = -5.0 [node name="Mining" type="AudioStreamPlayer" parent="Sfx" unique_id=1122216774] stream = SubResource("AudioStreamRandomizer_yjs51") +volume_db = -5.0 [node name="Screen_interaction" type="AudioStreamPlayer" parent="Sfx" unique_id=1140309368] stream = ExtResource("47_svctq") -volume_db = -8.0 +volume_db = -13.0 [node name="Ship_exit" type="AudioStreamPlayer" parent="Sfx" unique_id=615567072] stream = ExtResource("48_j8acj") -volume_db = 8.0 +volume_db = 3.0 [node name="Movement" type="AudioStreamPlayer" parent="Sfx" unique_id=1403498558] stream = ExtResource("51_iyxkn") -volume_db = -7.0 +volume_db = -12.0 [node name="Teleportation" type="AudioStreamPlayer" parent="Sfx" unique_id=369599456] stream = ExtResource("50_rlnfe") -volume_db = -6.0 +volume_db = -11.0 [node name="HoloAppear" type="AudioStreamPlayer" parent="Sfx" unique_id=637436824] stream = ExtResource("63_aedoe") -volume_db = -6.0 +volume_db = -11.0 [node name="HoloDisappear" type="AudioStreamPlayer" parent="Sfx" unique_id=1756615928] stream = ExtResource("64_ge2sc") -volume_db = -6.0 +volume_db = -11.0 + +[node name="Unlock_tool" type="AudioStreamPlayer" parent="Sfx" unique_id=667077616] +stream = ExtResource("64_yr73o") +volume_db = -5.0 diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index 161ef98..c059c2f 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -7,19 +7,21 @@ const MAX_VOLUME = 24. const DEFAULT_FADE_TIME : float = 5.0 const REGION_FIRST_PHASE = [ - "RegionDesertPhase1", - "RegionForestPhase1", - "RegionForestPhase2", "RegionMinePhase1", "RegionMinePhase2", + "RegionForestPhase1", + "RegionForestPhase2", + "RegionDesertPhase1", + "RegionDesertPhase2", ] const REGION_LOOP_PHASE = [ - "RegionForestLoop", - "RegionForestLoop", - "RegionForestLoop", "RegionMineLoop", - "RegionMineLoop" + "RegionMineLoop", + "RegionForestLoop", + "RegionForestLoop", + "RegionDesertLoop", + "RegionDesertLoop", ] @onready var settings : SettingsData = GameInfo.settings_data diff --git a/dialogs/timelines/gameplay_related/demeter_astra_failed.dtl.uid b/dialogs/timelines/gameplay_related/demeter_astra_failed.dtl.uid new file mode 100644 index 0000000..260848b --- /dev/null +++ b/dialogs/timelines/gameplay_related/demeter_astra_failed.dtl.uid @@ -0,0 +1 @@ +uid://clq4utdtxf01d diff --git a/dialogs/timelines/story/demeter_post_tutorial.dtl.uid b/dialogs/timelines/story/demeter_post_tutorial.dtl.uid new file mode 100644 index 0000000..ab78b97 --- /dev/null +++ b/dialogs/timelines/story/demeter_post_tutorial.dtl.uid @@ -0,0 +1 @@ +uid://fng5jdep6ebr diff --git a/dialogs/timelines/story/demeter_ship_presentation.dtl.uid b/dialogs/timelines/story/demeter_ship_presentation.dtl.uid new file mode 100644 index 0000000..f4684a5 --- /dev/null +++ b/dialogs/timelines/story/demeter_ship_presentation.dtl.uid @@ -0,0 +1 @@ +uid://cc1vx88mwb7tu diff --git a/stages/terrain/region/scripts/post_process/meteo.gd b/stages/terrain/region/scripts/post_process/meteo.gd index 500043f..b3f7fc2 100644 --- a/stages/terrain/region/scripts/post_process/meteo.gd +++ b/stages/terrain/region/scripts/post_process/meteo.gd @@ -41,6 +41,7 @@ func generate(): func generate_calm() -> void: cloud_value = rng.randf_range(0.1,0.4) wind_force = rng.randf_range(0.,0.2) + ambiance_name = "Exterior" func generate_rainy() -> void: rain_value = rng.randf_range(0.3,1.) @@ -54,4 +55,5 @@ func generate_foggy() -> void: func generate_windy() -> void: 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