diff --git a/src/Objects/Banana/Banana.gd b/src/Objects/Banana/Banana.gd index 3bfd32c..f2143ac 100644 --- a/src/Objects/Banana/Banana.gd +++ b/src/Objects/Banana/Banana.gd @@ -5,4 +5,5 @@ func _ready(): func _on_Hurtbox_area_entered(area): + SoundControler.pub_play_effect("res://Objects/Banana/Banane3.wav",3) queue_free() diff --git a/src/Objects/Banana/Banane3.wav b/src/Objects/Banana/Banane3.wav new file mode 100644 index 0000000..24b0534 Binary files /dev/null and b/src/Objects/Banana/Banane3.wav differ diff --git a/src/Objects/Banana/Banane3.wav.import b/src/Objects/Banana/Banane3.wav.import new file mode 100644 index 0000000..9fcd2df --- /dev/null +++ b/src/Objects/Banana/Banane3.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Banane3.wav-c4d652a8ed02bff4149e35c2d5eb9a8c.sample" + +[deps] + +source_file="res://Objects/Banana/Banane3.wav" +dest_files=[ "res://.import/Banane3.wav-c4d652a8ed02bff4149e35c2d5eb9a8c.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Barrel/Barrel.gd b/src/Objects/Barrel/Barrel.gd index 0bd2e38..35a8e29 100644 --- a/src/Objects/Barrel/Barrel.gd +++ b/src/Objects/Barrel/Barrel.gd @@ -14,6 +14,7 @@ func _on_Hurtbox_area_entered(area): health -= area.damage if(health>0): return + SoundControler.pub_play_effect("res://Objects/Barrel/Barrel4.wav",3) queue_free() var GreenRubies = load("res://Objects/Rubies/Green.tscn") var BlueRubies = load("res://Objects/Rubies/Blue.tscn") diff --git a/src/Objects/Barrel/Barrel4.wav b/src/Objects/Barrel/Barrel4.wav new file mode 100644 index 0000000..c77ead7 Binary files /dev/null and b/src/Objects/Barrel/Barrel4.wav differ diff --git a/src/Objects/Barrel/Barrel4.wav.import b/src/Objects/Barrel/Barrel4.wav.import new file mode 100644 index 0000000..f605ebd --- /dev/null +++ b/src/Objects/Barrel/Barrel4.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Barrel4.wav-f239635eadc7db249770de6f6e044fcc.sample" + +[deps] + +source_file="res://Objects/Barrel/Barrel4.wav" +dest_files=[ "res://.import/Barrel4.wav-f239635eadc7db249770de6f6e044fcc.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Bonfire/Bonfire.gd b/src/Objects/Bonfire/Bonfire.gd index 348dc93..599cd86 100644 --- a/src/Objects/Bonfire/Bonfire.gd +++ b/src/Objects/Bonfire/Bonfire.gd @@ -1,5 +1,12 @@ extends StaticBody2D +func _sound_finished(): + SoundControler.pub_play_effect("res://Objects/Bonfire/Bonfire.wav",3) + +func _ready(): + SoundControler.pub_play_effect("res://Objects/Bonfire/Bonfire.wav",3) + SoundControler._effect[3].volume_db = -20 + SoundControler._effect[3].connect("finished",self,"_sound_finished") func _on_Hurtbox_area_entered(area): queue_free() diff --git a/src/Objects/Bonfire/Bonfire.wav b/src/Objects/Bonfire/Bonfire.wav new file mode 100644 index 0000000..c49d4a0 Binary files /dev/null and b/src/Objects/Bonfire/Bonfire.wav differ diff --git a/src/Objects/Bonfire/Bonfire.wav.import b/src/Objects/Bonfire/Bonfire.wav.import new file mode 100644 index 0000000..8fa528e --- /dev/null +++ b/src/Objects/Bonfire/Bonfire.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Bonfire.wav-44e8d268003001911b3b6219f2d46058.sample" + +[deps] + +source_file="res://Objects/Bonfire/Bonfire.wav" +dest_files=[ "res://.import/Bonfire.wav-44e8d268003001911b3b6219f2d46058.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Heart/Heart.gd b/src/Objects/Heart/Heart.gd index 92da9f6..5e23f03 100644 --- a/src/Objects/Heart/Heart.gd +++ b/src/Objects/Heart/Heart.gd @@ -1,5 +1,11 @@ extends Node2D +var CHANNEL = 2 +#one sound will be chosen at random +export var SoundLibary :PoolStringArray=[] func _on_Hurtbox_area_entered(area): + var sound = SoundLibary[rand_range(0,SoundLibary.size())] + SoundControler.pub_play_effect(sound,CHANNEL) + queue_free() diff --git a/src/Objects/Heart/Heart.tscn b/src/Objects/Heart/Heart.tscn index 4afd053..40527eb 100644 --- a/src/Objects/Heart/Heart.tscn +++ b/src/Objects/Heart/Heart.tscn @@ -11,6 +11,7 @@ height = 3.0 [node name="Heart" type="Node2D"] script = ExtResource( 2 ) +SoundLibary = PoolStringArray( "res://Objects/Heart/Sounds/Heart2.wav", "res://Objects/Heart/Sounds/Heart3.wav", "res://Objects/Heart/Sounds/Heart4.wav", "res://Objects/Heart/Sounds/Heart5.wav", "res://Objects/Heart/Sounds/Heart.wav" ) [node name="Kind" parent="." instance=ExtResource( 4 )] general = 1 diff --git a/src/Objects/Heart/Sounds/Heart.wav b/src/Objects/Heart/Sounds/Heart.wav new file mode 100644 index 0000000..b64739e Binary files /dev/null and b/src/Objects/Heart/Sounds/Heart.wav differ diff --git a/src/Objects/Heart/Sounds/Heart.wav.import b/src/Objects/Heart/Sounds/Heart.wav.import new file mode 100644 index 0000000..f66bfb5 --- /dev/null +++ b/src/Objects/Heart/Sounds/Heart.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Heart.wav-93ae108d931fc01aec225d77fc0e814f.sample" + +[deps] + +source_file="res://Objects/Heart/Sounds/Heart.wav" +dest_files=[ "res://.import/Heart.wav-93ae108d931fc01aec225d77fc0e814f.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Heart/Sounds/Heart2.wav b/src/Objects/Heart/Sounds/Heart2.wav new file mode 100644 index 0000000..156674d Binary files /dev/null and b/src/Objects/Heart/Sounds/Heart2.wav differ diff --git a/src/Objects/Heart/Sounds/Heart2.wav.import b/src/Objects/Heart/Sounds/Heart2.wav.import new file mode 100644 index 0000000..c96a515 --- /dev/null +++ b/src/Objects/Heart/Sounds/Heart2.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Heart2.wav-a011b583465bc753dfd06f65e32d832c.sample" + +[deps] + +source_file="res://Objects/Heart/Sounds/Heart2.wav" +dest_files=[ "res://.import/Heart2.wav-a011b583465bc753dfd06f65e32d832c.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Heart/Sounds/Heart3.wav b/src/Objects/Heart/Sounds/Heart3.wav new file mode 100644 index 0000000..b37a1fa Binary files /dev/null and b/src/Objects/Heart/Sounds/Heart3.wav differ diff --git a/src/Objects/Heart/Sounds/Heart3.wav.import b/src/Objects/Heart/Sounds/Heart3.wav.import new file mode 100644 index 0000000..930208c --- /dev/null +++ b/src/Objects/Heart/Sounds/Heart3.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Heart3.wav-d8aedccf9717ce338c37ea5eb6f14eb7.sample" + +[deps] + +source_file="res://Objects/Heart/Sounds/Heart3.wav" +dest_files=[ "res://.import/Heart3.wav-d8aedccf9717ce338c37ea5eb6f14eb7.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Heart/Sounds/Heart4.wav b/src/Objects/Heart/Sounds/Heart4.wav new file mode 100644 index 0000000..955b60e Binary files /dev/null and b/src/Objects/Heart/Sounds/Heart4.wav differ diff --git a/src/Objects/Heart/Sounds/Heart4.wav.import b/src/Objects/Heart/Sounds/Heart4.wav.import new file mode 100644 index 0000000..9b6a207 --- /dev/null +++ b/src/Objects/Heart/Sounds/Heart4.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Heart4.wav-2b56c1e163d27baa997ab107ad28cc09.sample" + +[deps] + +source_file="res://Objects/Heart/Sounds/Heart4.wav" +dest_files=[ "res://.import/Heart4.wav-2b56c1e163d27baa997ab107ad28cc09.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Heart/Sounds/Heart5.wav b/src/Objects/Heart/Sounds/Heart5.wav new file mode 100644 index 0000000..a3274fc Binary files /dev/null and b/src/Objects/Heart/Sounds/Heart5.wav differ diff --git a/src/Objects/Heart/Sounds/Heart5.wav.import b/src/Objects/Heart/Sounds/Heart5.wav.import new file mode 100644 index 0000000..2498ab0 --- /dev/null +++ b/src/Objects/Heart/Sounds/Heart5.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Heart5.wav-8f77aba9521b3d9ff5828fad0357c934.sample" + +[deps] + +source_file="res://Objects/Heart/Sounds/Heart5.wav" +dest_files=[ "res://.import/Heart5.wav-8f77aba9521b3d9ff5828fad0357c934.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Rubies/Rubies.gd b/src/Objects/Rubies/Rubies.gd index 274d93f..919e17b 100644 --- a/src/Objects/Rubies/Rubies.gd +++ b/src/Objects/Rubies/Rubies.gd @@ -5,4 +5,5 @@ extends Node2D func _on_Hurtbox_area_entered(area): + SoundControler.pub_play_effect("res://Objects/Rubies/emerald3.wav",8) queue_free() diff --git a/src/Objects/Rubies/emerald3.wav b/src/Objects/Rubies/emerald3.wav new file mode 100644 index 0000000..6fcaa18 Binary files /dev/null and b/src/Objects/Rubies/emerald3.wav differ diff --git a/src/Objects/Rubies/emerald3.wav.import b/src/Objects/Rubies/emerald3.wav.import new file mode 100644 index 0000000..d099b2b --- /dev/null +++ b/src/Objects/Rubies/emerald3.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/emerald3.wav-e58c6f1da5e6e50b4a361287d9b58f80.sample" + +[deps] + +source_file="res://Objects/Rubies/emerald3.wav" +dest_files=[ "res://.import/emerald3.wav-e58c6f1da5e6e50b4a361287d9b58f80.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Torch/Torch.gd b/src/Objects/Torch/Torch.gd index 94e13ec..9cb05d1 100644 --- a/src/Objects/Torch/Torch.gd +++ b/src/Objects/Torch/Torch.gd @@ -25,3 +25,12 @@ func _on_Hurtbox_area_entered(area): if(lifePoints<=0): queue_free() pass + + +func _sound_finished(): + SoundControler.pub_play_effect("res://Objects/Torch/Torch.wav",4) + +func _ready(): + SoundControler.pub_play_effect("res://Objects/Torch/Torch.wav",4) + SoundControler._effect[4].volume_db = -20 + SoundControler._effect[4].connect("finished",self,"_sound_finished") diff --git a/src/Objects/Torch/Torch.wav b/src/Objects/Torch/Torch.wav new file mode 100644 index 0000000..b1591af Binary files /dev/null and b/src/Objects/Torch/Torch.wav differ diff --git a/src/Objects/Torch/Torch.wav.import b/src/Objects/Torch/Torch.wav.import new file mode 100644 index 0000000..899fb29 --- /dev/null +++ b/src/Objects/Torch/Torch.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Torch.wav-078204a6d1bdd39208549e4f9258eb09.sample" + +[deps] + +source_file="res://Objects/Torch/Torch.wav" +dest_files=[ "res://.import/Torch.wav-078204a6d1bdd39208549e4f9258eb09.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Traps/Bear/Barenfalle.wav b/src/Objects/Traps/Bear/Barenfalle.wav new file mode 100644 index 0000000..8a8a843 Binary files /dev/null and b/src/Objects/Traps/Bear/Barenfalle.wav differ diff --git a/src/Objects/Traps/Bear/Barenfalle.wav.import b/src/Objects/Traps/Bear/Barenfalle.wav.import new file mode 100644 index 0000000..3ae564c --- /dev/null +++ b/src/Objects/Traps/Bear/Barenfalle.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Barenfalle.wav-7d2cb16985676d58ae72f251521d36e1.sample" + +[deps] + +source_file="res://Objects/Traps/Bear/Barenfalle.wav" +dest_files=[ "res://.import/Barenfalle.wav-7d2cb16985676d58ae72f251521d36e1.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Traps/Bear/Bear.gd b/src/Objects/Traps/Bear/Bear.gd index 252fe0c..8d32f0c 100644 --- a/src/Objects/Traps/Bear/Bear.gd +++ b/src/Objects/Traps/Bear/Bear.gd @@ -2,6 +2,7 @@ extends Node2D func _on_Hurtbox_area_entered(area): $AnimatedSprite.play("clap") + SoundControler.pub_play_effect("res://Objects/Traps/Bear/Barenfalle.wav",3) func _ready(): diff --git a/src/Objects/Traps/Flame/Fire.wav b/src/Objects/Traps/Flame/Fire.wav new file mode 100644 index 0000000..015571d Binary files /dev/null and b/src/Objects/Traps/Flame/Fire.wav differ diff --git a/src/Objects/Traps/Flame/Fire.wav.import b/src/Objects/Traps/Flame/Fire.wav.import new file mode 100644 index 0000000..3708b74 --- /dev/null +++ b/src/Objects/Traps/Flame/Fire.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Fire.wav-84583361f93dd603eebbfa9f5b2316ec.sample" + +[deps] + +source_file="res://Objects/Traps/Flame/Fire.wav" +dest_files=[ "res://.import/Fire.wav-84583361f93dd603eebbfa9f5b2316ec.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Objects/Traps/Flame/Flame.gd b/src/Objects/Traps/Flame/Flame.gd index 7b3fc4b..86cf017 100644 --- a/src/Objects/Traps/Flame/Flame.gd +++ b/src/Objects/Traps/Flame/Flame.gd @@ -6,6 +6,7 @@ var timer = Timer.new() func on_timer_timeout(): timer.stop() + SoundControler.pub_stop_effect(4) queue_free() func _ready(): @@ -14,6 +15,9 @@ func _ready(): timer.connect("timeout", self, "on_timer_timeout") timer.set_wait_time(burning_time) timer.start() + SoundControler.pub_play_effect("res://Objects/Traps/Flame/Fire.wav",5) + SoundControler._effect[5].volume_db = -20 + SoundControler._effect[5].connect("finished",self,"_sound_finished") @@ -21,4 +25,9 @@ func _ready(): func _on_Hitbox_body_entered(body): if(body.get_name() == "Player"): body.velocity*=-3 + + +func _sound_finished(): + SoundControler.pub_play_effect("res://Objects/Traps/Flame/Fire.wav",5) + diff --git a/src/Objects/Traps/Spike/Spike.gd b/src/Objects/Traps/Spike/Spike.gd index a86ea86..f1ef4c7 100644 --- a/src/Objects/Traps/Spike/Spike.gd +++ b/src/Objects/Traps/Spike/Spike.gd @@ -7,10 +7,12 @@ var time = Timer.new() func _ready(): add_child(time) $Sprite.play("out") + SoundControler.pub_play_effect("res://Objects/Traps/Spike/Spike6.wav",9) $"Hitbox/CollisionShape2D".disabled = true func on_timer_timeout(): $Sprite.play("out") + SoundControler.pub_play_effect("res://Objects/Traps/Spike/Spike6.wav",9) time.stop() func _on_Sprite_animation_finished(): @@ -29,6 +31,7 @@ func _on_Sprite_animation_finished(): func _on_Hitbox_area_entered(area): if($Sprite.get_animation()=="default"): + SoundControler.pub_play_effect("res://Objects/Traps/Spike/Spike6.wav",9) $Sprite.play("in") diff --git a/src/Objects/Traps/Spike/Spike6.wav b/src/Objects/Traps/Spike/Spike6.wav new file mode 100644 index 0000000..eb61f20 Binary files /dev/null and b/src/Objects/Traps/Spike/Spike6.wav differ diff --git a/src/Objects/Traps/Spike/Spike6.wav.import b/src/Objects/Traps/Spike/Spike6.wav.import new file mode 100644 index 0000000..d6e8046 --- /dev/null +++ b/src/Objects/Traps/Spike/Spike6.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Spike6.wav-bc77d5918763e2421c9fbe8d547f2a87.sample" + +[deps] + +source_file="res://Objects/Traps/Spike/Spike6.wav" +dest_files=[ "res://.import/Spike6.wav-bc77d5918763e2421c9fbe8d547f2a87.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Player/Player.tscn b/src/Player/Player.tscn index d5c119f..33e4678 100644 --- a/src/Player/Player.tscn +++ b/src/Player/Player.tscn @@ -699,7 +699,7 @@ shape = SubResource( 47 ) [node name="Pivot" type="Position2D" parent="."] position = Vector2( 0, -4 ) -rotation = 3.14159 +rotation = 1.5708 __meta__ = { "_gizmo_extents_": 20.0 } @@ -756,6 +756,7 @@ script = ExtResource( 14 ) [node name="Roll" type="Node" parent="AnimationStates"] script = ExtResource( 16 ) +SoundLibary = PoolStringArray( "res://Player/Sounds/roll4.wav", "res://Player/Sounds/roll5.wav", "res://Player/Sounds/roll6.wav" ) [node name="Effects" type="Node2D" parent="."] diff --git a/src/Player/Sounds/roll4.wav b/src/Player/Sounds/roll4.wav new file mode 100644 index 0000000..e63a7e2 Binary files /dev/null and b/src/Player/Sounds/roll4.wav differ diff --git a/src/Player/Sounds/roll4.wav.import b/src/Player/Sounds/roll4.wav.import new file mode 100644 index 0000000..d822de1 --- /dev/null +++ b/src/Player/Sounds/roll4.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/roll4.wav-113597ca7b30182e560c90a8eb271750.sample" + +[deps] + +source_file="res://Player/Sounds/roll4.wav" +dest_files=[ "res://.import/roll4.wav-113597ca7b30182e560c90a8eb271750.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Player/Sounds/roll5.wav b/src/Player/Sounds/roll5.wav new file mode 100644 index 0000000..d73a811 Binary files /dev/null and b/src/Player/Sounds/roll5.wav differ diff --git a/src/Player/Sounds/roll5.wav.import b/src/Player/Sounds/roll5.wav.import new file mode 100644 index 0000000..d60599d --- /dev/null +++ b/src/Player/Sounds/roll5.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/roll5.wav-ac043f34bae365968703b73bd62916d9.sample" + +[deps] + +source_file="res://Player/Sounds/roll5.wav" +dest_files=[ "res://.import/roll5.wav-ac043f34bae365968703b73bd62916d9.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Player/Sounds/roll6.wav b/src/Player/Sounds/roll6.wav new file mode 100644 index 0000000..d0e473c Binary files /dev/null and b/src/Player/Sounds/roll6.wav differ diff --git a/src/Player/Sounds/roll6.wav.import b/src/Player/Sounds/roll6.wav.import new file mode 100644 index 0000000..f493914 --- /dev/null +++ b/src/Player/Sounds/roll6.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/roll6.wav-1aa8acb680444b32fcc834ed35ef914e.sample" + +[deps] + +source_file="res://Player/Sounds/roll6.wav" +dest_files=[ "res://.import/roll6.wav-1aa8acb680444b32fcc834ed35ef914e.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/src/Player/States/Roll.gd b/src/Player/States/Roll.gd index 6d04951..2873e4c 100644 --- a/src/Player/States/Roll.gd +++ b/src/Player/States/Roll.gd @@ -1,8 +1,44 @@ extends "res://Player/States/PlayerAnimationState.gd" +#the channel on which the sound is played +const CHANNEL = 1 + +#one sound will be chosen at random +export var SoundLibary :PoolStringArray=[] +#the delay between 2 sounds being played, a new sound will only start if the old one is finished +export(float,0,5) var Delay = 0.2 + +var is_playing_sound:bool =false +var delay_passed:bool=true +var timer:Timer + +func _ready(): + timer=Timer.new() + self.add_child(timer) + timer.connect("timeout",self,"sig_timer_timeout") + SoundControler._effect[CHANNEL].connect("finished", self, "sig_walk_sound_finished") + func enter(): animation_playback.travel("roll") func update(delta): var input_vector = get_input_direction() animation_tree.set("parameters/roll/blend_position", owner.rollvector) + _play_random_sound() + +func _play_random_sound(): + if delay_passed and is_playing_sound==false: + var sound = SoundLibary[rand_range(0,SoundLibary.size())] + SoundControler.pub_play_effect(sound,CHANNEL) + + is_playing_sound = true + delay_passed=false + #timer.start(Delay) + + +func sig_timer_timeout (): + delay_passed=true + +func sig_walk_sound_finished(): + is_playing_sound = false + timer.start(Delay) diff --git a/src/World.tscn b/src/World.tscn index 355c217..f8e3841 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=28 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" id=2] @@ -13,6 +13,10 @@ [ext_resource path="res://Debug/BossStateDisplay.gd" type="Script" id=11] [ext_resource path="res://Maps/Tilesets/Edge/tileset_edge.png" type="Texture" id=12] [ext_resource path="res://Boss/Minion.tscn" type="PackedScene" id=13] +[ext_resource path="res://Objects/Traps/Flame/Flame.tscn" type="PackedScene" id=14] +[ext_resource path="res://Objects/Traps/Bear/Bear.tscn" type="PackedScene" id=15] +[ext_resource path="res://Objects/Barrel/Barrel.tscn" type="PackedScene" id=16] +[ext_resource path="res://Objects/Traps/Spike/Spike.tscn" type="PackedScene" id=17] [ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18] [sub_resource type="ConvexPolygonShape2D" id=1] @@ -276,6 +280,12 @@ position = Vector2( 240, 120 ) [node name="Minion" parent="YSort" instance=ExtResource( 13 )] position = Vector2( 24, 184 ) +[node name="Flame" parent="YSort" instance=ExtResource( 14 )] +position = Vector2( 168, 120 ) + +[node name="Flame2" parent="YSort" instance=ExtResource( 14 )] +position = Vector2( 216, 56 ) + [node name="Grid" parent="." instance=ExtResource( 18 )] pause_mode = 1 @@ -345,6 +355,48 @@ anchor_right = 1.0 margin_left = -42.0 margin_bottom = 24.0 text = "Win" + +[node name="Bonfire" parent="." instance=ExtResource( 10 )] +position = Vector2( 104, 56 ) + +[node name="Bear_trap" parent="." instance=ExtResource( 15 )] +position = Vector2( 128, 120 ) + +[node name="Bear_trap2" parent="." instance=ExtResource( 15 )] +position = Vector2( 160, 88 ) + +[node name="Bear_trap3" parent="." instance=ExtResource( 15 )] +position = Vector2( 208, 80 ) + +[node name="Bear_trap4" parent="." instance=ExtResource( 15 )] +position = Vector2( 184, 160 ) + +[node name="Bear_trap5" parent="." instance=ExtResource( 15 )] +position = Vector2( 304, 80 ) + +[node name="Bear_trap6" parent="." instance=ExtResource( 15 )] +position = Vector2( 312, 160 ) + +[node name="Barrel" parent="." instance=ExtResource( 16 )] +position = Vector2( 64, 112 ) + +[node name="Barrel2" parent="." instance=ExtResource( 16 )] +position = Vector2( 88, 144 ) + +[node name="Barrel3" parent="." instance=ExtResource( 16 )] +position = Vector2( 120, 160 ) + +[node name="Spike" parent="." instance=ExtResource( 17 )] +position = Vector2( 168, 40 ) + +[node name="Spike2" parent="." instance=ExtResource( 17 )] +position = Vector2( 288, 48 ) + +[node name="Spike3" parent="." instance=ExtResource( 17 )] +position = Vector2( 312, 128 ) + +[node name="Spike4" parent="." instance=ExtResource( 17 )] +position = Vector2( 224, 152 ) [connection signal="phase_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_phase_changed"] [connection signal="state_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_state_changed"] [connection signal="pressed" from="CanvasLayer/Win" to="." method="_on_Win_pressed"]