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/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 749dae2..fe9d58a 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -20,10 +20,12 @@ [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"] @@ -187,7 +189,7 @@ stream = ExtResource("11_yjs51") [node name="RegionDesertPhase2" type="AudioStreamPlayer" parent="Musics" unique_id=2003475958] unique_name_in_owner = true -stream = ExtResource("11_yjs51") +stream = ExtResource("14_lwdce") [node name="RegionForestLoop" type="AudioStreamPlayer" parent="Musics" unique_id=482654512] unique_name_in_owner = true @@ -201,7 +203,7 @@ bus = &"Music" [node name="RegionDesertLoop" type="AudioStreamPlayer" parent="Musics" unique_id=1981071036] unique_name_in_owner = true -stream = ExtResource("11_yjs51") +stream = ExtResource("17_qvjf5") parameters/looping = true [node name="Title" type="AudioStreamPlayer" parent="Musics" unique_id=2105759422] diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index 40cbceb..cc34c10 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -8,18 +8,20 @@ const DEFAULT_FADE_TIME : float = 5.0 const REGION_FIRST_PHASE = [ "RegionDesertPhase1", - "RegionForestPhase1", - "RegionForestPhase2", + "RegionDesertPhase2", "RegionMinePhase1", "RegionMinePhase2", + "RegionForestPhase1", + "RegionForestPhase2", ] const REGION_LOOP_PHASE = [ - "RegionForestLoop", - "RegionForestLoop", - "RegionForestLoop", + "RegionDesertLoop", + "RegionDesertLoop", "RegionMineLoop", - "RegionMineLoop" + "RegionMineLoop", + "RegionForestLoop", + "RegionForestLoop", ] @onready var settings : SettingsData = GameInfo.settings_data