diff --git a/scenes/enemies/effects/enemy_effect_bleed.gd b/scenes/enemies/effects/enemy_effect_bleed.gd index 76b8fa2..1cd2601 100644 --- a/scenes/enemies/effects/enemy_effect_bleed.gd +++ b/scenes/enemies/effects/enemy_effect_bleed.gd @@ -11,14 +11,15 @@ var _enemy: EnemyBase const PUDDLE = preload("res://scenes/puddle.tscn") -func _init(enemy: EnemyBase, damage: float, duration: float): +func _init(enemy: EnemyBase, bleed_damage: float, duration: float): + damage = bleed_damage _timer = Timer.new() func apply(enemy: EnemyBase) -> void: enemy.effects.append(self) while _remaining_ticks > 0: + enemy.take_damage(damage, false) _remaining_ticks -= 1 - var tree = enemy.get_tree() await enemy.get_tree().create_timer(1.0, false, true, false).timeout var p = PUDDLE.instantiate() enemy.get_parent().add_child(p) diff --git a/scenes/main.tscn b/scenes/main.tscn index 4b5bd52..5c324f5 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -20,16 +20,16 @@ script = ExtResource("1_jyhfs") zoom = Vector2(2, 2) process_callback = 0 -[node name="Player" parent="." node_paths=PackedStringArray("camera", "main_ui") instance=ExtResource("2_0wfyh")] -position = Vector2(1057, 798) -camera = NodePath("../MainCamera") -main_ui = NodePath("../MainUI") - [node name="EnemyManager" parent="." node_paths=PackedStringArray("target", "camera") instance=ExtResource("5_tbgi4")] spawn_rate = 1.5 target = NodePath("../Player") camera = NodePath("../MainCamera") +[node name="Player" parent="." node_paths=PackedStringArray("camera", "main_ui") instance=ExtResource("2_0wfyh")] +position = Vector2(1057, 798) +camera = NodePath("../MainCamera") +main_ui = NodePath("../MainUI") + [node name="PickupMagnet" parent="." instance=ExtResource("6_tefeu")] position = Vector2(1697, 414)