Skip to content

Commit

Permalink
add more waves and levels; remove obstacles from map
Browse files Browse the repository at this point in the history
  • Loading branch information
@barribob
barribob committed Jan 20, 2024
1 parent bc93887 commit f15aff4
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 45 deletions.
80 changes: 76 additions & 4 deletions 2/run.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
[ext_resource type="Script" path="res://App/Scripts/CaptureFocus.gd" id="7_x3db4"]
[ext_resource type="Script" path="res://2/CameraFollow.gd" id="9_lsdtg"]
[ext_resource type="Script" path="res://TimerLabel.gd" id="10_mahy0"]
[ext_resource type="PackedScene" uid="uid://dusxy7p3s7x4v" path="res://environment/TheOVERWorld9.glb" id="13_rs1q1"]
[ext_resource type="Script" path="res://GameWin.gd" id="14_3y6ov"]
[ext_resource type="PackedScene" uid="uid://bkaiqxqboakgc" path="res://map.tscn" id="16_llhd8"]

[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sy8ao"]
sky_top_color = Color(0.211765, 0.313726, 0.552941, 1)
Expand Down Expand Up @@ -75,6 +75,66 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition13" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.17761, 0, -15)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition13"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition14" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.13, 0, -15)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition14"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition15" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30.2401, 0, -7.67236)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition15"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition16" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30.2401, 0, 7.18015)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition16"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition17" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.1411, 0, 15.0803)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition17"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition18" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.9063, 0, 15.0803)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition18"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition19" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.04673, 0, 15.0803)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition19"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition20" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.0457, 0, 15.0803)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition20"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition21" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29.7187, 0, 7.12932)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition21"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition22" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29.7187, 0, -6.97005)

[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/SpawnPositions/SpawnPosition22"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition9" type="Area3D" parent="Player/SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.7433, 0, -15)

Expand Down Expand Up @@ -364,6 +424,18 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 0, -15)
[node name="CollisionShape3D" type="CollisionShape3D" parent="SpawnPositions/SpawnPosition2"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition9" type="Area3D" parent="SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.8995, 0, -15)

[node name="CollisionShape3D" type="CollisionShape3D" parent="SpawnPositions/SpawnPosition9"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition10" type="Area3D" parent="SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.37549, 0, -15)

[node name="CollisionShape3D" type="CollisionShape3D" parent="SpawnPositions/SpawnPosition10"]
shape = SubResource("CylinderShape3D_gdf6h")

[node name="SpawnPosition3" type="Area3D" parent="SpawnPositions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 0, 0)

Expand Down Expand Up @@ -453,9 +525,6 @@ shape = SubResource("CylinderShape3D_gdf6h")
[node name="Environment" type="Node3D" parent="."]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)

[node name="TheOVERWorld9" parent="Environment" instance=ExtResource("13_rs1q1")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -106.3, -3.32, -140.061)

[node name="Collisions" type="Node3D" parent="Environment"]

[node name="StaticBody3D" type="StaticBody3D" parent="Environment/Collisions"]
Expand Down Expand Up @@ -657,6 +726,9 @@ transform = Transform3D(-0.999991, 0, -0.00417134, 0, 1, 0, 0.00417134, 0, -0.99
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.18774, 0, 0)
shape = SubResource("BoxShape3D_pp6dg")

[node name="TheOVERWorld9" parent="Environment" instance=ExtResource("16_llhd8")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -106, -3.3, -140)

[connection signal="player_damaged" from="Player" to="HUDLayer/HUD/MarginContainer/VBoxContainer/Health" method="_on_player_player_damaged"]
[connection signal="leveled" from="HUDLayer/HUD" to="Player" method="_on_hud_leveled"]
[connection signal="leveled" from="HUDLayer/HUD" to="UpgradesLayer/UpgradesPanel" method="leveled_up"]
Expand Down
2 changes: 1 addition & 1 deletion data/levels_data.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

[resource]
script = ExtResource("1_y86ds")
levels = Array[int]([10, 15, 22, 30, 40, 50, 75])
levels = Array[int]([10, 14, 20, 25, 32, 45, 57, 70, 80, 90, 100])
6 changes: 4 additions & 2 deletions data/waves.tres
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="EnemyWaves" load_steps=9 format=3 uid="uid://cxihbbxfrrs8t"]
[gd_resource type="Resource" script_class="EnemyWaves" load_steps=11 format=3 uid="uid://cxihbbxfrrs8t"]

[ext_resource type="Script" path="res://EnemyWaves.gd" id="1_1q0wo"]
[ext_resource type="Resource" uid="uid://dwyak2p8fd80h" path="res://data/enemy_type_1.tres" id="2_752yq"]
Expand All @@ -7,6 +7,8 @@
[ext_resource type="Resource" uid="uid://41p26cbc6pu" path="res://data/waves/enemy_spawn_2.tres" id="5_ybeyo"]
[ext_resource type="Resource" uid="uid://bmbu8uf8880bg" path="res://data/waves/enemy_spawn_1_10.tres" id="6_toc31"]
[ext_resource type="Resource" uid="uid://cnka4867awrgp" path="res://data/waves/enemy_spawn_2_10.tres" id="7_juja2"]
[ext_resource type="Resource" uid="uid://c260s38yyyjti" path="res://data/waves/enemy_spawn_1_20.tres" id="8_7lfqs"]
[ext_resource type="Resource" uid="uid://cpi6t8pi1hka0" path="res://data/waves/enemy_spawn_2_20.tres" id="9_x6j2s"]

