Update spawner to not spawn where the player is going to be
This commit is contained in:
parent
4945aeb799
commit
dbac0cbd65
2 changed files with 4 additions and 11 deletions
|
@ -62,6 +62,8 @@ func spawn(item: WaveEnemy):
|
||||||
var test_pos = Vector2(randf(), randf()) * Vector2(1920, 1080)
|
var test_pos = Vector2(randf(), randf()) * Vector2(1920, 1080)
|
||||||
if not $"../CollisionCheck".is_clear(test_pos, item.check_distance):
|
if not $"../CollisionCheck".is_clear(test_pos, item.check_distance):
|
||||||
continue
|
continue
|
||||||
|
if Geometry2D.segment_intersects_circle($"../Player".global_position, $"../Player".global_position + $"../Player".linear_velocity, test_pos, 250) != -1:
|
||||||
|
continue
|
||||||
spawn_loc = test_pos
|
spawn_loc = test_pos
|
||||||
break
|
break
|
||||||
|
|
||||||
|
|
13
main.tscn
13
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://main.gd" id="1_3dydx"]
|
||||||
[ext_resource type="Script" path="res://Spawner.gd" id="1_ifu8g"]
|
[ext_resource type="Script" path="res://Spawner.gd" id="1_ifu8g"]
|
||||||
|
@ -34,14 +34,6 @@ spawning_duration = 20.0
|
||||||
wait = 10.0
|
wait = 10.0
|
||||||
wait_for_killed = true
|
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"]
|
[sub_resource type="Resource" id="Resource_4b1vo"]
|
||||||
script = ExtResource("4_um0x7")
|
script = ExtResource("4_um0x7")
|
||||||
enemies = Array[ExtResource("7_54h7d")]([ExtResource("5_xdrk0"), ExtResource("5_e24vf")])
|
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")
|
gradient = SubResource("Gradient_or5lt")
|
||||||
|
|
||||||
[node name="Node2D" type="Node2D"]
|
[node name="Node2D" type="Node2D"]
|
||||||
position = Vector2(-2, -1)
|
|
||||||
script = ExtResource("1_3dydx")
|
script = ExtResource("1_3dydx")
|
||||||
|
|
||||||
[node name="Spawner" type="Node2D" parent="." node_paths=PackedStringArray("wave_label")]
|
[node name="Spawner" type="Node2D" parent="." node_paths=PackedStringArray("wave_label")]
|
||||||
script = ExtResource("1_ifu8g")
|
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")
|
wave_label = NodePath("../UI/Wave Count")
|
||||||
|
|
||||||
[node name="Timer" type="Timer" parent="Spawner"]
|
[node name="Timer" type="Timer" parent="Spawner"]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue