From ed8dd0ad8348a8999f916c3a30f977b7b4465187 Mon Sep 17 00:00:00 2001 From: Eduardo Date: Thu, 9 May 2024 14:10:40 +0200 Subject: [PATCH] renamed some layers and added a killzone to delete stray bullets --- components/base_bullet/BaseBullet.tscn | 2 ++ components/base_enemy/BaseEnemy.tscn | 2 ++ project.godot | 6 ++++++ scenes/base_level/BaseLevel.tscn | 10 ++++++++++ scenes/base_level/base_level.gd | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/components/base_bullet/BaseBullet.tscn b/components/base_bullet/BaseBullet.tscn index 6f689d6..0971c5b 100644 --- a/components/base_bullet/BaseBullet.tscn +++ b/components/base_bullet/BaseBullet.tscn @@ -6,6 +6,8 @@ radius = 4.96679 [node name="BaseBullet" type="Area2D"] +collision_layer = 4 +collision_mask = 514 script = ExtResource("1_0faoa") [node name="Polygon2D" type="Polygon2D" parent="."] diff --git a/components/base_enemy/BaseEnemy.tscn b/components/base_enemy/BaseEnemy.tscn index a1cab8c..40d512a 100644 --- a/components/base_enemy/BaseEnemy.tscn +++ b/components/base_enemy/BaseEnemy.tscn @@ -5,6 +5,8 @@ [sub_resource type="CircleShape2D" id="CircleShape2D_tsbn1"] [node name="BaseEnemy" type="CharacterBody2D"] +collision_layer = 2 +collision_mask = 513 script = ExtResource("1_j54ho") [node name="Polygon2D" type="Polygon2D" parent="."] diff --git a/project.godot b/project.godot index 3f66e42..88b84ad 100644 --- a/project.godot +++ b/project.godot @@ -86,6 +86,12 @@ ui_down={ ] } +[layer_names] + +2d_physics/layer_2="Enemy Layer" +2d_physics/layer_3="Bullets" +2d_physics/layer_10="KillZone" + [rendering] renderer/rendering_method="mobile" diff --git a/scenes/base_level/BaseLevel.tscn b/scenes/base_level/BaseLevel.tscn index 1bf6c54..1c14aa7 100644 --- a/scenes/base_level/BaseLevel.tscn +++ b/scenes/base_level/BaseLevel.tscn @@ -50,3 +50,13 @@ player = NodePath("../../Player") [node name="BaseEnemy9" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("3_5olto")] position = Vector2(1720, 1328) player = NodePath("../../Player") + +[node name="KillZone" type="Area2D" parent="."] +collision_layer = 512 +collision_mask = 5 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="KillZone"] +position = Vector2(-8, 56) +polygon = PackedVector2Array(-152, -152, -112, 1240, 2024, 1264, 2000, -160, -192, -168, -344, -272, 2152, -232, 2096, 1384, -168, 1352, -352, -272) + +[connection signal="area_entered" from="KillZone" to="." method="_on_kill_zone_area_entered"] diff --git a/scenes/base_level/base_level.gd b/scenes/base_level/base_level.gd index 58577cf..fd2bbee 100644 --- a/scenes/base_level/base_level.gd +++ b/scenes/base_level/base_level.gd @@ -9,3 +9,8 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): pass + + +# to remove stray bullets mainly +func _on_kill_zone_area_entered(area: Area2D): + area.queue_free() -- 2.30.2