ultrablob/ape-ame
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
Ultrablob 2025-02-06 13:18:02 -05:00
commit 3661db1637
32 changed files with 840 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
main.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=116 format=3 uid="uid://bmd4m7lqj4v0x"]
[gd_scene load_steps=117 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"]
@ -13,6 +13,7 @@
[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="Resource" uid="uid://ba01r62bwm6av" path="res://eptagon_enemy.tres" id="9_q67ak"]
[ext_resource type="Resource" path="res://eart.tres" id="10_jib8h"]
[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="FontFile" uid="uid://bnguin7bsyx6e" path="res://Kenney Future.ttf" id="11_s4q6p"]
@ -112,23 +113,23 @@ wait_for_killed = true
[sub_resource type="Resource" id="Resource_61v84"]
script = ExtResource("4_um0x7")
enemies = Array[ExtResource("7_54h7d")]([ExtResource("9_q67ak")])
quantities = Array[int]([1])
spawning_duration = 1.0
enemies = Array[ExtResource("7_54h7d")]([ExtResource("10_jib8h"), ExtResource("3_xmk5u")])
quantities = Array[int]([1, 2])
spawning_duration = 3.0
wait = 5.0
wait_for_killed = true
[sub_resource type="Resource" id="Resource_82qld"]
script = ExtResource("4_um0x7")
enemies = Array[ExtResource("7_54h7d")]([ExtResource("3_xmk5u"), ExtResource("5_xdrk0"), ExtResource("5_e24vf")])
quantities = Array[int]([10, 10, 10])
enemies = Array[ExtResource("7_54h7d")]([ExtResource("3_xmk5u"), ExtResource("5_xdrk0"), ExtResource("5_e24vf"), ExtResource("10_jib8h")])
quantities = Array[int]([10, 10, 10, 4])
spawning_duration = 20.0
wait = 2.0
wait_for_killed = true
[sub_resource type="Resource" id="Resource_2j32b"]
script = ExtResource("4_um0x7")
enemies = Array[ExtResource("7_54h7d")]([ExtResource("5_e24vf"), ExtResource("9_q67ak")])
enemies = Array[ExtResource("7_54h7d")]([ExtResource("5_xdrk0"), ExtResource("9_q67ak")])
quantities = Array[int]([2, 2])
spawning_duration = 10.0
wait = 3.0