From 2322d8ff622b370d88a8f20877312fba64ef844a Mon Sep 17 00:00:00 2001
From: teatov <hlebpoimenigleb@gmail.com>
Date: Tue, 25 Feb 2025 04:05:40 +1000
Subject: [PATCH] make projectiles get destroyed when colliding with player

---
 scenes/player.tscn                 |  1 +
 scenes/projectiles/projectile.tscn |  4 ++--
 scripts/player/player_attack.gd    |  4 ++--
 scripts/player/player_movement.gd  |  2 +-
 scripts/projectiles/projectile.gd  | 10 +++++++++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/scenes/player.tscn b/scenes/player.tscn
index 0dafa50..fbf1c00 100644
--- a/scenes/player.tscn
+++ b/scenes/player.tscn
@@ -39,6 +39,7 @@ node_connections = [&"output", 0, &"StateMachine"]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_apl1i"]
 height = 1.8
+radius = 0.35
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_qsqht"]
 height = 0.5
diff --git a/scenes/projectiles/projectile.tscn b/scenes/projectiles/projectile.tscn
index 533877e..be9b2b5 100644
--- a/scenes/projectiles/projectile.tscn
+++ b/scenes/projectiles/projectile.tscn
@@ -10,10 +10,10 @@ radius = 0.25
 radius = 0.25
 height = 0.5
 
-[node name="Projectile" type="AnimatableBody3D"]
+[node name="Projectile" type="Area3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 collision_layer = 32
-collision_mask = 32
+collision_mask = 48
 script = ExtResource("1_kv6x5")
 _collision_debug_material = ExtResource("2_b024o")
 
diff --git a/scripts/player/player_attack.gd b/scripts/player/player_attack.gd
index 4de0964..0c3c83a 100644
--- a/scripts/player/player_attack.gd
+++ b/scripts/player/player_attack.gd
@@ -37,7 +37,7 @@ var _swoop_effect_timer: float
 func _ready() -> void:
 	Debugger.add_event("attacked")
 	attacked.connect(func() -> void: Debugger.event_emitted("attacked", []))
-	body_entered.connect(_on_body_entered)
+	area_entered.connect(_on_area_entered)
 
 	position.y = Projectile.HEIGHT
 	_set_collision_size(_attack_radius)
@@ -159,7 +159,7 @@ func _set_collision_size(radius: float) -> void:
 	_swoop_mesh.height = radius
 
 
-func _on_body_entered(node: Node3D) -> void:
+func _on_area_entered(node: Node3D) -> void:
 	if _hit_window_timer <= 0:
 		return
 
diff --git a/scripts/player/player_movement.gd b/scripts/player/player_movement.gd
index 2e141eb..8267d90 100644
--- a/scripts/player/player_movement.gd
+++ b/scripts/player/player_movement.gd
@@ -1,7 +1,7 @@
 class_name PlayerMovement
 extends RefCounted
 
-@export var _move_speed: float = 10
+@export var _move_speed: float = 8
 @export var _move_acceleration: float = 100
 @export var _move_deceleration: float = 50
 
diff --git a/scripts/projectiles/projectile.gd b/scripts/projectiles/projectile.gd
index 5f29e8f..607e4c6 100644
--- a/scripts/projectiles/projectile.gd
+++ b/scripts/projectiles/projectile.gd
@@ -1,5 +1,5 @@
 class_name Projectile
-extends AnimatableBody3D
+extends Area3D
 
 const HEIGHT: float = 1
 
@@ -19,6 +19,7 @@ func _ready() -> void:
 	_debug_collision_shapes.init(get_children(), self, _collision_debug_material)
 	global_position = _start_position
 	global_position.y = HEIGHT
+	body_entered.connect(_on_body_entered)
 
 
 func _physics_process(delta: float) -> void:
@@ -37,3 +38,10 @@ func init(velocity: Vector3, start_position: Vector3, lifetime: float = 10) -> v
 
 func set_velocity(velocity: Vector3) -> void:
 	_velocity = velocity
+
+
+func _on_body_entered(node: Node3D) -> void:
+	if node is not Player:
+		return
+
+	queue_free()