From 3dcac2f890ba8788f71527b70e9f809a5e7fdbae Mon Sep 17 00:00:00 2001
From: baldas_h <hugo.baldassin@epitech.eu>
Date: Sun, 5 Apr 2020 17:58:06 +0200
Subject: [PATCH] [EDIT] implemented trail sounds

---
 Scene/FastTrail.tscn |  6 +++++-
 Scene/Player.tscn    |  2 +-
 Scene/SlowTrail.tscn |  6 +++++-
 Scripts/FastTrail.gd |  3 +++
 Scripts/Player.gd    | 13 +++++++++++--
 Scripts/SlowTrail.gd |  3 +++
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Scene/FastTrail.tscn b/Scene/FastTrail.tscn
index 45c7a28..52d9da1 100644
--- a/Scene/FastTrail.tscn
+++ b/Scene/FastTrail.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://Assets/BigPlaceholder.png" type="Texture" id=1]
 [ext_resource path="res://Scripts/FastTrail.gd" type="Script" id=2]
+[ext_resource path="res://Sounds/PaintJamSpeedUp.wav" type="AudioStream" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 88.8117, 26.2111 )
@@ -20,3 +21,6 @@ offset = Vector2( 88, 0 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/Area2D"]
 shape = SubResource( 1 )
+
+[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 3 )
diff --git a/Scene/Player.tscn b/Scene/Player.tscn
index aa1432f..a660daa 100644
--- a/Scene/Player.tscn
+++ b/Scene/Player.tscn
@@ -310,5 +310,5 @@ scale = Vector2( 1.1136, 1.2906 )
 z_index = -1
 texture = ExtResource( 5 )
 
-[node name="PickupPlayer" type="AudioStreamPlayer" parent="."]
+[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 4 )
diff --git a/Scene/SlowTrail.tscn b/Scene/SlowTrail.tscn
index 12d1853..14939b3 100644
--- a/Scene/SlowTrail.tscn
+++ b/Scene/SlowTrail.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://Assets/BigPlaceholder.png" type="Texture" id=1]
 [ext_resource path="res://Scripts/SlowTrail.gd" type="Script" id=2]
+[ext_resource path="res://Sounds/PaintJamSlowDown.wav" type="AudioStream" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 88.8117, 26.2111 )
@@ -19,3 +20,6 @@ offset = Vector2( 88, 0 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/Area2D"]
 shape = SubResource( 1 )
+
+[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 3 )
diff --git a/Scripts/FastTrail.gd b/Scripts/FastTrail.gd
index 7076b6b..3fc98ba 100644
--- a/Scripts/FastTrail.gd
+++ b/Scripts/FastTrail.gd
@@ -1,5 +1,7 @@
 extends Node
 
+onready var audioPlayer = $AudioPlayer
+
 var fastFactor
 var lifetime = 5
 var elapsed = 0
@@ -7,6 +9,7 @@ var sprite
 
 func slow_player(victim):
 	if victim.is_in_group("Player"):
+		audioPlayer.play()
 		victim.MAX_SPEED *= fastFactor
 		victim.ACCELERATION *= fastFactor
 	
diff --git a/Scripts/Player.gd b/Scripts/Player.gd
index 488d68b..4e04e5a 100644
--- a/Scripts/Player.gd
+++ b/Scripts/Player.gd
@@ -48,12 +48,14 @@ var inputs = ["ui_up", "ui_right", "ui_down", "ui_left"]
 onready var animationPlayer = $AnimationPlayer
 onready var animationTree = $AnimationTree
 onready var animationState = animationTree.get("parameters/playback")
-onready var pickupPlayer = $PickupPlayer
+onready var audioPlayer = $AudioPlayer
 onready var sprite = $Sprite
 onready var coll = $CollisionShape2D
 onready var conf = $ConfusionStars
 onready var pati = $Patins
 
+var streams = []
+
 var healthBar = null
 
 func _ready():
@@ -67,8 +69,12 @@ func _ready():
 	elif self.name == "Player2":
 		healthBar = get_tree().get_nodes_in_group("healthbar")[1]
 	healthBar.maxHealthUpdated(MAX_LIFE)
+	streams.append(load("res://Sounds/PaintJamPickupSound.wav"))
+	streams.append(load("res://Sounds/PaintJamPaintAction.wav"))
 
 func launch_slow():
+	audioPlayer.stream = streams[1]
+	audioPlayer.play()
 	if slow_cooldown_elapsed < slow_cooldown:
 		return
 	slow_cooldown_elapsed = 0
@@ -87,6 +93,8 @@ func launch_slow():
 	world.add_child(inst)
 	
 func launch_fast():
+	audioPlayer.stream = streams[1]
+	audioPlayer.play()
 	if fast_cooldown_elapsed < fast_cooldown:
 		return
 	fast_cooldown_elapsed = 0
@@ -214,6 +222,7 @@ func updatePaintEffects(delta):
 	coroutines = updated + []
 
 func addCoroutine(routine):
-	pickupPlayer.play()
+	audioPlayer.stream = streams[0]
+	audioPlayer.play()
 	curLife = MAX_LIFE if (curLife + PICKUP_BONUS > MAX_LIFE) else curLife + PICKUP_BONUS
 	coroutines.append(routine)
diff --git a/Scripts/SlowTrail.gd b/Scripts/SlowTrail.gd
index 6e1f699..24084b9 100644
--- a/Scripts/SlowTrail.gd
+++ b/Scripts/SlowTrail.gd
@@ -1,5 +1,7 @@
 extends Node
 
+onready var audioPlayer = $AudioPlayer
+
 var slowFactor
 var lifetime = 5
 var elapsed = 0
@@ -7,6 +9,7 @@ var sprite
 
 func slow_player(victim):
 	if victim.is_in_group("Player"):
+		audioPlayer.play()
 		victim.MAX_SPEED /= slowFactor
 	
 func unslow_player(victim):