From 74dc378791949d715b145e3362593396fdfb0daf Mon Sep 17 00:00:00 2001 From: Nitsud Yarg Date: Sun, 2 Jun 2024 13:58:49 -0700 Subject: [PATCH] Kinda have a working hit/hurtbox model again. --- src/components/Hurtbox_Component.tscn | 4 +--- src/enemyC/EnemyC.tscn | 2 ++ src/enemyC/enemyC_movement_component.gd | 2 +- src/playerC/Player-KinematicBody2D.gd | 3 ++- src/playerC/Player.tscn | 2 ++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/Hurtbox_Component.tscn b/src/components/Hurtbox_Component.tscn index 1fadb17..b41c826 100644 --- a/src/components/Hurtbox_Component.tscn +++ b/src/components/Hurtbox_Component.tscn @@ -3,8 +3,6 @@ [ext_resource path="res://src/components/Hurtbox_Component.gd" type="Script" id=1] [node name="Hurtbox_Component" type="Area2D"] -collision_layer = 16 -collision_mask = 128 script = ExtResource( 1 ) -[connection signal="body_entered" from="." to="." method="_on_Hurtbox_Component_body_entered"] +[connection signal="area_shape_entered" from="." to="." method="_on_Hurtbox_Component_area_shape_entered"] diff --git a/src/enemyC/EnemyC.tscn b/src/enemyC/EnemyC.tscn index 7c395f6..1f1fd7d 100644 --- a/src/enemyC/EnemyC.tscn +++ b/src/enemyC/EnemyC.tscn @@ -177,6 +177,8 @@ cast_to = Vector2( 21, 0 ) collision_mask = 2 [node name="Hitbox_Component" type="Area2D" parent="." index="8"] +collision_layer = 128 +collision_mask = 0 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox_Component" index="0"] modulate = Color( 1, 0.596078, 0.121569, 1 ) diff --git a/src/enemyC/enemyC_movement_component.gd b/src/enemyC/enemyC_movement_component.gd index 6bf9a26..3f42c9e 100644 --- a/src/enemyC/enemyC_movement_component.gd +++ b/src/enemyC/enemyC_movement_component.gd @@ -13,7 +13,7 @@ func process_physics(delta): stop() return if player_detector.is_colliding(): - print(owner.name, " wants to attack") + #print(owner.name, " wants to attack") stop() wants_to_attack = true return diff --git a/src/playerC/Player-KinematicBody2D.gd b/src/playerC/Player-KinematicBody2D.gd index 1b03a9e..4ef5f1d 100644 --- a/src/playerC/Player-KinematicBody2D.gd +++ b/src/playerC/Player-KinematicBody2D.gd @@ -33,4 +33,5 @@ func shoot_projectile(): #func play_sound(): # sound_effects.stream = "res://assets/Sounds/crappy pew.wav" - +func gotcha(): + print("oh! You got me.") diff --git a/src/playerC/Player.tscn b/src/playerC/Player.tscn index 9c9504c..737525a 100644 --- a/src/playerC/Player.tscn +++ b/src/playerC/Player.tscn @@ -509,6 +509,8 @@ timeout_seconds = 2.0 animation_suffix = true [node name="Hurtbox_Component" parent="." instance=ExtResource( 12 )] +collision_layer = 0 +collision_mask = 128 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox_Component"] modulate = Color( 1, 0, 0, 1 )