From ad5d9b8d825c62997e33d86ccaf30de963ff1904 Mon Sep 17 00:00:00 2001 From: Varylios Date: Sun, 14 Sep 2025 11:38:05 +0200 Subject: [PATCH] fix: james sigth + improve collision management --- Assets/Skybox/sky.tres | 2 +- Enemies/Scenes/boss-james.tscn | 2 +- Enemies/enemy.gd | 2 -- Enemies/enemy.tscn | 3 +++ Towers/Tower.gd | 11 +++++------ Towers/tower.tscn | 3 +++ 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Assets/Skybox/sky.tres b/Assets/Skybox/sky.tres index 1c2a273..c579853 100644 --- a/Assets/Skybox/sky.tres +++ b/Assets/Skybox/sky.tres @@ -6,7 +6,7 @@ sky_top_color = Color(0.560784, 0.658824, 0.886275, 1) sky_horizon_color = Color(0.686275, 0.737255, 0.870588, 1) sky_cover = ExtResource("1_ll0pl") -ground_bottom_color = Color(0.188235, 0.529412, 0.490196, 1) +ground_bottom_color = Color(0.0941176, 0.403922, 0.376471, 1) ground_horizon_color = Color(0.686275, 0.737255, 0.870588, 1) [resource] diff --git a/Enemies/Scenes/boss-james.tscn b/Enemies/Scenes/boss-james.tscn index 979683c..72c2e7f 100644 --- a/Enemies/Scenes/boss-james.tscn +++ b/Enemies/Scenes/boss-james.tscn @@ -20,7 +20,7 @@ metadata/_custom_type_script = "uid://ddgbr0n8kic3y" viewport_path = NodePath("Enemy/HealthBar3D/SubViewport") [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_tviqb"] -points = PackedVector3Array(0, 0, 0, -2, 1, 3, 2, 1, 3, 2, 0, 3, -2, 0, 3) +points = PackedVector3Array(0, 0, 0, -1.5, 1, -3, 1.5, 1, -3, 1.5, 0, -3, -1.5, 0, -3) [node name="PathFollow3D" instance=ExtResource("1_ohyx6")] diff --git a/Enemies/enemy.gd b/Enemies/enemy.gd index 9acc56f..d5d0073 100644 --- a/Enemies/enemy.gd +++ b/Enemies/enemy.gd @@ -28,8 +28,6 @@ var is_alive : bool = true func _ready() -> void: healthBar.max_value = max_life - $CubeAttackRange.body_entered.connect(onAttackRangeBodyEntered) - $CubeAttackRange.body_exited.connect(onAttackRangeBodyExited) func _physics_process(delta: float) -> void: diff --git a/Enemies/enemy.tscn b/Enemies/enemy.tscn index 7d4b9d4..87c3ceb 100644 --- a/Enemies/enemy.tscn +++ b/Enemies/enemy.tscn @@ -79,3 +79,6 @@ debug_color = Color(0.994297, 0, 0.224345, 0.42) [node name="AttackCooldown" type="Timer" parent="Enemy"] wait_time = 4.0 one_shot = true + +[connection signal="body_entered" from="Enemy/CubeAttackRange" to="Enemy" method="onAttackRangeBodyEntered"] +[connection signal="body_exited" from="Enemy/CubeAttackRange" to="Enemy" method="onAttackRangeBodyExited"] diff --git a/Towers/Tower.gd b/Towers/Tower.gd index 722a68d..c8e4fe5 100644 --- a/Towers/Tower.gd +++ b/Towers/Tower.gd @@ -161,13 +161,12 @@ func onBodyExited(body: Node3D) -> void: func toggleConnection(activate : bool) -> void: - if activate && not $Range.body_entered.is_connected(onBodyEntered): - $Range.body_entered.connect(onBodyEntered) - $Range.body_exited.connect(onBodyExited) + if activate: + $Range.monitorable = true + $Range.monitoring = true else: - if $Range.body_entered.is_connected(onBodyEntered): - $Range.body_entered.disconnect(onBodyEntered) - $Range.body_exited.disconnect(onBodyExited) + $Range.monitorable = false + $Range.monitoring = false availableTargets.clear() diff --git a/Towers/tower.tscn b/Towers/tower.tscn index bdb254b..7a564f9 100644 --- a/Towers/tower.tscn +++ b/Towers/tower.tscn @@ -92,3 +92,6 @@ metadata/_custom_type_script = "uid://blnmjxmusrsa7" [node name="PriceTag" type="Label3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) billboard = 2 + +[connection signal="body_entered" from="Range" to="." method="onBodyEntered"] +[connection signal="body_exited" from="Range" to="." method="onBodyExited"]