diff --git a/Scenes/Events/cowbell.tscn b/Scenes/Events/cowbell.tscn index 9ad0f35..fce7d3a 100644 --- a/Scenes/Events/cowbell.tscn +++ b/Scenes/Events/cowbell.tscn @@ -50,7 +50,7 @@ _update_shape_index = 0 config/polyphony = 1 config/samples = SubResource( 2 ) -default/volume_db = 8.0 +default/volume_db = 7.0 default/pitch_scale = 1.0 default/pan = 0.0 default/depth = 0.0 diff --git a/Scenes/Events/cowbell_collector.gd b/Scenes/Events/cowbell_collector.gd index 44d8ffe..69b7e60 100644 --- a/Scenes/Events/cowbell_collector.gd +++ b/Scenes/Events/cowbell_collector.gd @@ -7,11 +7,12 @@ extends Node2D onready var timer = get_node("next_cowbell_time") export(float) var pitch_increment = 0.05 +export(float) var base_pitch = 1.5 -var pitch = 1 +var pitch = base_pitch func timer_timeout(): - pitch = 1 + pitch = base_pitch func play_sound(): pitch += pitch_increment diff --git a/Scenes/Events/milk_bullet.gd b/Scenes/Events/milk_bullet.gd index b47ac9f..14385a6 100644 --- a/Scenes/Events/milk_bullet.gd +++ b/Scenes/Events/milk_bullet.gd @@ -22,8 +22,7 @@ func destroy(): yield(t, "timeout") queue_free() -func _ready(): - sound.set_random_pitch_scale(0.2) +func _ready(): sound.play("bullet_sound") t.set_wait_time(LIFE_TIME) t.set_one_shot(true) diff --git a/Scenes/Events/milk_bullet.tscn b/Scenes/Events/milk_bullet.tscn index 63f825f..d42314b 100644 --- a/Scenes/Events/milk_bullet.tscn +++ b/Scenes/Events/milk_bullet.tscn @@ -85,11 +85,11 @@ params/anim_initial_pos = 0.0 params/volume_db = 6.0 params/pitch_scale = 1.0 params/attenuation/min_distance = 0.0 -params/attenuation/max_distance = 764.0 +params/attenuation/max_distance = 750.0 params/attenuation/distance_exp = 2.37841 -config/polyphony = 1 +config/polyphony = 4 config/samples = SubResource( 2 ) -config/pitch_random = 0.0 +config/pitch_random = 0.135 [connection signal="body_enter" from="." to="." method="_on_RigidBody2D_body_enter"] diff --git a/Scenes/Events/player.tscn b/Scenes/Events/player.tscn index 525b5f5..5638a24 100644 --- a/Scenes/Events/player.tscn +++ b/Scenes/Events/player.tscn @@ -146,7 +146,8 @@ drag_margin/bottom = 0.2 transform/scale = Vector2( 0.5, 0.5 ) script/script = ExtResource( 6 ) -pitch_increment = 0.05 +pitch_increment = 0.02 +base_pitch = 1.5 [node name="next_cowbell_time" type="Timer" parent="cowbell_collector"] diff --git a/Scenes/Menu/HUD.tscn b/Scenes/Menu/HUD.tscn index 60fbce7..ef59553 100644 --- a/Scenes/Menu/HUD.tscn +++ b/Scenes/Menu/HUD.tscn @@ -108,7 +108,6 @@ initial_heart_pos = Vector2( 32, 0 ) ]] editor/display_folded = true -visibility/visible = false script/script = ExtResource( 3 ) [node name="Bttn_U" type="TouchScreenButton" parent="Control/Buttons"] diff --git a/Sound/bullet_sound.wav b/Sound/bullet_sound.wav index 7a7f3e3..98c2f2c 100644 Binary files a/Sound/bullet_sound.wav and b/Sound/bullet_sound.wav differ diff --git a/Sound/cowbell_sound.wav b/Sound/cowbell_sound.wav index d082b9e..c3471ad 100644 Binary files a/Sound/cowbell_sound.wav and b/Sound/cowbell_sound.wav differ diff --git a/Sound/enemy_die_sound_1.wav b/Sound/enemy_die_sound_1.wav index 1e30113..d47bee3 100644 Binary files a/Sound/enemy_die_sound_1.wav and b/Sound/enemy_die_sound_1.wav differ diff --git a/Sound/enemy_die_sound_10.wav b/Sound/enemy_die_sound_10.wav index ffea4af..957598d 100644 Binary files a/Sound/enemy_die_sound_10.wav and b/Sound/enemy_die_sound_10.wav differ diff --git a/Sound/enemy_die_sound_2.wav b/Sound/enemy_die_sound_2.wav index 1d211fb..95c14e4 100644 Binary files a/Sound/enemy_die_sound_2.wav and b/Sound/enemy_die_sound_2.wav differ diff --git a/Sound/enemy_die_sound_3.wav b/Sound/enemy_die_sound_3.wav index 4c63bc3..bbe6f99 100644 Binary files a/Sound/enemy_die_sound_3.wav and b/Sound/enemy_die_sound_3.wav differ diff --git a/Sound/enemy_die_sound_4.wav b/Sound/enemy_die_sound_4.wav index 22bdf81..e7041a2 100644 Binary files a/Sound/enemy_die_sound_4.wav and b/Sound/enemy_die_sound_4.wav differ diff --git a/Sound/enemy_die_sound_5.wav b/Sound/enemy_die_sound_5.wav index 9615a88..2d9df14 100644 Binary files a/Sound/enemy_die_sound_5.wav and b/Sound/enemy_die_sound_5.wav differ diff --git a/Sound/enemy_die_sound_6.wav b/Sound/enemy_die_sound_6.wav index 3a7c29a..d9e443c 100644 Binary files a/Sound/enemy_die_sound_6.wav and b/Sound/enemy_die_sound_6.wav differ diff --git a/Sound/enemy_die_sound_7.wav b/Sound/enemy_die_sound_7.wav index f97725f..bdf3da3 100644 Binary files a/Sound/enemy_die_sound_7.wav and b/Sound/enemy_die_sound_7.wav differ diff --git a/Sound/enemy_die_sound_8.wav b/Sound/enemy_die_sound_8.wav index c7010e8..8cb8fee 100644 Binary files a/Sound/enemy_die_sound_8.wav and b/Sound/enemy_die_sound_8.wav differ diff --git a/Sound/enemy_die_sound_9.wav b/Sound/enemy_die_sound_9.wav index 9b69b8d..86a094a 100644 Binary files a/Sound/enemy_die_sound_9.wav and b/Sound/enemy_die_sound_9.wav differ