[sub_resource type="Resource" id="Resource_x8dkp"]
script = ExtResource("3_mtume")
Expand All @@ -17,4 +19,4 @@ in_between_delay = 0.2

[resource]
script = ExtResource("1_1q0wo")
waves = Array[ExtResource("3_mtume")]([SubResource("Resource_x8dkp"), ExtResource("4_hgome"), ExtResource("4_hgome"), ExtResource("4_hgome"), ExtResource("4_hgome"), ExtResource("5_ybeyo"), ExtResource("4_hgome"), ExtResource("6_toc31"), ExtResource("5_ybeyo"), ExtResource("5_ybeyo"), ExtResource("4_hgome"), ExtResource("7_juja2"), ExtResource("6_toc31"), ExtResource("4_hgome"), ExtResource("5_ybeyo"), ExtResource("6_toc31"), ExtResource("6_toc31"), ExtResource("5_ybeyo"), ExtResource("7_juja2"), ExtResource("4_hgome"), ExtResource("6_toc31"), ExtResource("6_toc31"), ExtResource("7_juja2"), ExtResource("7_juja2"), ExtResource("7_juja2")])
waves = Array[ExtResource("3_mtume")]([SubResource("Resource_x8dkp"), ExtResource("4_hgome"), ExtResource("4_hgome"), ExtResource("4_hgome"), ExtResource("4_hgome"), ExtResource("5_ybeyo"), ExtResource("4_hgome"), ExtResource("6_toc31"), ExtResource("5_ybeyo"), ExtResource("5_ybeyo"), ExtResource("4_hgome"), ExtResource("7_juja2"), ExtResource("6_toc31"), ExtResource("4_hgome"), ExtResource("5_ybeyo"), ExtResource("6_toc31"), ExtResource("6_toc31"), ExtResource("5_ybeyo"), ExtResource("7_juja2"), ExtResource("4_hgome"), ExtResource("6_toc31"), ExtResource("6_toc31"), ExtResource("7_juja2"), ExtResource("7_juja2"), ExtResource("7_juja2"), ExtResource("4_hgome"), ExtResource("8_7lfqs"), ExtResource("6_toc31"), ExtResource("8_7lfqs"), ExtResource("6_toc31"), ExtResource("5_ybeyo"), ExtResource("6_toc31"), ExtResource("9_x6j2s"), ExtResource("7_juja2"), ExtResource("9_x6j2s"), ExtResource("8_7lfqs"), ExtResource("9_x6j2s"), ExtResource("8_7lfqs"), ExtResource("7_juja2"), ExtResource("6_toc31"), ExtResource("8_7lfqs"), ExtResource("9_x6j2s"), ExtResource("8_7lfqs"), ExtResource("9_x6j2s"), ExtResource("8_7lfqs")])
11 changes: 11 additions & 0 deletions data/waves/enemy_spawn_1_20.tres
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[gd_resource type="Resource" script_class="EnemySpawn" load_steps=3 format=3 uid="uid://c260s38yyyjti"]

[ext_resource type="Resource" uid="uid://dwyak2p8fd80h" path="res://data/enemy_type_1.tres" id="1_ckud8"]
[ext_resource type="Script" path="res://EnemySpawn.gd" id="2_t6p3x"]

[resource]
script = ExtResource("2_t6p3x")
enemy_type = ExtResource("1_ckud8")
spawn_amount = 10
initial_delay = 5.0
in_between_delay = 0.2
11 changes: 11 additions & 0 deletions data/waves/enemy_spawn_2_20.tres
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[gd_resource type="Resource" script_class="EnemySpawn" load_steps=3 format=3 uid="uid://cpi6t8pi1hka0"]

[ext_resource type="Resource" uid="uid://w7tu171byj6t" path="res://data/enemy_type_2.tres" id="1_en37n"]
[ext_resource type="Script" path="res://EnemySpawn.gd" id="2_588f4"]

[resource]
script = ExtResource("2_588f4")
enemy_type = ExtResource("1_en37n")
spawn_amount = 10
initial_delay = 5.0
in_between_delay = 0.2
2 changes: 1 addition & 1 deletion item.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ height = 0.2

[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xpy4t"]
emission_enabled = true
emission = Color(1.2, 1.2, 1.2, 1)
emission = Color(1.2, 2.00392, 1.2, 1)

[sub_resource type="SphereShape3D" id="SphereShape3D_abw1p"]
radius = 0.1
Expand Down
Loading

0 comments on commit f15aff4

Please sign in to comment.