From bfe71e4908c5a8ec5c980be0f38ba877ce96105f Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 11 Dec 2025 10:30:38 +0000 Subject: [PATCH] Updated damage signal to player. --- enemy_bullet.gd | 8 +++----- enemy_bullet.tscn | 2 +- player.gd | 13 +++++++++++++ player.tscn | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/enemy_bullet.gd b/enemy_bullet.gd index 20f5208..37666af 100644 --- a/enemy_bullet.gd +++ b/enemy_bullet.gd @@ -1,7 +1,9 @@ extends Area2D + + + @export var speed = 150 -var shader_active = false func start(pos): position = pos @@ -15,8 +17,4 @@ func _on_visible_on_screen_notifier_2d_screen_exited(): func _on_area_entered(area): if area.name == "Player": queue_free() - shader_active = true - $Player.ship.material.set_shader_param("toggle", 1.0) - shader_active = false - $Player.ship.material.set_shader_param("toggle", 0.0) area.shield -= 1 diff --git a/enemy_bullet.tscn b/enemy_bullet.tscn index b75dc54..5a50c7f 100644 --- a/enemy_bullet.tscn +++ b/enemy_bullet.tscn @@ -6,7 +6,7 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_gl7bs"] size = Vector2(6, 6) -[node name="EnemyBullet" type="Area2D"] +[node name="EnemyBullet" type="Area2D" groups=["enemy_bullets"]] script = ExtResource("1_gl7bs") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/player.gd b/player.gd index 528b2e0..6982af5 100644 --- a/player.gd +++ b/player.gd @@ -2,6 +2,9 @@ extends Area2D signal died signal shield_changed +signal damage_taken + +var shader_active = false @onready var screensize = get_viewport_rect().size @export var max_shield = 10 @@ -63,3 +66,13 @@ func _on_area_entered(area): if area.is_in_group("enemies"): area.explode() shield -= max_shield / 2 + if area.is_in_group("enemy_bullets"): + damage_taken.emit() + + +func _on_damage_taken() -> void: + shader_active = true + $Ship.material.set_shader_parameter("toggle", 1.0) + await get_tree().create_timer(1).timeout + shader_active = false + $Ship.material.set_shader_parameter("toggle", 0.0) diff --git a/player.tscn b/player.tscn index 6adc0f5..3bc0209 100644 --- a/player.tscn +++ b/player.tscn @@ -99,4 +99,5 @@ shape = SubResource("RectangleShape2D_op7ga") one_shot = true [connection signal="area_entered" from="." to="." method="_on_area_entered"] +[connection signal="damage_taken" from="." to="." method="_on_damage_taken"] [connection signal="timeout" from="GunCooldown" to="." method="_on_gun_cool_down_timeout"]