diff --git a/Enemies/Dark Matter.gd b/Enemies/Dark Matter.gd index 3ddba5e..dfbe877 100644 --- a/Enemies/Dark Matter.gd +++ b/Enemies/Dark Matter.gd @@ -9,7 +9,7 @@ var speed : = 0.5 var position_tracker = 0.0 var player = null var obstacle = null -var DisplayValue = 10 +var DisplayValue = 5 var health: int = 2 # Called when the node enters the scene tree for the first time. func _ready() -> void: diff --git a/Enemies/Dark Matter.tscn b/Enemies/Dark Matter.tscn index b97f4ef..1f55be0 100644 --- a/Enemies/Dark Matter.tscn +++ b/Enemies/Dark Matter.tscn @@ -15,7 +15,9 @@ extents = Vector2( 5.48996, 5.06427 ) [sub_resource type="RectangleShape2D" id=4] extents = Vector2( 5.50204, 4.89798 ) -[node name="Dark Matter" type="KinematicBody2D"] +[node name="Dark Matter" type="KinematicBody2D" groups=[ +"enemy", +]] collision_layer = 2 collision_mask = 6 script = ExtResource( 2 ) @@ -42,11 +44,13 @@ shape = SubResource( 3 ) [node name="Timer" type="Timer" parent="."] -[node name="Hitbox" type="Area2D" parent="."] +[node name="Dark_hitbox" type="Area2D" parent="." groups=[ +"enemy_hitbox_1", +]] collision_layer = 4 collision_mask = 2 -[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Dark_hitbox"] shape = SubResource( 4 ) [connection signal="body_entered" from="Player_detect" to="." method="_on_Player_detect_body_entered"] @@ -54,4 +58,4 @@ shape = SubResource( 4 ) [connection signal="body_entered" from="Star_detect" to="." method="_on_Star_detect_body_entered"] [connection signal="body_exited" from="Star_detect" to="." method="_on_Star_detect_body_exited"] [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] -[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] +[connection signal="area_entered" from="Dark_hitbox" to="." method="_on_Hitbox_area_entered"] diff --git a/Levels/Level 1.tscn b/Levels/Level 1.tscn index 4294265..ada78df 100644 --- a/Levels/Level 1.tscn +++ b/Levels/Level 1.tscn @@ -36,7 +36,6 @@ limit_bottom = 225 [node name="Dark Matter" parent="YSort/Enemies" instance=ExtResource( 6 )] position = Vector2( 97.0154, 82.0323 ) -collision_mask = 0 [node name="Dark Matter2" parent="YSort/Enemies" instance=ExtResource( 6 )] position = Vector2( 205.006, 50.8542 )