enemies are now inside a node to order the node tree

diff --git a/components/player/player.gd b/components/player/player.gd
index e98e07d403d872dc8b04bfba8b2fbc2e379db3da..34443ef4c09505690c8a75a015d7455a851ff2b3 100644 (file)
--- a/components/player/player.gd
+++ b/components/player/player.gd
@@ -4,6 +4,7 @@ extends CharacterBody2D
 const SPEED = 300.0
 var fire_timer: Timer
 var nearest_enemy: Node2D
+@export var Enemies: Node
 
 func _init():
        fire_timer = Timer.new()
@@ -17,7 +18,7 @@ func _init():
 func _process(delta):
        var nearest_node: Node2D
 
-       for node in get_parent().get_children():
+       for node in Enemies.get_children():
                if node is CharacterBody2D:
                        if node.name.to_lower().contains("enemy"):
                                if !nearest_node:
@@ -47,7 +48,7 @@ func _physics_process(_delta):
 func on_fire_timer_timeout():
        if nearest_enemy:
                var bullet = load(Constants.BaseBullet_path)
-               var bullet_instance = bullet.instantiate() as CharacterBody2D
+               var bullet_instance = bullet.instantiate() as Area2D
                get_parent().add_child(bullet_instance)
                var n2d = Node2D.new()
                n2d.position = position

diff --git a/scenes/base_level/BaseLevel.tscn b/scenes/base_level/BaseLevel.tscn
index c6025fc5ff130381a2daf24ffc45c2000344c5ad..1bf6c540c49b28091f2c9e38282bd118cbc81fe0 100644 (file)
--- a/scenes/base_level/BaseLevel.tscn
+++ b/scenes/base_level/BaseLevel.tscn
@@ -9,41 +9,44 @@ script = ExtResource("1_3skoo")
 
 [node name="TileMapLayer" type="TileMapLayer" parent="."]
 
-[node name="Player" parent="." instance=ExtResource("2_bnj2l")]
+[node name="Player" parent="." node_paths=PackedStringArray("Enemies") instance=ExtResource("2_bnj2l")]
 position = Vector2(960, 540)
+Enemies = NodePath("../Enemies")
 
-[node name="BaseEnemy" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="Enemies" type="Node" parent="."]
+
+[node name="BaseEnemy" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(1200, 440)
-player = NodePath("../Player")
+player = NodePath("../../Player")
 
-[node name="BaseEnemy2" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="BaseEnemy2" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(1824, 72)
-player = NodePath("../Player")
+player = NodePath("../../Player")
 
-[node name="BaseEnemy3" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="BaseEnemy3" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(168, 640)
-player = NodePath("../Player")
+player = NodePath("../../Player")
 
-[node name="BaseEnemy4" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="BaseEnemy4" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(616, 168)
-player = NodePath("../Player")
+player = NodePath("../../Player")
 
-[node name="BaseEnemy5" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="BaseEnemy5" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(-88, 160)
-player = NodePath("../Player")
+player = NodePath("../../Player")
 
-[node name="BaseEnemy6" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="BaseEnemy6" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(2144, 960)
-player = NodePath("../Player")
+player = NodePath("../../Player")
 
-[node name="BaseEnemy7" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="BaseEnemy7" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(2152, 1128)
-player = NodePath("../Player")
+player = NodePath("../../Player")
 
-[node name="BaseEnemy8" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="BaseEnemy8" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(2000, 1256)
-player = NodePath("../Player")
+player = NodePath("../../Player")
 
-[node name="BaseEnemy9" parent="." node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
+[node name="BaseEnemy9" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")]
 position = Vector2(1720, 1328)
-player = NodePath("../Player")
+player = NodePath("../../Player")