From 29cac5bbc084e234aacfc4d8cacb3e0f4b7d9ba3 Mon Sep 17 00:00:00 2001 From: Nilou Date: Thu, 21 Aug 2025 11:32:05 +0200 Subject: [PATCH] =?UTF-8?q?\#40=20cr=C3=A9ation=20du=20g=C3=A9n=C3=A9ral?= =?UTF-8?q?=20music?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../music/assets}/fin_de_cycle_phase_1.ogg | Bin .../assets/fin_de_cycle_phase_1.ogg.import | 19 ++++++++++++++++++ .../assets}/niveau_forestier_phase_1.ogg | Bin .../niveau_forestier_phase_1.ogg.import | 19 ++++++++++++++++++ common/music/music.tscn | 9 +++++++++ project.godot | 1 + .../music/fin_de_cycle_phase_1.ogg.import | 19 ------------------ .../music/niveau_forestier_phase_1.ogg.import | 19 ------------------ 8 files changed, 48 insertions(+), 38 deletions(-) rename {stages/terrain/planet/music => common/music/assets}/fin_de_cycle_phase_1.ogg (100%) create mode 100644 common/music/assets/fin_de_cycle_phase_1.ogg.import rename {stages/terrain/planet/music => common/music/assets}/niveau_forestier_phase_1.ogg (100%) create mode 100644 common/music/assets/niveau_forestier_phase_1.ogg.import create mode 100644 common/music/music.tscn delete mode 100644 stages/terrain/planet/music/fin_de_cycle_phase_1.ogg.import delete mode 100644 stages/terrain/planet/music/niveau_forestier_phase_1.ogg.import diff --git a/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg b/common/music/assets/fin_de_cycle_phase_1.ogg similarity index 100% rename from stages/terrain/planet/music/fin_de_cycle_phase_1.ogg rename to common/music/assets/fin_de_cycle_phase_1.ogg diff --git a/common/music/assets/fin_de_cycle_phase_1.ogg.import b/common/music/assets/fin_de_cycle_phase_1.ogg.import new file mode 100644 index 0000000..0a6a0a5 --- /dev/null +++ b/common/music/assets/fin_de_cycle_phase_1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://eoocn1djnep8" +path="res://.godot/imported/fin_de_cycle_phase_1.ogg-0301502b32d205c2f3af7024215b1396.oggvorbisstr" + +[deps] + +source_file="res://common/music/assets/fin_de_cycle_phase_1.ogg" +dest_files=["res://.godot/imported/fin_de_cycle_phase_1.ogg-0301502b32d205c2f3af7024215b1396.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/stages/terrain/planet/music/niveau_forestier_phase_1.ogg b/common/music/assets/niveau_forestier_phase_1.ogg similarity index 100% rename from stages/terrain/planet/music/niveau_forestier_phase_1.ogg rename to common/music/assets/niveau_forestier_phase_1.ogg diff --git a/common/music/assets/niveau_forestier_phase_1.ogg.import b/common/music/assets/niveau_forestier_phase_1.ogg.import new file mode 100644 index 0000000..3c93cf1 --- /dev/null +++ b/common/music/assets/niveau_forestier_phase_1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dnskjv3wty2ms" +path="res://.godot/imported/niveau_forestier_phase_1.ogg-7491c9a17746b2904cbf2752648c650d.oggvorbisstr" + +[deps] + +source_file="res://common/music/assets/niveau_forestier_phase_1.ogg" +dest_files=["res://.godot/imported/niveau_forestier_phase_1.ogg-7491c9a17746b2904cbf2752648c650d.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/music/music.tscn b/common/music/music.tscn new file mode 100644 index 0000000..dec2a80 --- /dev/null +++ b/common/music/music.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=2 format=3 uid="uid://b6hscxcrj065q"] + +[ext_resource type="AudioStream" uid="uid://dnskjv3wty2ms" path="res://common/music/assets/niveau_forestier_phase_1.ogg" id="1_hmej1"] + +[node name="Music" type="Node"] + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("1_hmej1") +autoplay = true diff --git a/project.godot b/project.godot index 23ee1e5..a5943fa 100644 --- a/project.godot +++ b/project.godot @@ -20,6 +20,7 @@ config/icon="uid://df0y0s666ui4h" [autoload] Pointer="*res://gui/pointer/pointer.tscn" +Music="*res://common/music/music.tscn" [input] diff --git a/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg.import b/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg.import deleted file mode 100644 index c848c26..0000000 --- a/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://eoocn1djnep8" -path="res://.godot/imported/fin_de_cycle_phase_1.ogg-0ff8ce8f81c800fde9f50f867d824b2b.oggvorbisstr" - -[deps] - -source_file="res://stages/terrain/planet/music/fin_de_cycle_phase_1.ogg" -dest_files=["res://.godot/imported/fin_de_cycle_phase_1.ogg-0ff8ce8f81c800fde9f50f867d824b2b.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/stages/terrain/planet/music/niveau_forestier_phase_1.ogg.import b/stages/terrain/planet/music/niveau_forestier_phase_1.ogg.import deleted file mode 100644 index e725e05..0000000 --- a/stages/terrain/planet/music/niveau_forestier_phase_1.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dnskjv3wty2ms" -path="res://.godot/imported/niveau_forestier_phase_1.ogg-dbd624eb1808fe51c6958b8897206d5f.oggvorbisstr" - -[deps] - -source_file="res://stages/terrain/planet/music/niveau_forestier_phase_1.ogg" -dest_files=["res://.godot/imported/niveau_forestier_phase_1.ogg-dbd624eb1808fe51c6958b8897206d5f.oggvorbisstr"] - -[params] - -loop=true -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4