This commit is contained in:
parent
d17a2a390e
commit
d4578a5ec1
5 changed files with 11 additions and 8 deletions
|
@ -8,6 +8,9 @@ var enemies_previous = false
|
||||||
var wave_count = start_wave
|
var wave_count = start_wave
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
|
if start_wave != 0:
|
||||||
|
await get_tree().create_timer(5).timeout
|
||||||
|
waves = waves.slice(start_wave)
|
||||||
spawn_loop()
|
spawn_loop()
|
||||||
|
|
||||||
signal all_enemies_perished
|
signal all_enemies_perished
|
||||||
|
@ -20,7 +23,7 @@ func check_enemies_loop():
|
||||||
enemies_previous = has_enemies
|
enemies_previous = has_enemies
|
||||||
|
|
||||||
func spawn_loop():
|
func spawn_loop():
|
||||||
for wave in waves.slice(start_wave):
|
for wave in waves:
|
||||||
wave_count += 1
|
wave_count += 1
|
||||||
wave_label.text = "Wave %d" % wave_count
|
wave_label.text = "Wave %d" % wave_count
|
||||||
print("Starting Next Wave")
|
print("Starting Next Wave")
|
||||||
|
@ -61,6 +64,7 @@ func spawn(item: WaveEnemy):
|
||||||
break
|
break
|
||||||
|
|
||||||
if spawn_loc == Vector2.ZERO:
|
if spawn_loc == Vector2.ZERO:
|
||||||
|
print("Error! Failed to spawn enemy")
|
||||||
return
|
return
|
||||||
|
|
||||||
if not item.boss:
|
if not item.boss:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[gd_resource type="Resource" script_class="WaveEnemy" load_steps=4 format=3 uid="uid://dd8me0deake37"]
|
[gd_resource type="Resource" script_class="WaveEnemy" load_steps=4 format=3 uid="uid://ba01r62bwm6av"]
|
||||||
|
|
||||||
[ext_resource type="PackedScene" uid="uid://bda763f0fxh5k" path="res://eptagon.tscn" id="1_a0tpa"]
|
[ext_resource type="PackedScene" path="res://eptagon.tscn" id="1_a0tpa"]
|
||||||
[ext_resource type="Script" path="res://wave_enemy.gd" id="1_ueugq"]
|
[ext_resource type="Script" path="res://wave_enemy.gd" id="1_ueugq"]
|
||||||
[ext_resource type="SpriteFrames" uid="uid://cfma586cg6lul" path="res://entagon_ortal.tres" id="2_7hbx6"]
|
[ext_resource type="SpriteFrames" uid="uid://cfma586cg6lul" path="res://entagon_ortal.tres" id="2_7hbx6"]
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@ uniform float strength : hint_range(0, 1);
|
||||||
void fragment() {
|
void fragment() {
|
||||||
// Input:3
|
// Input:3
|
||||||
vec4 n_out3p0 = COLOR;
|
vec4 n_out3p0 = COLOR;
|
||||||
float n_out3p1 = n_out3p0.r;
|
|
||||||
|
|
||||||
|
|
||||||
vec3 n_out6p0;
|
vec3 n_out6p0;
|
||||||
|
@ -52,7 +51,6 @@ void fragment() {
|
||||||
|
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
graph_offset = Vector2(47.5769, 11.3144)
|
|
||||||
mode = 1
|
mode = 1
|
||||||
flags/light_only = false
|
flags/light_only = false
|
||||||
nodes/fragment/0/position = Vector2(1780, 340)
|
nodes/fragment/0/position = Vector2(1780, 340)
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
[ext_resource type="Texture2D" uid="uid://yvrhlh04k8w1" path="res://background space.png" id="6_yg4g1"]
|
[ext_resource type="Texture2D" uid="uid://yvrhlh04k8w1" path="res://background space.png" id="6_yg4g1"]
|
||||||
[ext_resource type="Script" path="res://wave_enemy.gd" id="7_54h7d"]
|
[ext_resource type="Script" path="res://wave_enemy.gd" id="7_54h7d"]
|
||||||
[ext_resource type="Texture2D" uid="uid://cwquv3mq5kk1d" path="res://countdown-spritesheet.png" id="8_e1eub"]
|
[ext_resource type="Texture2D" uid="uid://cwquv3mq5kk1d" path="res://countdown-spritesheet.png" id="8_e1eub"]
|
||||||
[ext_resource type="Resource" path="res://eptagon_enemy.tres" id="9_q67ak"]
|
[ext_resource type="Resource" uid="uid://ba01r62bwm6av" path="res://eptagon_enemy.tres" id="9_q67ak"]
|
||||||
[ext_resource type="AudioStream" uid="uid://dn65uapn0wsok" path="res://impactMetal_002.ogg" id="11_acuni"]
|
[ext_resource type="AudioStream" uid="uid://dn65uapn0wsok" path="res://impactMetal_002.ogg" id="11_acuni"]
|
||||||
[ext_resource type="Script" path="res://CollisionCheck.gd" id="11_ryeyk"]
|
[ext_resource type="Script" path="res://CollisionCheck.gd" id="11_ryeyk"]
|
||||||
[ext_resource type="FontFile" uid="uid://bnguin7bsyx6e" path="res://Kenney Future.ttf" id="11_s4q6p"]
|
[ext_resource type="FontFile" uid="uid://bnguin7bsyx6e" path="res://Kenney Future.ttf" id="11_s4q6p"]
|
||||||
|
@ -100,7 +100,7 @@ wait_for_killed = true
|
||||||
script = ExtResource("7_54h7d")
|
script = ExtResource("7_54h7d")
|
||||||
enemy = ExtResource("19_8258f")
|
enemy = ExtResource("19_8258f")
|
||||||
boss = true
|
boss = true
|
||||||
check_distance = 1
|
check_distance = 100
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_5sdy5"]
|
[sub_resource type="Resource" id="Resource_5sdy5"]
|
||||||
script = ExtResource("4_um0x7")
|
script = ExtResource("4_um0x7")
|
||||||
|
@ -669,6 +669,7 @@ script = ExtResource("1_3dydx")
|
||||||
script = ExtResource("1_ifu8g")
|
script = ExtResource("1_ifu8g")
|
||||||
waves = Array[ExtResource("4_um0x7")]([SubResource("Resource_ur7l5"), SubResource("Resource_kupyp"), SubResource("Resource_o8cet"), SubResource("Resource_0cevq"), 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")])
|
waves = Array[ExtResource("4_um0x7")]([SubResource("Resource_ur7l5"), SubResource("Resource_kupyp"), SubResource("Resource_o8cet"), SubResource("Resource_0cevq"), 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")])
|
||||||
wave_label = NodePath("../UI/Wave Count")
|
wave_label = NodePath("../UI/Wave Count")
|
||||||
|
start_wave = 9
|
||||||
|
|
||||||
[node name="Timer" type="Timer" parent="Spawner"]
|
[node name="Timer" type="Timer" parent="Spawner"]
|
||||||
wait_time = 0.1
|
wait_time = 0.1
|
||||||
|
|
|
@ -327,8 +327,8 @@ bus = &"Music"
|
||||||
[connection signal="pressed" from="Layout/Play" to="." method="play"]
|
[connection signal="pressed" from="Layout/Play" to="." method="play"]
|
||||||
[connection signal="pressed" from="Layout/Settings" to="Settings Panel" method="show"]
|
[connection signal="pressed" from="Layout/Settings" to="Settings Panel" method="show"]
|
||||||
[connection signal="pressed" from="Layout/Tutorial" to="Tutorial Text" method="show"]
|
[connection signal="pressed" from="Layout/Tutorial" to="Tutorial Text" method="show"]
|
||||||
[connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="save"]
|
|
||||||
[connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="hide"]
|
[connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="hide"]
|
||||||
|
[connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="save"]
|
||||||
[connection signal="text_changed" from="Settings Panel/Menu/Username" to="Settings Panel" method="check_valid"]
|
[connection signal="text_changed" from="Settings Panel/Menu/Username" to="Settings Panel" method="check_valid"]
|
||||||
[connection signal="text_changed" from="Settings Panel/Menu/Username" to="Settings Panel/Menu/Username" method="check"]
|
[connection signal="text_changed" from="Settings Panel/Menu/Username" to="Settings Panel/Menu/Username" method="check"]
|
||||||
[connection signal="value_changed" from="Settings Panel/Menu/MusicVolume" to="Settings Panel/Menu/MusicVolume" method="_on_value_changed"]
|
[connection signal="value_changed" from="Settings Panel/Menu/MusicVolume" to="Settings Panel/Menu/MusicVolume" method="_on_value_changed"]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue