[EDIT] implemented trail sounds

This commit is contained in:
baldas_h 2020-04-05 17:58:06 +02:00
parent 208f73d46a
commit 3dcac2f890
6 changed files with 28 additions and 5 deletions

View File

@ -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://Assets/BigPlaceholder.png" type="Texture" id=1]
[ext_resource path="res://Scripts/FastTrail.gd" type="Script" id=2] [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] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 88.8117, 26.2111 ) extents = Vector2( 88.8117, 26.2111 )
@ -20,3 +21,6 @@ offset = Vector2( 88, 0 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/Area2D"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/Area2D"]
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 3 )

View File

@ -310,5 +310,5 @@ scale = Vector2( 1.1136, 1.2906 )
z_index = -1 z_index = -1
texture = ExtResource( 5 ) texture = ExtResource( 5 )
[node name="PickupPlayer" type="AudioStreamPlayer" parent="."] [node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 4 ) stream = ExtResource( 4 )

View File

@ -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://Assets/BigPlaceholder.png" type="Texture" id=1]
[ext_resource path="res://Scripts/SlowTrail.gd" type="Script" id=2] [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] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 88.8117, 26.2111 ) extents = Vector2( 88.8117, 26.2111 )
@ -19,3 +20,6 @@ offset = Vector2( 88, 0 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/Area2D"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/Area2D"]
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 3 )

View File

@ -1,5 +1,7 @@
extends Node extends Node
onready var audioPlayer = $AudioPlayer
var fastFactor var fastFactor
var lifetime = 5 var lifetime = 5
var elapsed = 0 var elapsed = 0
@ -7,6 +9,7 @@ var sprite
func slow_player(victim): func slow_player(victim):
if victim.is_in_group("Player"): if victim.is_in_group("Player"):
audioPlayer.play()
victim.MAX_SPEED *= fastFactor victim.MAX_SPEED *= fastFactor
victim.ACCELERATION *= fastFactor victim.ACCELERATION *= fastFactor

View File

@ -48,12 +48,14 @@ var inputs = ["ui_up", "ui_right", "ui_down", "ui_left"]
onready var animationPlayer = $AnimationPlayer onready var animationPlayer = $AnimationPlayer
onready var animationTree = $AnimationTree onready var animationTree = $AnimationTree
onready var animationState = animationTree.get("parameters/playback") onready var animationState = animationTree.get("parameters/playback")
onready var pickupPlayer = $PickupPlayer onready var audioPlayer = $AudioPlayer
onready var sprite = $Sprite onready var sprite = $Sprite
onready var coll = $CollisionShape2D onready var coll = $CollisionShape2D
onready var conf = $ConfusionStars onready var conf = $ConfusionStars
onready var pati = $Patins onready var pati = $Patins
var streams = []
var healthBar = null var healthBar = null
func _ready(): func _ready():
@ -67,8 +69,12 @@ func _ready():
elif self.name == "Player2": elif self.name == "Player2":
healthBar = get_tree().get_nodes_in_group("healthbar")[1] healthBar = get_tree().get_nodes_in_group("healthbar")[1]
healthBar.maxHealthUpdated(MAX_LIFE) healthBar.maxHealthUpdated(MAX_LIFE)
streams.append(load("res://Sounds/PaintJamPickupSound.wav"))
streams.append(load("res://Sounds/PaintJamPaintAction.wav"))
func launch_slow(): func launch_slow():
audioPlayer.stream = streams[1]
audioPlayer.play()
if slow_cooldown_elapsed < slow_cooldown: if slow_cooldown_elapsed < slow_cooldown:
return return
slow_cooldown_elapsed = 0 slow_cooldown_elapsed = 0
@ -87,6 +93,8 @@ func launch_slow():
world.add_child(inst) world.add_child(inst)
func launch_fast(): func launch_fast():
audioPlayer.stream = streams[1]
audioPlayer.play()
if fast_cooldown_elapsed < fast_cooldown: if fast_cooldown_elapsed < fast_cooldown:
return return
fast_cooldown_elapsed = 0 fast_cooldown_elapsed = 0
@ -214,6 +222,7 @@ func updatePaintEffects(delta):
coroutines = updated + [] coroutines = updated + []
func addCoroutine(routine): func addCoroutine(routine):
pickupPlayer.play() audioPlayer.stream = streams[0]
audioPlayer.play()
curLife = MAX_LIFE if (curLife + PICKUP_BONUS > MAX_LIFE) else curLife + PICKUP_BONUS curLife = MAX_LIFE if (curLife + PICKUP_BONUS > MAX_LIFE) else curLife + PICKUP_BONUS
coroutines.append(routine) coroutines.append(routine)

View File

@ -1,5 +1,7 @@
extends Node extends Node
onready var audioPlayer = $AudioPlayer
var slowFactor var slowFactor
var lifetime = 5 var lifetime = 5
var elapsed = 0 var elapsed = 0
@ -7,6 +9,7 @@ var sprite
func slow_player(victim): func slow_player(victim):
if victim.is_in_group("Player"): if victim.is_in_group("Player"):
audioPlayer.play()
victim.MAX_SPEED /= slowFactor victim.MAX_SPEED /= slowFactor
func unslow_player(victim): func unslow_player(victim):