Add cages and jump sound

Scenes/Events/UFO.tscn

@@ -211,6 +211,7 @@ color/color = Color( 0.333827, 0.355469, 0.209671, 1 )
 
 editor/display_folded = true
 transform/pos = Vector2( 0, -4.66871 )
+z/z = 3
 texture = ExtResource( 4 )
 
 [node name="Smoke" type="Node2D" parent="Sprite_UFO"]

Scenes/Events/apple.gd

@@ -8,7 +8,7 @@ onready var sprite = get_node("Sprite")
 func _ready():
 	sound.connect("finished",self,"queue_free")
 
-func _on_Area2D_body_enter( body ):
+func _on_Apple_body_enter( body ):
 	if(body.is_in_group("player")):
 		body.add_milk(amount)
 		disconnect("body_enter",self,"_on_Area2D_body_enter")
@@ -16,4 +16,4 @@ func _on_Area2D_body_enter( body ):
 		sprite.set_opacity(0)
 		
 		
-		
+

Scenes/Events/apple.tscn

@@ -16,10 +16,9 @@ shapes/0/shape = SubResource( 1 )
 shapes/0/transform = Matrix32( 2.49193, 0, 0, 2.79981, -2.22558, 5.41232 )
 shapes/0/trigger = false
 gravity_vec = Vector2( 0, 1 )
-gravity = 0.0
+gravity = 98.0
 linear_damp = 0.1
 angular_damp = 1.0
-monitorable = false
 collision/layers = 16
 script/script = ExtResource( 1 )
 amount = 100
@@ -48,6 +47,6 @@ stream/paused = false
 stream/loop_restart_time = 0.0
 stream/buffering_ms = 500
 
-[connection signal="body_enter" from="." to="." method="_on_Area2D_body_enter"]
+[connection signal="body_enter" from="." to="." method="_on_Apple_body_enter"]
 
 

Scenes/Events/cowbell_bonus.tscn

@@ -6,9 +6,6 @@
 
 script/source = "extends RichTextLabel
 
