Add sound effects for apple, heart and bullets

Scenes/Events/apple.gd

@@ -2,7 +2,17 @@ extends Area2D
 
 export(int) var amount = 100
 
+onready var sound = get_node("Sound")
+onready var sprite = get_node("Sprite")
+
+func _ready():
+	sound.connect("finished",self,"queue_free")
+
 func _on_Area2D_body_enter( body ):
 	if(body.is_in_group("player")):
 		body.add_milk(amount)
-		queue_free()
+		sound.play()
+		sprite.set_opacity(0)
+		
+		
+		

Scenes/Events/apple.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=4 format=1]
+[gd_scene load_steps=5 format=1]
 
 [ext_resource path="res://Scenes/Events/apple.gd" type="Script" id=1]
 [ext_resource path="res://Sprites/Charasets/manzana.png" type="Texture" id=2]
+[ext_resource path="res://Sound/apple_sound.ogg" type="AudioStream" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 
@@ -23,7 +24,7 @@ collision/layers = 16
 script/script = ExtResource( 1 )
 amount = 100
 
-[node name="Apple" type="Sprite" parent="."]
+[node name="Sprite" type="Sprite" parent="."]
 
 transform/scale = Vector2( 2, 2 )
 texture = ExtResource( 2 )
@@ -36,6 +37,17 @@ shape = SubResource( 1 )
 trigger = false
 _update_shape_index = 0
 
+[node name="Sound" type="StreamPlayer" parent="."]
+
+stream/stream = ExtResource( 3 )
+stream/play = false
+stream/loop = false
+stream/volume_db = 3.75
+stream/autoplay = false
+stream/paused = false
+stream/loop_restart_time = 0.0
+stream/buffering_ms = 500
+
 [connection signal="body_enter" from="." to="." method="_on_Area2D_body_enter"]
 
 

Scenes/Events/enemy_1.gd

@@ -25,8 +25,8 @@ func reverse_direction():
 func _ready():
 	if (!dir_left):
 		reverse_direction()
-	set_fixed_process(true)
-	#set_process(true)
+	#set_fixed_process(true)
+	set_process(true)
 
 func dissapear():
 	sprite.set_opacity(0)
@@ -91,7 +91,7 @@ func change_velocity(amount, right):
 		v.x += ((dir_left * -1) + (!dir_left * 1)) * amount
 	
 
-func _fixed_process(delta):
+func _process(delta):
 	var motion = v * delta
 	motion = move(motion)
 	v.y += delta * GRAVITY

Scenes/Events/heart.gd

@@ -2,8 +2,15 @@ extends Area2D
 
 export(int) var lifes = 1
 
+onready var sound = get_node("Sound")
+onready var sprite = get_node("Sprite")
+
+func _ready():
+	sound.connect("finished",self,"queue_free")
+
 func _on_Area2D_body_enter( body ):
 	if(body.is_in_group("player")):
 		if (body.can_add_life()):
+			sprite.set_opacity(0)
 			body.add_life()
-			queue_free()
+			sound.play()

Scenes/Events/heart.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=4 format=1]
+[gd_scene load_steps=5 format=1]
 
 [ext_resource path="res://Scenes/Events/heart.gd" type="Script" id=1]
 [ext_resource path="res://Sprites/GUI/HUD/heart_full.png" type="Texture" id=2]
