From f42123d1b2c3b6211394dafab0a0e97bda59b1db Mon Sep 17 00:00:00 2001
From: E213872U <martin.raby@etu.univ-nantes.fr>
Date: Sat, 25 Jan 2025 05:09:47 +0100
Subject: [PATCH] Les instruments font du bruit #mauvaiseIdee #stopLeSon
#adieuMesOreilles
---
default_bus_layout.tres | 2 +-
ressources/sons/melodie-bobo-1.mp3.import | 19 +++++++++++++++++++
ressources/sons/melodie-bobo-2.mp3.import | 19 +++++++++++++++++++
ressources/sons/melodie-bobo-3.mp3.import | 19 +++++++++++++++++++
ressources/sons/melodie-bobo-4.mp3.import | 19 +++++++++++++++++++
ressources/sons/melodie-bobo-5.mp3.import | 19 +++++++++++++++++++
scenes/Room.tscn | 11 ++++-------
scenes/attaques/Balle.tscn | 3 +++
scenes/attaques/Bombes.tscn | 2 +-
scenes/attaques/FusilPompe.tscn | 5 ++++-
scenes/attaques/Onde.tscn | 9 +++++++--
scenes/interface.tscn | 2 +-
scripts/Instrument/balle.gd | 12 ++++++++++++
scripts/Instrument/fusil_pompe.gd | 12 ++++++++++++
scripts/Instrument/onde.gd | 18 +++++++++++++++++-
15 files changed, 157 insertions(+), 14 deletions(-)
create mode 100644 ressources/sons/melodie-bobo-1.mp3.import
create mode 100644 ressources/sons/melodie-bobo-2.mp3.import
create mode 100644 ressources/sons/melodie-bobo-3.mp3.import
create mode 100644 ressources/sons/melodie-bobo-4.mp3.import
create mode 100644 ressources/sons/melodie-bobo-5.mp3.import
diff --git a/default_bus_layout.tres b/default_bus_layout.tres
index d7364df..bc9ce2f 100644
--- a/default_bus_layout.tres
+++ b/default_bus_layout.tres
@@ -11,5 +11,5 @@ bus/2/name = &"Sfx"
bus/2/solo = false
bus/2/mute = false
bus/2/bypass_fx = false
-bus/2/volume_db = 0.0
+bus/2/volume_db = -7.63485
bus/2/send = &"Master"
diff --git a/ressources/sons/melodie-bobo-1.mp3.import b/ressources/sons/melodie-bobo-1.mp3.import
new file mode 100644
index 0000000..819511f
--- /dev/null
+++ b/ressources/sons/melodie-bobo-1.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dfa84osa3fxcp"
+path="res://.godot/imported/melodie-bobo-1.mp3-7aa3030b2c790daa8c4313aa01ae98f9.mp3str"
+
+[deps]
+
+source_file="res://ressources/sons/melodie-bobo-1.mp3"
+dest_files=["res://.godot/imported/melodie-bobo-1.mp3-7aa3030b2c790daa8c4313aa01ae98f9.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/ressources/sons/melodie-bobo-2.mp3.import b/ressources/sons/melodie-bobo-2.mp3.import
new file mode 100644
index 0000000..e8f0d0b
--- /dev/null
+++ b/ressources/sons/melodie-bobo-2.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://8d6usnj4u2xk"
+path="res://.godot/imported/melodie-bobo-2.mp3-bb198435e05ddb0da77a07ac4cfc56ba.mp3str"
+
+[deps]
+
+source_file="res://ressources/sons/melodie-bobo-2.mp3"
+dest_files=["res://.godot/imported/melodie-bobo-2.mp3-bb198435e05ddb0da77a07ac4cfc56ba.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/ressources/sons/melodie-bobo-3.mp3.import b/ressources/sons/melodie-bobo-3.mp3.import
new file mode 100644
index 0000000..d7447a8
--- /dev/null
+++ b/ressources/sons/melodie-bobo-3.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://crv0k2mkurxx8"
+path="res://.godot/imported/melodie-bobo-3.mp3-12ce345635646780a00ff0064dda381b.mp3str"
+
+[deps]
+
+source_file="res://ressources/sons/melodie-bobo-3.mp3"
+dest_files=["res://.godot/imported/melodie-bobo-3.mp3-12ce345635646780a00ff0064dda381b.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/ressources/sons/melodie-bobo-4.mp3.import b/ressources/sons/melodie-bobo-4.mp3.import
new file mode 100644
index 0000000..bc1a950
--- /dev/null
+++ b/ressources/sons/melodie-bobo-4.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dy07kjwgmff45"
+path="res://.godot/imported/melodie-bobo-4.mp3-85d81fc35615c5448418bb695518b42e.mp3str"
+
+[deps]
+
+source_file="res://ressources/sons/melodie-bobo-4.mp3"
+dest_files=["res://.godot/imported/melodie-bobo-4.mp3-85d81fc35615c5448418bb695518b42e.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/ressources/sons/melodie-bobo-5.mp3.import b/ressources/sons/melodie-bobo-5.mp3.import
new file mode 100644
index 0000000..3663f32
--- /dev/null
+++ b/ressources/sons/melodie-bobo-5.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dlnuw5afkji7y"
+path="res://.godot/imported/melodie-bobo-5.mp3-3f367a2a630c34a5f2323ebc8535769d.mp3str"
+
+[deps]
+
+source_file="res://ressources/sons/melodie-bobo-5.mp3"
+dest_files=["res://.godot/imported/melodie-bobo-5.mp3-3f367a2a630c34a5f2323ebc8535769d.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/scenes/Room.tscn b/scenes/Room.tscn
index 03cb3e8..3cf5917 100644
--- a/scenes/Room.tscn
+++ b/scenes/Room.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=3 uid="uid://durhes43gex7a"]
+[gd_scene load_steps=15 format=3 uid="uid://durhes43gex7a"]
[ext_resource type="PackedScene" uid="uid://c7bfiw54rvaq2" path="res://scenes/player_melodie.tscn" id="1_cl1wt"]
[ext_resource type="Script" path="res://scenes/room.gd" id="1_jh83c"]
@@ -8,9 +8,8 @@
[ext_resource type="Texture2D" uid="uid://bge3nllk1bq5r" path="res://ressources/images/mur.svg" id="3_oi2tl"]
[ext_resource type="Texture2D" uid="uid://dhva3tivsvknl" path="res://ressources/images/mur_coin.svg" id="4_6a3f6"]
[ext_resource type="PackedScene" uid="uid://di4chlep1t1or" path="res://parametres/menu_parametres.tscn" id="6_6ubhx"]
-[ext_resource type="PackedScene" uid="uid://bndtclt51nsih" path="res://scenes/interface.tscn" id="8_5s7tf"]
+[ext_resource type="PackedScene" uid="uid://cnd2a1x1smulq" path="res://scenes/interface.tscn" id="8_5s7tf"]
[ext_resource type="PackedScene" uid="uid://ctgxrbcg2vu1p" path="res://scenes/ecran_mort.tscn" id="10_3ou8w"]
-[ext_resource type="PackedScene" uid="uid://cm5spgl8o4fam" path="res://scenes/enemies/robot.tscn" id="10_5qrsc"]
[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"]
normal = Vector2(0, 1)
@@ -44,8 +43,9 @@ offset_bottom = 360.0
texture = ExtResource("2_torsx")
stretch_mode = 1
-[node name="Player_Melodie" parent="." node_paths=PackedStringArray("interface") groups=["Player"] instance=ExtResource("1_cl1wt")]
+[node name="Player_Melodie" parent="." node_paths=PackedStringArray("interface") instance=ExtResource("1_cl1wt")]
scale = Vector2(3, 3)
+collision_layer = 1
interface = NodePath("../Interface")
[node name="StaticBody2D" type="StaticBody2D" parent="." groups=["World_Border"]]
@@ -159,8 +159,5 @@ offset_top = -383.0
offset_right = -258.0
offset_bottom = -383.0
-[node name="Robot" parent="." groups=["Enemies"] instance=ExtResource("10_5qrsc")]
-position = Vector2(-428, 11)
-
[connection signal="finished" from="Musique" to="." method="_on_audio_stream_player_finished"]
[connection signal="retour_menu" from="Ecran mort" to="." method="_on_ecran_mort_retour_menu"]
diff --git a/scenes/attaques/Balle.tscn b/scenes/attaques/Balle.tscn
index c40810f..f515bf8 100644
--- a/scenes/attaques/Balle.tscn
+++ b/scenes/attaques/Balle.tscn
@@ -18,4 +18,7 @@ texture = ExtResource("1_qx664")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("RectangleShape2D_1x7bj")
+[node name="effet" type="AudioStreamPlayer" parent="."]
+bus = &"Sfx"
+
[connection signal="body_entered" from="." to="." method="Collision"]
diff --git a/scenes/attaques/Bombes.tscn b/scenes/attaques/Bombes.tscn
index c9f6d55..c2ad54c 100644
--- a/scenes/attaques/Bombes.tscn
+++ b/scenes/attaques/Bombes.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://bfso5wd843777"]
+[gd_scene load_steps=4 format=3 uid="uid://cjv2wvu7p3mny"]
[ext_resource type="Script" path="res://scripts/Instrument/onde.gd" id="1_mly3m"]
[ext_resource type="Texture2D" uid="uid://cb5xpbtagu6jv" path="res://ressources/images/ronde tambour.png.png" id="2_2cju6"]
diff --git a/scenes/attaques/FusilPompe.tscn b/scenes/attaques/FusilPompe.tscn
index 56f229f..368ddfa 100644
--- a/scenes/attaques/FusilPompe.tscn
+++ b/scenes/attaques/FusilPompe.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://ctuw2lsq5wn1x"]
+[gd_scene load_steps=3 format=3 uid="uid://b18h4ypqlthf3"]
[ext_resource type="Script" path="res://scripts/Instrument/fusil_pompe.gd" id="1_bq6st"]
[ext_resource type="Texture2D" uid="uid://bv3bmi78swof6" path="res://ressources/images/griffes.svg" id="2_1lh44"]
@@ -16,4 +16,7 @@ texture = ExtResource("2_1lh44")
scale = Vector2(0.75, 0.75)
polygon = PackedVector2Array(-130, -148, -130, -146.3, -132, -145.2, -132, -135.2, -128.8, -132, -137.4, -130, -140, -130, -140, -119.2, -136.8, -116, -136, -116, -148, -113.6, -148, -103.2, -144.8, -100, -139.5, -100, -137.6, -92, -124, -92, -124, -87.2, -120.8, -84, -115.5, -84, -113.6, -76, -99.5, -76, -97.6, -68, -84, -68, -84, -63.2, -80.8, -60, -75.5, -60, -73.6, -52, -60, -52, -60, -47.2, -56.8, -44, -51.5, -44, -49.6, -36, -36, -36, -36, -31.2, -32.8, -28, -28, -28, -28, -23.2, -24.8, -20, -20, -20, -20, -15.2, -16.8, -12, -12, -12, -12, -7.2, -8.8, -4, -4, -4, -4, 0.799988, -0.800003, 4, 4, 4, 4, 8.79999, 7.20001, 12, 12, 12, 12, 16.8, 15.2, 20, 20.5, 20, 22.4, 28, 28.2, 28, 30.2, 44, 44, 44, 44, 56.8, 47.2, 60, 52, 60, 52, 64.8, 55.2, 68, 60.5, 68, 62.4, 76, 68, 76, 68, 88.8, 71.2, 92, 76, 92, 76, 105.6, 84, 107.5, 84, 120.8, 87.2, 124, 92.5, 124, 94.4, 132, 100, 132, 100, 144.8, 103.2, 148, 108, 148, 108, 160.8, 111.2, 164, 116, 164, 116, 177.6, 124, 179.5, 124, 192.8, 127.2, 196, 132.5, 196, 134.4, 204, 144.8, 204, 148, 200.8, 148, 190.4, 140, 188.4, 140, 180, 142.4, 188, 152.8, 188, 156, 184.8, 156, 174.4, 148, 172.4, 148, 164, 150, 169, 150, 172.5, 161.4, 170, 164, 170, 164, 158.4, 156, 156.4, 156, 142.4, 148, 140.4, 148, 126.4, 140, 124.4, 140, 110.4, 132, 108.4, 132, 95.2, 128.8, 92, 123.5, 92, 121.6, 84, 116, 84, 116, 71.2, 112.8, 68, 108, 68, 108, 54.4, 100, 52.4, 100, 39.2, 96.8, 36, 92, 36, 92, 31.2, 88.8, 28, 83.5, 28, 82, 23, 82, 20, 76, 20, 76, 7.20001, 72.8, 4, 68, 4, 68, -0.800003, 64.8, -4, 60, -4, 60, -8.8, 56.8, -12, 52, -12, 52, -16.8, 48.8, -20, 44, -20, 44, -24.8, 40.8, -28, 36, -28, 36, -32.8, 32.8, -36, 28, -36, 28, -40.8, 24.8, -44, 20, -44, 20, -48.8, 16.8, -52, 12, -52, 12, -56.8, 8.79999, -60, 4, -60, 4, -64.8, 0.799988, -68, -4, -68, -4, -72.8, -7.2, -76, -12.5, -76, -14.4, -84, -28, -84, -28, -88.8, -31.2, -92, -36.5, -92, -38.4, -100, -52.5, -100, -54.4, -108, -60.2, -108, -62, -129.2, -62, -132.5, -73.4, -130, -76, -130, -76, -116, -78, -121, -78, -124, -92, -124, -92, -128.8, -95.2, -132, -100.5, -132, -102, -137, -102, -140, -116.5, -140, -118, -145, -118, -148)
+[node name="effet" type="AudioStreamPlayer" parent="."]
+bus = &"Sfx"
+
[connection signal="body_entered" from="." to="." method="Collision"]
diff --git a/scenes/attaques/Onde.tscn b/scenes/attaques/Onde.tscn
index 9eb3b19..bfd27e5 100644
--- a/scenes/attaques/Onde.tscn
+++ b/scenes/attaques/Onde.tscn
@@ -1,12 +1,13 @@
-[gd_scene load_steps=4 format=3 uid="uid://bcypcnpu0608o"]
+[gd_scene load_steps=5 format=3 uid="uid://bcypcnpu0608o"]
[ext_resource type="Script" path="res://scripts/Instrument/onde.gd" id="1_6377h"]
[ext_resource type="Texture2D" uid="uid://cb5xpbtagu6jv" path="res://ressources/images/ronde tambour.png.png" id="1_oawub"]
+[ext_resource type="AudioStream" uid="uid://dsgqlnwdavr31" path="res://ressources/sons/tambour-1.mp3" id="3_hup36"]
[sub_resource type="CircleShape2D" id="CircleShape2D_r81ru"]
radius = 125.575
-[node name="Onde" type="CharacterBody2D"]
+[node name="Onde" type="Area2D"]
collision_layer = 2
collision_mask = 2
script = ExtResource("1_6377h")
@@ -17,3 +18,7 @@ texture = ExtResource("1_oawub")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_r81ru")
+
+[node name="effet" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("3_hup36")
+bus = &"Sfx"
diff --git a/scenes/interface.tscn b/scenes/interface.tscn
index a9c4da6..d24e6ae 100644
--- a/scenes/interface.tscn
+++ b/scenes/interface.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://bndtclt51nsih"]
+[gd_scene load_steps=4 format=3 uid="uid://cnd2a1x1smulq"]
[ext_resource type="Script" path="res://scenes/interface.gd" id="1_5p24o"]
[ext_resource type="Texture2D" uid="uid://jyrl33rv1fnp" path="res://ressources/images/full_heart.svg" id="2_opn3r"]
diff --git a/scripts/Instrument/balle.gd b/scripts/Instrument/balle.gd
index 6209e30..0b6e775 100644
--- a/scripts/Instrument/balle.gd
+++ b/scripts/Instrument/balle.gd
@@ -1,6 +1,18 @@
extends Area2D
@export var speed: float = 300 # Définir la vitesse de la balle
+@onready var audio = $effet
+var sound_list = [
+ preload("res://ressources/sons/flute-1.mp3"),
+ preload("res://ressources/sons/flute-2.mp3"),
+ preload("res://ressources/sons/flute-3.mp3"),
+ preload("res://ressources/sons/flute-4.mp3"),
+]
+
+func _ready() :
+ var index = randi() % 3
+ audio.stream = sound_list[index]
+ audio.play()
# Direction initiale du mouvement
var initial_direction: Vector2 = Vector2(1, 0) # Exemple par défaut : vers la droite
diff --git a/scripts/Instrument/fusil_pompe.gd b/scripts/Instrument/fusil_pompe.gd
index c5d9f06..aae7f49 100644
--- a/scripts/Instrument/fusil_pompe.gd
+++ b/scripts/Instrument/fusil_pompe.gd
@@ -3,6 +3,18 @@ extends Area2D
var timer = 0.0
var cooldown = 0.3
+@onready var audio = $effet
+var sound_list = [
+ preload("res://ressources/sons/lyre-1.mp3"),
+ preload("res://ressources/sons/lyre-2.mp3"),
+ preload("res://ressources/sons/lyre-3.mp3"),
+]
+
+func _ready() :
+ var index = randi() % 3
+ audio.stream = sound_list[index]
+ audio.play()
+
func _process(delta: float) -> void:
timer += delta
if timer >= cooldown:
diff --git a/scripts/Instrument/onde.gd b/scripts/Instrument/onde.gd
index 78b8915..07d1702 100644
--- a/scripts/Instrument/onde.gd
+++ b/scripts/Instrument/onde.gd
@@ -1,5 +1,21 @@
extends Area2D
+var audio : AudioStreamPlayer
+var sound_list = [
+ preload("res://ressources/sons/tambour-1.mp3"),
+ preload("res://ressources/sons/tambour-2.mp3"),
+ preload("res://ressources/sons/tambour-3.mp3"),
+]
+
+
+func _ready() :
+ var index = randi_range(0, 2)
+ print(sound_list[index])
+ var audiostream = AudioStreamPlayer.new()
+ audiostream.stream = sound_list[index]
+ get_tree().current_scene.add_child(audiostream)
+ audiostream.play()
+
var timer = 0.0
var cooldown = 0.33
@@ -11,4 +27,4 @@ func _process(delta: float) -> void:
func Collision(body: Node2D) -> void:
if body.is_in_group("Enemies") :
- body.take_damage(2)
+ body.take_damage(3)