-func _ready(number):
-	set_text(str(\"+\", number))
-
 func _on_AnimationPlayer_finished():
 	queue_free()	
 "
@@ -51,7 +48,7 @@ margin/right = 202.0
 margin/bottom = 228.0
 custom_fonts/normal_font = ExtResource( 1 )
 bbcode/enabled = true
-bbcode/bbcode = "+15"
+bbcode/bbcode = ""
 visible_characters = -1
 percent_visible = 1.0
 script/script = SubResource( 1 )

Scenes/Events/cowbell_collector.gd

@@ -10,13 +10,26 @@ const SAMPLE_LIBRARY = preload("res://Scenes/Events/cowbell_sample_library.tres"
 export(float) var pitch_increment = 0.05
 export(float) var base_pitch = 1.5
 
+export(int) var bonus_threshold = 20
+export(int) var bonus_cowbells = 15
+
 var pitch = base_pitch
+var acumulator = 0;
+var multiplier = 1
 
 func timer_timeout():
 	pitch = base_pitch
+	acumulator = 0
+	multiplier = 1
 
 func play_sound():
 	pitch += pitch_increment
+	acumulator += pitch_increment
+		
+	if (acumulator >= (pitch_increment * bonus_threshold)):		
+		get_tree().get_nodes_in_group("player")[0].add_bonus(bonus_cowbells * multiplier)
+		acumulator = 0
+		multiplier += 1
 	
 	var sample_player = SamplePlayer.new()
 	sample_player.set_sample_library(SAMPLE_LIBRARY)

Scenes/Events/enemy_1.tscn

@@ -63,8 +63,8 @@ offsets = FloatArray( 0, 1 )
 colors = ColorArray( 0.773438, 0.773438, 0.773438, 1, 0.1875, 0.1875, 0.1875, 1 )
 
 [node name="KinematicBody2D 2" type="KinematicBody2D" groups=[
-"enemy_1",
 "enemy",
+"enemy_1",
 ]]
 
 transform/pos = Vector2( 64.3, -80 )

Scenes/Events/jail.tscn

@@ -0,0 +1,229 @@
+[gd_scene load_steps=27 format=1]
+
+[ext_resource path="res://Sprites/Charasets/jail.png" type="Texture" id=1]
+[ext_resource path="res://Sound/apple_sound.ogg" type="AudioStream" id=2]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0000.png" type="Texture" id=3]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0001.png" type="Texture" id=4]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0002.png" type="Texture" id=5]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0003.png" type="Texture" id=6]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0004.png" type="Texture" id=7]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0005.png" type="Texture" id=8]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0006.png" type="Texture" id=9]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0007.png" type="Texture" id=10]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0008.png" type="Texture" id=11]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0009.png" type="Texture" id=12]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0010.png" type="Texture" id=13]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0011.png" type="Texture" id=14]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0012.png" type="Texture" id=15]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0013.png" type="Texture" id=16]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0014.png" type="Texture" id=17]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0015.png" type="Texture" id=18]
+[ext_resource path="res://Sprites/Charasets/chickens/chickens0016.png" type="Texture" id=19]
+[ext_resource path="res://Sprites/Effects/jail_particles.png" type="Texture" id=20]
+[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=21]
+[ext_resource path="res://Sound/cage_explosion.ogg" type="AudioStream" id=22]
+
+[sub_resource type="RectangleShape2D" id=1]
+
+custom_solver_bias = 0.0
+extents = Vector2( 16.0518, 11.0722 )
+
+[sub_resource type="GDScript" id=3]
+
+script/source = "extends StaticBody2D
+
+onready var foreground = get_node(\"Foreground\")
+onready var background = get_node(\"Background\")
+onready var particles_a = get_node(\"Particles2D\")
+onready var particles_b = get_node(\"Particles2D1\")
+onready var sound = get_node(\"StreamPlayer\")
+
+func _ready():	
+	pass
+
+func open_cage():
+	sound.play()
+	get_node(\"Area2D\").queue_free()
+	get_node(\"CollisionShape2D\").queue_free()
+	particles_a.set_emitting(true)
+	particles_b.set_emitting(true)
+	foreground.queue_free()
+	background.queue_free()
+	
+
+func _on_Area2D_body_enter( body ):
+	if (body.is_in_group(\"player\")):
+		open_cage()
+"
+
+[sub_resource type="SpriteFrames" id=2]
+
+animations = [ {
+"frames": [ ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 19 ) ],
+"loop": true,
+"name": "Idle",
+"speed": 20.0
+} ]
+
+[sub_resource type="ColorRamp" id=4]
+
+offsets = FloatArray( 0, 0.00787402, 1 )
+colors = ColorArray( 0, 0, 0, 1, 0.71875, 0.71875, 0.71875, 1, 1, 1, 1, 0 )
+
+[node name="Cage" type="StaticBody2D"]
+
+input/pickable = false
+shapes/0/shape = SubResource( 1 )
+shapes/0/transform = Matrix32( 2.38822, 0, 0, 2.59377, -0.499996, -1.5 )
+shapes/0/trigger = false
+collision/layers = 16
+collision/mask = 1
+constant_linear_velocity = Vector2( 0, 0 )
+constant_angular_velocity = 0.0
+friction = 1.0
+bounce = 0.0
+script/script = SubResource( 3 )
+
+[node name="Foreground" type="Sprite" parent="."]
+
+z/z = 1
+texture = ExtResource( 1 )
+hframes = 2
+region_rect = Rect2( 0, 0, 78, 61 )
+
+[node name="Background" type="Sprite" parent="."]
+
+z/z = -1
+texture = ExtResource( 1 )
+hframes = 2
+frame = 1
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+
+transform/pos = Vector2( -0.499996, -1.5 )
+transform/scale = Vector2( 2.38822, 2.59377 )
+shape = SubResource( 1 )
+trigger = false
+_update_shape_index = 0
+
+[node name="Sound" type="StreamPlayer" parent="."]
+
+stream/stream = ExtResource( 2 )
+stream/play = false
+stream/loop = false
+stream/volume_db = 5.0
+stream/autoplay = false
+stream/paused = false
+stream/loop_restart_time = 0.0
+stream/buffering_ms = 500
+
+[node name="Animals" type="AnimatedSprite" parent="."]
+
+frames = SubResource( 2 )
+animation = "Idle"
+frame = 13
+playing = true
+
+[node name="Particles2D" type="Particles2D" parent="."]
+
+transform/pos = Vector2( 0, 1 )
+config/amount = 80
+config/lifetime = 0.9
+config/emit_timeout = 0.1
+config/emitting = false
+config/process_mode = 1
+config/half_extents = Vector2( 20, 20 )
+config/local_space = false
+config/explosiveness = 0.4
+config/texture = ExtResource( 20 )
+params/direction = 180.0
+params/spread = 180.0
+params/linear_velocity = 200.0
+params/spin_velocity = 5.0
+params/orbit_velocity = 0.0
+params/gravity_direction = 1.0
+params/gravity_strength = 200.0
+params/radial_accel = 1.0
+params/tangential_accel = 0.0
+params/damping = 100.0
+params/initial_angle = 5.0
+params/initial_size = 1.0
+params/final_size = 1.0
+params/hue_variation = 0.0
+params/anim_speed_scale = 1.0
+params/anim_initial_pos = 0.0
+randomness/linear_velocity = 0.2
+randomness/spin_velocity = 0.2
+randomness/initial_angle = 10.0
+color/color_ramp = SubResource( 4 )
+
+[node name="Particles2D1" type="Particles2D" parent="."]
+
+transform/pos = Vector2( 0, 1 )
+z/z = -1
+config/amount = 200
+config/lifetime = 0.8
+config/emit_timeout = 0.1
+config/emitting = false
+config/process_mode = 1
+config/half_extents = Vector2( 20, 20 )
+config/local_space = false
+config/explosiveness = 0.4
+config/texture = ExtResource( 21 )
+params/direction = 0.0
+params/spread = 180.0
+params/linear_velocity = 100.0
+params/spin_velocity = 5.0
+params/orbit_velocity = 0.0
+params/gravity_direction = 0.0
+params/gravity_strength = 0.0
+params/radial_accel = 1.0
+params/tangential_accel = 0.0
+params/damping = 100.0
+params/initial_angle = 5.0
+params/initial_size = 1.0
+params/final_size = 2.0
+params/hue_variation = 0.0
+params/anim_speed_scale = 1.0
+params/anim_initial_pos = 0.0
+randomness/linear_velocity = 0.2
+randomness/spin_velocity = 0.2
+randomness/initial_angle = 10.0
+color/color = Color( 0.5, 0.5, 0.5, 1 )
+color/color_ramp = SubResource( 4 )
+
+[node name="Area2D" type="Area2D" parent="."]
+
+transform/pos = Vector2( 9.53674e-07, -0.999999 )
+transform/scale = Vector2( 1.34375, 1.09375 )
+input/pickable = true
+shapes/0/shape = SubResource( 1 )
+shapes/0/transform = Matrix32( 1.85446, 0, 0, 2.55983, -0.744187, -8.9407e-07 )
+shapes/0/trigger = false
+gravity_vec = Vector2( 0, 1 )
+gravity = 98.0
+linear_damp = 0.1
+angular_damp = 1.0
+
+[node name="CollisionShape2D1" type="CollisionShape2D" parent="Area2D"]
+
+transform/pos = Vector2( -0.744187, -8.9407e-07 )
+transform/scale = Vector2( 1.85446, 2.55983 )
+shape = SubResource( 1 )
+trigger = false
+_update_shape_index = 0
+
+[node name="StreamPlayer" type="StreamPlayer" parent="."]
+
+stream/stream = ExtResource( 22 )
+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="Area2D" to="." method="_on_Area2D_body_enter"]
+
+

Scenes/Events/player.gd

@@ -26,7 +26,7 @@ onready var hud_milk = get_tree().get_nodes_in_group("milk_hud")[0]
 onready var hud_life = get_tree().get_nodes_in_group("life_hud")[0]
 onready var hud_cowbell = get_tree().get_nodes_in_group("cowbell_hud")[0]
 
-onready var JUMP_SOUND = ResourceLoader.load("Sound/player_jump_sound.ogg")
+onready var JUMP_SOUND = ResourceLoader.load("Sound/player_jump.ogg")
 onready var cowbell_collector = get_node("cowbell_collector")
 
 
@@ -62,6 +62,10 @@ func add_cowbells(var number):
 	cowbells_collected += number
 	hud_cowbell.set_counter (cowbells_collected, cowbell_collector.play_sound())
 	
+func add_bonus (var quantity):
+	cowbells_collected += quantity
+	hud_cowbell.bonus(quantity)
+	
 func is_falling ():
 	return velocity.y > 0
 
@@ -147,7 +151,7 @@ func _fixed_process(delta):
 	
 	# Salto
 	if (can_jump and jump_key_pressed):
-		#play_sound(JUMP_SOUND)		
+		play_sound(JUMP_SOUND)
 		velocity.y = - JUMP_SPEED
 		jumping = true
 		jump_time = MAX_JUMP_TIME

Scenes/Events/player.tscn

@@ -6,7 +6,7 @@
 [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]
 [ext_resource path="res://Scenes/Events/cowbell_collector.gd" type="Script" id=6]
-[ext_resource path="res://Sound/player_jump_sound.ogg" type="AudioStream" id=7]
+[ext_resource path="res://Sound/player_jump.ogg" type="AudioStream" id=7]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 
@@ -148,6 +148,8 @@ transform/scale = Vector2( 0.5, 0.5 )
 script/script = ExtResource( 6 )
 pitch_increment = 0.02
 base_pitch = 1.5
+bonus_threshold = 20
+bonus_cowbells = 15
 
 [node name="next_cowbell_time" type="Timer" parent="cowbell_collector"]
 
@@ -159,7 +161,7 @@ autostart = false
 [node name="sound" type="StreamPlayer" parent="."]
 
 stream/stream = ExtResource( 7 )
-stream/play = false
+stream/play = true
 stream/loop = false
 stream/volume_db = 10.0
 stream/autoplay = false

Scenes/Maps/map_1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=1]
+[gd_scene load_steps=14 format=1]
 
 [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1]
 [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2]
@@ -12,6 +12,7 @@
 [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10]
 [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11]
 [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12]
+[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13]
 
 [node name="Level" type="Node2D"]
 
@@ -2050,4 +2051,41 @@ stream/paused = false
 stream/loop_restart_time = 0.0
 stream/buffering_ms = 500
 
+[node name="Cages" type="Node2D" parent="."]
+
+[node name="jail" parent="Cages" instance=ExtResource( 13 )]
+
+transform/pos = Vector2( -1410, -2210 )
+transform/scale = Vector2( 1.7, 1.7 )
+
+[node name="jail1" parent="Cages" instance=ExtResource( 13 )]
+
+transform/pos = Vector2( -1890, -2210 )
+transform/scale = Vector2( 1.7, 1.7 )
+
+[node name="jail2" parent="Cages" instance=ExtResource( 13 )]
+
+transform/pos = Vector2( -3170, -3080 )
+transform/scale = Vector2( 1.7, 1.7 )
+
+[node name="jail3" parent="Cages" instance=ExtResource( 13 )]
+
+transform/pos = Vector2( -2640, -470 )
+transform/scale = Vector2( 1.7, 1.7 )
+
+[node name="jail4" parent="Cages" instance=ExtResource( 13 )]
+
+transform/pos = Vector2( 1900, -1780 )
+transform/scale = Vector2( 1.7, 1.7 )
+
+[node name="jail5" parent="Cages" instance=ExtResource( 13 )]
+
+transform/pos = Vector2( 3690, -2760 )
+transform/scale = Vector2( 1.7, 1.7 )
+
+[node name="jail6" parent="Cages" instance=ExtResource( 13 )]
+
+transform/pos = Vector2( 4670, -1880 )
+transform/scale = Vector2( 1.7, 1.7 )
+
 

Scenes/Menu/HUD.tscn

@@ -278,7 +278,6 @@ sprite3 = ExtResource( 11 )
 
 transform/pos = Vector2( 3, 21 )
 script/script = ExtResource( 12 )
-bonus_threshold = 25
 
 [node name="Counter" type="RichTextLabel" parent="Control/Cowbells"]
 

Scenes/Menu/cowbells_hud.gd

@@ -14,12 +14,13 @@ onready var sprite = get_node("Sprite")
 onready var base_modulation = Color(1,1,1)
 onready var instancer = get_node("bonus_instancer")
 
-export(int) var bonus_threshold = 25
-
-var ac = 0
-
 var frame_number
 
+func bonus(quantity):
+	var bonus = BONUS.instance()
+	bonus.set_text(str("+",quantity))	
+	instancer.add_child(bonus)	
+
 func _ready():
 	animation.play("cowbell_animations")
 	var anim = animation.get_animation("cowbell_animations")
@@ -29,8 +30,7 @@ func _ready():
 func set_counter (var quantity, var acumulated):	
 	sprite.set_modulate(Color (1,1 - acumulated * 2,1 - acumulated * 2))
 	label.set_bbcode(" " + String(quantity))
-	animation.set_active(true)
-	ac += 1
+	animation.set_active(true)	
 	next_cowbell_timer.start()
 	cold_down_timer.start()
 	
@@ -45,10 +45,4 @@ func _on_cold_down_timer_timeout():
 		sprite.set_modulate(base_modulation)
 		cold_down_timer.stop()		
 	else:		
-		sprite.set_modulate(Color (1,current_modulation.g + 0.02 ,current_modulation.b + 0.02))
-		if (ac >= bonus_threshold):			
-			instancer.add_child(BONUS.instance(1))
-			get_tree().get_nodes_in_group("player")[0].add_cowbells(15)
-			ac = 0
-	if (ac > 0):
-			ac -= 0.1
+		sprite.set_modulate(Color (1,current_modulation.g + 0.02 ,current_modulation.b + 0.02))		

engine.cfg

@@ -11,7 +11,6 @@ global="*res://Scenes/Menu/global.gd"
 [debug]
 
 force_fps=60
-print_fps=true
 
 [display]