+[ext_resource path="res://Sound/heart_sound.ogg" type="AudioStream" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 
@@ -23,7 +24,7 @@ collision/layers = 16
 script/script = ExtResource( 1 )
 lifes = 1
 
-[node name="Heart" type="Sprite" parent="."]
+[node name="Sprite" type="Sprite" parent="."]
 
 transform/pos = Vector2( -2.02597, 7.01037 )
 transform/scale = Vector2( 1.02304, 0.941319 )
@@ -37,6 +38,17 @@ shape = SubResource( 1 )
 trigger = false
 _update_shape_index = 0
 
+[node name="Sound" type="StreamPlayer" parent="."]
+
+stream/stream = ExtResource( 3 )
+stream/play = false
+stream/loop = false
+stream/volume_db = 7.0
+stream/autoplay = false
+stream/paused = false
+stream/loop_restart_time = 0.0
+stream/buffering_ms = 500
+
 [connection signal="body_enter" from="." to="." method="_on_Area2D_body_enter"]
 
 

Scenes/Events/milk_bullet.gd

@@ -4,6 +4,7 @@ export var LIFE_TIME = 3
 
 onready var trail = get_node("Trail")
 onready var splash = get_node("Splash")
+onready var sound = get_node("Sound")
 
 var t = Timer.new()
 var end = false
@@ -22,6 +23,8 @@ func destroy():
 	queue_free()
 
 func _ready():
+	sound.set_default_pitch_scale(rand_range(1,1.2))
+	sound.play("bullet_sound")
 	t.set_wait_time(LIFE_TIME)
 	t.set_one_shot(true)
 	self.add_child(t)

Scenes/Events/milk_bullet.tscn

@@ -1,15 +1,24 @@
-[gd_scene load_steps=5 format=1]
+[gd_scene load_steps=7 format=1]
 
 [ext_resource path="res://Scenes/Events/milk_bullet.gd" type="Script" id=1]
 [ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=2]
 [ext_resource path="res://Scenes/Events/milk_splash.tscn" type="PackedScene" id=3]
-
+[ext_resource path="res://Sound/bullet_sound.wav" type="Sample" id=4]
 
 [sub_resource type="CircleShape2D" id=1]
 
 custom_solver_bias = 0.0
 radius = 9.52631
 
+[sub_resource type="SampleLibrary" id=2]
+
+samples/bullet_sound = {
+"db": 0.0,
+"pitch": 1.0,
+"priority": 0,
+"sample": ExtResource( 4 )
+}
+
 [node name="RigidBody2D" type="RigidBody2D" groups=[
 "bullet",
 ]]
@@ -71,6 +80,23 @@ params/anim_initial_pos = 0.0
 
 [node name="Splash" parent="." instance=ExtResource( 3 )]
 
+[node name="Sound" type="SamplePlayer" parent="."]
+
+config/polyphony = 1
+config/samples = SubResource( 2 )
+default/volume_db = 5.0
+default/pitch_scale = 1.0
+default/pan = 0.0
+default/depth = 0.0
+default/height = 0.0
+default/filter/type = 0
+default/filter/cutoff = 5000.0
+default/filter/resonance = 1.0
+default/filter/gain = 1.0
+default/reverb_room = 2
+default/reverb_send = 0.0
+default/chorus_send = 0.0
+
 [connection signal="body_enter" from="." to="." method="_on_RigidBody2D_body_enter"]
 
 

Scenes/Events/milk_ray.gd

@@ -4,6 +4,8 @@ onready var middle = get_node("middle")
 onready var end = get_node("end")
 onready var origin = get_node("origin")
 
+onready var sound = get_node("sound")
+
 var player
 
 export var damage = 50
@@ -29,12 +31,13 @@ func look_right():
 	middle.set_region_rect(Rect2(Vector2(0,0),Vector2(0,0)))
 	middle.set_rot(0)
 	
-func enable():
+func enable():	
 	force_raycast_update()
 	end.set_emitting(true)
 	end.get_node("Area2D").enable()
 	origin.set_emitting(true)
 	middle.set_opacity(1)
+	sound.play()
 	set_process(true)
 	
 func disable():
@@ -42,6 +45,7 @@ func disable():
 	end.set_emitting(false)
 	end.get_node("Area2D").disable()
 	middle.set_opacity(0)
+	sound.stop()
 	set_process(false)
 	
 func _process(delta):

Scenes/Events/player.gd

@@ -51,7 +51,6 @@ onready var life = max_life
 
 export(int) var invulneravility_time = 16
 
-
 func is_falling ():
 	return velocity.y > 0
 

Scenes/Events/player.tscn

@@ -6,15 +6,15 @@
 [ext_resource path="res://Sprites/Charasets/cow.png" type="Texture" id=4]
 [ext_resource path="res://Scenes/Events/player_animations.tres" type="Animation" id=5]
 
-[sub_resource type="ConvexPolygonShape2D" id=1]
+[sub_resource type="ConvexPolygonShape2D" id=4]
 
 custom_solver_bias = 0.0
 points = Vector2Array( -13.2061, 7.63341, -13.1494, -10.328, 11.2943, -10.3627, 11.4077, 7.42536, 1.19923, 13.0773, -3.50803, 13.0773 )
 
-[sub_resource type="RectangleShape2D" id=2]
+[sub_resource type="ConvexPolygonShape2D" id=5]
 
 custom_solver_bias = 0.0
-extents = Vector2( 9.93203, 15.2052 )
+points = Vector2Array( -2.43698, 6.86286, -10.0513, 0.602652, -10.0513, -10.186, 9.7198, -10, 9.7198, 0.41664, 1.64128, 6.92704 )
 
 [sub_resource type="Animation" id=3]
 
@@ -40,11 +40,11 @@ tracks/0/keys = {
 transform/scale = Vector2( 2, 2 )
 z/relative = false
 input/pickable = true
-shapes/0/shape = SubResource( 1 )
+shapes/0/shape = SubResource( 4 )
 shapes/0/transform = Matrix32( 1.89755, 0, 0, 3.10364, 2.93931, -4.91934 )
 shapes/0/trigger = false
-shapes/1/shape = SubResource( 2 )
-shapes/1/transform = Matrix32( 2.31574, 0, 0, 1.23398, 1.5, 17 )
+shapes/1/shape = SubResource( 5 )
+shapes/1/transform = Matrix32( 2.35192, 0, 0, 2.68801, 1.63985, 16.8801 )
 shapes/1/trigger = true
 collision/layers = 1057
 collision/mask = 2066
@@ -61,7 +61,6 @@ invulneravility_time = 8
 
 [node name="shooter" type="Node2D" parent="."]
 
-editor/display_folded = true
 transform/pos = Vector2( 25.3282, 2.0993 )
 transform/scale = Vector2( 0.5, 0.5 )
 script/script = ExtResource( 2 )
@@ -81,13 +80,14 @@ polygon = Vector2Array( -3.50803, 13.0773, 1.19923, 13.0773, 11.4077, 7.42536, 1
 shape_range = Vector2( 0, 0 )
 trigger = false
 
-[node name="Collision_Agachado" type="CollisionShape2D" parent="."]
+[node name="Collision_Agachado" type="CollisionPolygon2D" parent="."]
 
-transform/pos = Vector2( 1.5, 17 )
-transform/scale = Vector2( 2.31574, 1.23398 )
-shape = SubResource( 2 )
+transform/pos = Vector2( 1.63985, 16.8801 )
+transform/scale = Vector2( 2.35192, 2.68801 )
+build_mode = 0
+polygon = Vector2Array( -2.43698, 6.86286, -10.0513, 0.602652, -10.0513, -10.186, 9.7198, -10, 9.7198, 0.41664, 1.64128, 6.92704 )
+shape_range = Vector2( 1, 1 )
 trigger = true
-_update_shape_index = 1
 
 [node name="foots" type="Node2D" parent="."]
 

Scenes/Events/ray_milk.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=1]
+[gd_scene load_steps=7 format=1]
 
 [ext_resource path="res://Scenes/Events/milk_ray.gd" type="Script" id=1]
 [ext_resource path="res://Scenes/Events/milk_splash.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Scenes/Events/ray_milk_end.tres.gd" type="Script" id=3]
 [ext_resource path="res://Sprites/Effects/milk_ray.png" type="Texture" id=4]
+[ext_resource path="res://Sound/milk_ray_sound.ogg" type="AudioStream" id=5]
 
 [sub_resource type="RectangleShape2D" id=1]
 
@@ -21,6 +22,7 @@ damage = 50
 
 [node name="end" parent="." instance=ExtResource( 2 )]
 
+editor/display_folded = true
 transform/pos = Vector2( 0, -1 )
 transform/scale = Vector2( 0.5, 0.5 )
 z/z = 1
@@ -74,6 +76,17 @@ offset = Vector2( 0, -14.5 )
 region = true
 region_rect = Rect2( -1, 0, 0, 29 )
 
+[node name="sound" type="StreamPlayer" parent="."]
+
+stream/stream = ExtResource( 5 )
+stream/play = false
+stream/loop = true
+stream/volume_db = 10.0
+stream/autoplay = false
+stream/paused = false
+stream/loop_restart_time = 0.0
+stream/buffering_ms = 500
+
 [connection signal="body_enter" from="end/Area2D" to="end/Area2D" method="_on_Area2D_body_enter"]
 
 [connection signal="body_exit" from="end/Area2D" to="end/Area2D" method="_on_Area2D_body_exit"]

Scenes/Events/shooter.gd

@@ -3,6 +3,8 @@ extends Node2D
 const BULLET = preload("res://Scenes/Events/milk_bullet.tscn")
 export var SHOOT_CADENCE = 0.001
 
+var shooting = false
+
 signal change_milk_bottle
 
 enum WEAPONS {
@@ -30,6 +32,7 @@ func _input(ev):
 		set_process(true)
 	elif (ev.is_action_released("ui_shoot")):
 		instanced_ray.disable()
+		shooting = false
 		set_process(false)
 		
 	# CHANGE WEAPON
@@ -69,10 +72,12 @@ func _process(delta):
 	if (check_can_shoot()):
 		if (weapon == WEAPONS.regular and !recharge):
 			shoot_regular()
-		elif (weapon == WEAPONS.laser):
+		elif (weapon == WEAPONS.laser and !shooting):
 			instanced_ray.enable()
 			shoot_laser()
-	else:		
+			shooting = true
+	else:
+		shooting = false
 		instanced_ray.disable()
 		set_process(false)