Fixed Signals, effects, and collisions.
This commit is contained in:
@ -99,18 +99,15 @@ func attack_aninimation_finished():
|
||||
#func _process(delta):
|
||||
# pass
|
||||
|
||||
func _on_Hurtbox_invincibility_started():
|
||||
blinkAnimationPlayer.play("Start")
|
||||
|
||||
func _on_Hurtbox_area_entered(_area):
|
||||
func _on_Hurtbox_invincibility_ended():
|
||||
blinkAnimationPlayer.play("Stop")
|
||||
|
||||
func _on_hurtbox_area_entered(area: Area2D) -> void:
|
||||
stats.health -= 1
|
||||
hurtBox.start_invincibility(0.6)
|
||||
hurtBox.create_hit_effect()
|
||||
var playerHurtSounds = PlayerHurtSound.instantiate()
|
||||
get_tree().current_scene.add_child(playerHurtSounds)
|
||||
|
||||
|
||||
func _on_Hurtbox_invincibility_started():
|
||||
blinkAnimationPlayer.play("Start")
|
||||
|
||||
|
||||
func _on_Hurtbox_invincibility_ended():
|
||||
blinkAnimationPlayer.play("Stop")
|
||||
|
@ -812,15 +812,15 @@ states/Roll/position = Vector2(325, -25.5)
|
||||
states/Run/node = SubResource("24")
|
||||
states/Run/position = Vector2(509.5, 96.5)
|
||||
transitions = ["Run", "Idle", SubResource("25"), "Idle", "Run", SubResource("26"), "Idle", "Attack", SubResource("36"), "Attack", "Idle", SubResource("37"), "Attack", "Run", SubResource("38"), "Run", "Attack", SubResource("39"), "Roll", "Idle", SubResource("50"), "Idle", "Roll", SubResource("51")]
|
||||
graph_offset = Vector2(-10, -78)
|
||||
graph_offset = Vector2(-304, -64)
|
||||
|
||||
[sub_resource type="CapsuleShape2D" id="40"]
|
||||
radius = 6.0
|
||||
height = 12.0
|
||||
radius = 8.0
|
||||
height = 28.0
|
||||
|
||||
[sub_resource type="CapsuleShape2D" id="52"]
|
||||
radius = 5.0
|
||||
height = 14.0
|
||||
radius = 7.0
|
||||
height = 18.0
|
||||
|
||||
[sub_resource type="Animation" id="56"]
|
||||
length = 0.001
|
||||
@ -913,15 +913,17 @@ position = Vector2(0, -4)
|
||||
|
||||
[node name="SwordHitbox" parent="HitboxPivot" instance=ExtResource("3")]
|
||||
position = Vector2(15, 0)
|
||||
collision_mask = 8
|
||||
collision_layer = 2
|
||||
script = ExtResource("4")
|
||||
|
||||
[node name="CollisionShape2D" parent="HitboxPivot/SwordHitbox" index="0"]
|
||||
shape = SubResource("40")
|
||||
disabled = true
|
||||
debug_color = Color(0.993005, 0, 0.24396, 0.42)
|
||||
|
||||
[node name="Hurtbox" parent="." instance=ExtResource("5")]
|
||||
collision_layer = 4
|
||||
collision_mask = 16
|
||||
|
||||
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
|
||||
position = Vector2(0, -4)
|
||||
@ -934,7 +936,7 @@ libraries = {
|
||||
"": SubResource("AnimationLibrary_wmxcy")
|
||||
}
|
||||
|
||||
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
|
||||
[connection signal="area_entered" from="Hurtbox" to="." method="_on_hurtbox_area_entered"]
|
||||
[connection signal="invincibility_ended" from="Hurtbox" to="." method="_on_Hurtbox_invincibility_ended"]
|
||||
[connection signal="invincibility_started" from="Hurtbox" to="." method="_on_Hurtbox_invincibility_started"]
|
||||
|
||||
|
Reference in New Issue
Block a user