From dbac0cbd65402bb31c0321cd92fbe70cc3cbdfa5 Mon Sep 17 00:00:00 2001 From: ultrablob Date: Sun, 9 Feb 2025 09:46:35 -0500 Subject: [PATCH] Update spawner to not spawn where the player is going to be --- Spawner.gd | 2 ++ main.tscn | 13 ++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Spawner.gd b/Spawner.gd index de62d4c..c5b4a9b 100644 --- a/Spawner.gd +++ b/Spawner.gd @@ -62,6 +62,8 @@ func spawn(item: WaveEnemy): var test_pos = Vector2(randf(), randf()) * Vector2(1920, 1080) if not $"../CollisionCheck".is_clear(test_pos, item.check_distance): continue + if Geometry2D.segment_intersects_circle($"../Player".global_position, $"../Player".global_position + $"../Player".linear_velocity, test_pos, 250) != -1: + continue spawn_loc = test_pos break diff --git a/main.tscn b/main.tscn index c8ee704..04692fe 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=117 format=3 uid="uid://bmd4m7lqj4v0x"] +[gd_scene load_steps=116 format=3 uid="uid://bmd4m7lqj4v0x"] [ext_resource type="Script" path="res://main.gd" id="1_3dydx"] [ext_resource type="Script" path="res://Spawner.gd" id="1_ifu8g"] @@ -34,14 +34,6 @@ spawning_duration = 20.0 wait = 10.0 wait_for_killed = true -[sub_resource type="Resource" id="Resource_rpu1y"] -script = ExtResource("4_um0x7") -enemies = Array[ExtResource("7_54h7d")]([ExtResource("5_e24vf")]) -quantities = Array[int]([3]) -spawning_duration = 10.0 -wait = 2.0 -wait_for_killed = true - [sub_resource type="Resource" id="Resource_4b1vo"] script = ExtResource("4_um0x7") enemies = Array[ExtResource("7_54h7d")]([ExtResource("5_xdrk0"), ExtResource("5_e24vf")]) @@ -656,12 +648,11 @@ colors = PackedColorArray(1, 0, 0, 1, 1, 0, 0, 1) gradient = SubResource("Gradient_or5lt") [node name="Node2D" type="Node2D"] -position = Vector2(-2, -1) script = ExtResource("1_3dydx") [node name="Spawner" type="Node2D" parent="." node_paths=PackedStringArray("wave_label")] script = ExtResource("1_ifu8g") -waves = Array[ExtResource("4_um0x7")]([SubResource("Resource_eppj0"), SubResource("Resource_rpu1y"), SubResource("Resource_4b1vo"), SubResource("Resource_gg7kj"), SubResource("Resource_fjkob"), SubResource("Resource_5sdy5"), SubResource("Resource_61v84"), SubResource("Resource_82qld"), SubResource("Resource_2j32b"), SubResource("Resource_viqo8"), SubResource("Resource_o3j5s"), SubResource("Resource_cygv1")]) +waves = Array[ExtResource("4_um0x7")]([SubResource("Resource_eppj0"), SubResource("Resource_4b1vo"), SubResource("Resource_gg7kj"), SubResource("Resource_fjkob"), SubResource("Resource_5sdy5"), SubResource("Resource_61v84"), SubResource("Resource_82qld"), SubResource("Resource_2j32b"), SubResource("Resource_viqo8"), SubResource("Resource_o3j5s"), SubResource("Resource_cygv1")]) wave_label = NodePath("../UI/Wave Count") [node name="Timer" type="Timer" parent="Spawner"]