Skip to content

Commit

Permalink
sound stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
leiver committed Apr 15, 2024
1 parent 539de42 commit 59444ec
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
6 changes: 4 additions & 2 deletions scenes/attack.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,19 @@ one_shot = true

[node name="HitOne" type="AudioStreamPlayer" parent="."]
stream = ExtResource("2_800ho")
volume_db = 1.0
volume_db = -5.0

[node name="HitTwo" type="AudioStreamPlayer" parent="."]
stream = ExtResource("3_s0xrs")
volume_db = 1.0
volume_db = -5.0

[node name="SwipeOne" type="AudioStreamPlayer" parent="."]
stream = ExtResource("4_opeyi")
volume_db = -10.0

[node name="SwipeTwo" type="AudioStreamPlayer" parent="."]
stream = ExtResource("5_8vk6y")
volume_db = -10.0

[connection signal="body_entered" from="." to="." method="_on_body_entered"]
[connection signal="timeout" from="AttackTimer" to="." method="_on_attack_timer_timeout"]
Expand Down
28 changes: 16 additions & 12 deletions scripts/Attack.gd
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ extends Area2D
var attacking_entity
signal attack_finished
signal send_projectile(projectile)
var did_damage = false


func _ready():
Expand All @@ -33,6 +34,7 @@ func disable():


func initiate_attack():
did_damage = false
timer.set_paused(false)
windup_timer.set_paused(false)
hitbox_timer.set_paused(false)
Expand Down Expand Up @@ -80,18 +82,20 @@ func _on_attack_timer_timeout():


func _on_body_entered(body):
if randi_range(0, 1):
$HitOne.play()
else:
$HitTwo.play()
if freeze_frame_length > 0:
attacking_entity.pause()
body.pause()
freeze_timer.start(freeze_frame_length)
await freeze_timer.timeout
attacking_entity.resume()
body.resume()
body.hit(attacking_entity, hitstun_length, damage, knockback, false)
if not did_damage:
if randi_range(0, 1):
$HitOne.play()
else:
$HitTwo.play()
if freeze_frame_length > 0:
attacking_entity.pause()
body.pause()
freeze_timer.start(freeze_frame_length)
await freeze_timer.timeout
attacking_entity.resume()
body.resume()
body.hit(attacking_entity, hitstun_length, damage, knockback, false)
did_damage = true


func _on_windup_timer_timeout():
Expand Down

0 comments on commit 59444ec

Please sign in to comment.