diff --git a/common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg b/common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg new file mode 100644 index 0000000..dd8786b Binary files /dev/null and b/common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg.import b/common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg.import new file mode 100644 index 0000000..d4c5a6a --- /dev/null +++ b/common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://of68i2k1g6y2" +path="res://.godot/imported/desert_phase_1.ogg-17d99e2b557a444ca13cc8d519f1523b.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg" +dest_files=["res://.godot/imported/desert_phase_1.ogg-17d99e2b557a444ca13cc8d519f1523b.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 774b816..51ab52a 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -12,11 +12,10 @@ [ext_resource type="AudioStream" uid="uid://bmwaw1yb8hucf" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"] [ext_resource type="AudioStream" uid="uid://ccimypx71o4g6" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg" id="10_tq535"] [ext_resource type="AudioStream" uid="uid://kqbqhwhkv7o3" path="res://common/audio_manager/assets/morceaux/niveau/mines_waiting.ogg" id="11_ngi21"] +[ext_resource type="AudioStream" uid="uid://of68i2k1g6y2" path="res://common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg" id="11_yjs51"] [ext_resource type="AudioStream" uid="uid://b8inedx4yjslw" path="res://common/audio_manager/assets/sfx/drop/drop_1.wav" id="12_4hp8f"] [ext_resource type="AudioStream" uid="uid://cjbpfnlwcpjh0" path="res://common/audio_manager/assets/morceaux/niveau/forest_waiting.ogg" id="12_xmumj"] -[ext_resource type="AudioStream" uid="uid://dfrp66a4isnt6" path="res://common/audio_manager/assets/sfx/dig/dig_1.wav" id="13_nlfrr"] [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://bdxkvaciw4mb3" path="res://common/audio_manager/assets/sfx/dig/dig_2.wav" id="14_6o1yh"] [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://eh3dbuxu5qtw" path="res://common/audio_manager/assets/sfx/harvest/harvest_3.wav" id="15_ynvb4"] @@ -162,6 +161,9 @@ stream = ExtResource("5_ajci6") unique_name_in_owner = true stream = ExtResource("4_2fduo") +[node name="RegionDesertPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=2003475958] +stream = ExtResource("11_yjs51") + [node name="RegionForestLoop" type="AudioStreamPlayer" parent="Musics" unique_id=482654512] unique_name_in_owner = true stream = ExtResource("12_xmumj") diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index e7b0c34..e0c581e 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -7,10 +7,11 @@ const MAX_VOLUME = 24. const DEFAULT_FADE_TIME : float = 5.0 const REGION_FIRST_PHASE = [ + "RegionDesertPhase1", "RegionForestPhase1", "RegionForestPhase2", "RegionMinePhase1", - "RegionMinePhase2" + "RegionMinePhase2", ] const REGION_LOOP_PHASE = [