diff --git a/Enemies/Scenes/enemy-a.tscn b/Enemies/Scenes/enemy-a.tscn index 48ed804..932fab0 100644 --- a/Enemies/Scenes/enemy-a.tscn +++ b/Enemies/Scenes/enemy-a.tscn @@ -7,5 +7,8 @@ viewport_path = NodePath("Enemy/HealthBar3D/SubViewport") [node name="PathFollow3D" instance=ExtResource("1_etkvv")] +[node name="Enemy" parent="." index="0"] +max_life = 6 + [node name="HealthBar3D" parent="Enemy" index="2"] texture = SubResource("ViewportTexture_iay87") diff --git a/Enemies/Scenes/enemy-b.tscn b/Enemies/Scenes/enemy-b.tscn index 99239e8..4e61b11 100644 --- a/Enemies/Scenes/enemy-b.tscn +++ b/Enemies/Scenes/enemy-b.tscn @@ -10,7 +10,7 @@ viewport_path = NodePath("Enemy/HealthBar3D/SubViewport") [node name="Enemy" parent="." index="0"] max_life = 20 -money = 10 +money = 25 [node name="Sprite3D" parent="Enemy" index="1"] texture = ExtResource("2_1clf0") diff --git a/Enemies/enemy.tscn b/Enemies/enemy.tscn index d3ecd76..9dde331 100644 --- a/Enemies/enemy.tscn +++ b/Enemies/enemy.tscn @@ -44,7 +44,6 @@ vframes = 22 [node name="HealthBar3D" type="Sprite3D" parent="Enemy"] transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0.33, 0) -visible = false billboard = 2 texture = SubResource("ViewportTexture_cmo2f") diff --git a/Levels/Map 1/level_1.tres b/Levels/Map 1/level_1.tres index 7d9bd05..fb96a81 100644 --- a/Levels/Map 1/level_1.tres +++ b/Levels/Map 1/level_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="Level" load_steps=11 format=3 uid="uid://ob41fnhkjr3o"] +[gd_resource type="Resource" script_class="Level" load_steps=12 format=3 uid="uid://ob41fnhkjr3o"] [ext_resource type="Script" uid="uid://cuhq6u67cbbqm" path="res://Levels/Scripts/Resource/Level.gd" id="1_ftl6b"] [ext_resource type="Script" uid="uid://chu8s12rtdeqx" path="res://Levels/Scripts/Resource/Wave.gd" id="2_457yt"] @@ -12,49 +12,53 @@ lane_to_spawn = 0 spawn_delay = 2.0 metadata/_custom_type_script = "uid://blxx3vs2wnfet" -[sub_resource type="Resource" id="Resource_e6yyc"] -script = ExtResource("3_ub8wd") -enemy = "res://Enemies/Scenes/enemy-a.tscn" -number_to_spawn = 1 -lane_to_spawn = 0 -spawn_delay = 1.5 - -[sub_resource type="Resource" id="Resource_fhv1k"] -script = ExtResource("3_ub8wd") -enemy = "res://Enemies/Scenes/enemy-a.tscn" -number_to_spawn = 1 -lane_to_spawn = 0 -spawn_delay = 1.5 - [sub_resource type="Resource" id="Resource_457yt"] script = ExtResource("2_457yt") -troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_87wss"), SubResource("Resource_e6yyc"), SubResource("Resource_fhv1k")]) +troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_87wss")]) metadata/_custom_type_script = "uid://chu8s12rtdeqx" [sub_resource type="Resource" id="Resource_qfjse"] script = ExtResource("3_ub8wd") -enemy = "res://Enemies/Scenes/enemy-a.tscn" -number_to_spawn = 3 -lane_to_spawn = 0 -spawn_delay = 2.0 - -[sub_resource type="Resource" id="Resource_ftl6b"] -script = ExtResource("3_ub8wd") -enemy = "res://Enemies/Scenes/enemy-a.tscn" -number_to_spawn = 6 +enemy = "uid://1kwye5yjf40d" +number_to_spawn = 2 lane_to_spawn = 0 spawn_delay = 1.0 +[sub_resource type="Resource" id="Resource_ftl6b"] +script = ExtResource("3_ub8wd") +enemy = "uid://1kwye5yjf40d" +number_to_spawn = 2 +lane_to_spawn = 0 +spawn_delay = 2.0 + +[sub_resource type="Resource" id="Resource_e6yyc"] +script = ExtResource("3_ub8wd") +enemy = "uid://1kwye5yjf40d" +number_to_spawn = 5 +lane_to_spawn = 0 +spawn_delay = 10.0 + [sub_resource type="Resource" id="Resource_qeljc"] script = ExtResource("2_457yt") -troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_qfjse"), SubResource("Resource_ftl6b")]) +troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_qfjse"), SubResource("Resource_ftl6b"), SubResource("Resource_e6yyc")]) + +[sub_resource type="Resource" id="Resource_fhv1k"] +script = ExtResource("3_ub8wd") +enemy = "uid://r6tj7jprdqib" +number_to_spawn = 1 +lane_to_spawn = 0 +spawn_delay = 1.0 + +[sub_resource type="Resource" id="Resource_46oi2"] +script = ExtResource("2_457yt") +troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_fhv1k"), SubResource("Resource_qfjse"), SubResource("Resource_ftl6b"), SubResource("Resource_e6yyc")]) [resource] script = ExtResource("1_ftl6b") auto_start = false auto_launch_wave = false -allowedTowers = Array[int]([1, 2, 3, 4]) +allowedTowers = Array[int]([1, 2, 3]) laneCount = 1 -startingMoney = 999 -waves = Array[ExtResource("2_457yt")]([SubResource("Resource_457yt"), SubResource("Resource_qeljc")]) +startingMoney = 110 +waves = Array[ExtResource("2_457yt")]([SubResource("Resource_457yt"), SubResource("Resource_qeljc"), SubResource("Resource_46oi2")]) metadata/_custom_type_script = "uid://cuhq6u67cbbqm" diff --git a/Levels/Map 2/level_2.tres b/Levels/Map 2/level_2.tres index e726623..9bcd0e9 100644 --- a/Levels/Map 2/level_2.tres +++ b/Levels/Map 2/level_2.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="Level" load_steps=7 format=3 uid="uid://hlv6kd67wipi"] +[gd_resource type="Resource" script_class="Level" load_steps=9 format=3 uid="uid://hlv6kd67wipi"] [ext_resource type="Script" uid="uid://cuhq6u67cbbqm" path="res://Levels/Scripts/Resource/Level.gd" id="1_e3k30"] [ext_resource type="Script" uid="uid://chu8s12rtdeqx" path="res://Levels/Scripts/Resource/Wave.gd" id="2_8ao5l"] @@ -22,9 +22,22 @@ spawn_delay = 1.0 script = ExtResource("2_8ao5l") troops = Array[ExtResource("3_7ih4a")]([SubResource("Resource_7ih4a"), SubResource("Resource_m8w28")]) +[sub_resource type="Resource" id="Resource_6pq2u"] +script = ExtResource("3_7ih4a") +enemy = "res://enemies/" +number_to_spawn = 1 +lane_to_spawn = 0 +spawn_delay = 1.0 + +[sub_resource type="Resource" id="Resource_i83jv"] +script = ExtResource("2_8ao5l") +troops = Array[ExtResource("3_7ih4a")]([SubResource("Resource_6pq2u")]) + [resource] script = ExtResource("1_e3k30") -waves = Array[ExtResource("2_8ao5l")]([SubResource("Resource_t4hlm")]) auto_start = false +auto_launch_wave = false allowedTowers = Array[int]([]) laneCount = 2 +startingMoney = 0 +waves = Array[ExtResource("2_8ao5l")]([SubResource("Resource_t4hlm"), SubResource("Resource_i83jv")]) diff --git a/Towers/Scenes/aline.tscn b/Towers/Scenes/aline.tscn index 17e5824..96d1db9 100644 --- a/Towers/Scenes/aline.tscn +++ b/Towers/Scenes/aline.tscn @@ -2,7 +2,6 @@ [ext_resource type="PackedScene" uid="uid://trg7ag3dqr2l" path="res://Towers/tower.tscn" id="1_gvvig"] [ext_resource type="Texture2D" uid="uid://cob1lydkirn20" path="res://Assets/Icones/raccoon-head.svg" id="3_6h033"] -[ext_resource type="Script" uid="uid://bg0x4egeu17qb" path="res://Upgrades/TowerUpgrade.gd" id="3_p2nb1"] [ext_resource type="Script" uid="uid://ddgbr0n8kic3y" path="res://Towers/Projectiles/ProjectileResource.gd" id="4_ck6a3"] [ext_resource type="Texture2D" uid="uid://315k07rsgf6t" path="res://Assets/Characters/Female1.png" id="5_l514g"] [ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="5_lhd8w"] @@ -13,7 +12,7 @@ radius = 1.0 [sub_resource type="Resource" id="Resource_lhd8w"] script = ExtResource("4_ck6a3") speed = 5 -damage = 10 +damage = 6 maxTargets = 1 type = 1 allowedTargets = 1 @@ -24,6 +23,9 @@ metadata/_custom_type_script = "uid://ddgbr0n8kic3y" [sub_resource type="SphereShape3D" id="SphereShape3D_6bcjo"] radius = 3.0 +[sub_resource type="ViewportTexture" id="ViewportTexture_gjbai"] +viewport_path = NodePath("EnergyBar3D/SubViewport") + [node name="Aline" instance=ExtResource("1_gvvig")] tower_name = "Aline" type = 2 @@ -34,8 +36,10 @@ projectileRessource = SubResource("Resource_lhd8w") towerRange = SubResource("SphereShape3D_6bcjo") action_cooldown = 2.5 energy_cost = 25.0 -tower_shop = Array[ExtResource("3_p2nb1")]([]) [node name="Sprite3D" parent="." index="5"] texture = ExtResource("5_l514g") frame = 10 + +[node name="EnergyBar3D" parent="." index="6"] +texture = SubResource("ViewportTexture_gjbai") diff --git a/Towers/Scenes/maxence.tscn b/Towers/Scenes/maxence.tscn index 4358423..750111a 100644 --- a/Towers/Scenes/maxence.tscn +++ b/Towers/Scenes/maxence.tscn @@ -3,7 +3,6 @@ [ext_resource type="PackedScene" uid="uid://trg7ag3dqr2l" path="res://Towers/tower.tscn" id="1_laam8"] [ext_resource type="Script" uid="uid://ddgbr0n8kic3y" path="res://Towers/Projectiles/ProjectileResource.gd" id="2_7fox5"] [ext_resource type="Texture2D" uid="uid://boxdrq4nrq7hv" path="res://Assets/Icones/flamingo.svg" id="2_sciv6"] -[ext_resource type="Script" uid="uid://bg0x4egeu17qb" path="res://Upgrades/TowerUpgrade.gd" id="4_l8w4i"] [sub_resource type="SphereShape3D" id="SphereShape3D_sciv6"] radius = 0.2 @@ -21,6 +20,9 @@ metadata/_custom_type_script = "uid://ddgbr0n8kic3y" [sub_resource type="SphereShape3D" id="SphereShape3D_pw4mj"] radius = 10.0 +[sub_resource type="ViewportTexture" id="ViewportTexture_7fox5"] +viewport_path = NodePath("EnergyBar3D/SubViewport") + [node name="Maxence" instance=ExtResource("1_laam8")] tower_name = "Maxence" type = 3 @@ -30,9 +32,14 @@ price = 200 projectileRessource = SubResource("Resource_sciv6") towerRange = SubResource("SphereShape3D_pw4mj") action_cooldown = 3.0 -energy_regen = 20.0 +max_energy = 50.0 energy_cost = 25.0 -tower_shop = Array[ExtResource("4_l8w4i")]([]) [node name="Sprite3D" parent="." index="5"] frame = 8 + +[node name="EnergyBar3D" parent="." index="6"] +texture = SubResource("ViewportTexture_7fox5") + +[node name="EnergyBar2D" parent="EnergyBar3D/SubViewport" index="0"] +max_value = 50.0 diff --git a/Towers/Scenes/pierre.tscn b/Towers/Scenes/pierre.tscn index c9f5e3b..4299a4a 100644 --- a/Towers/Scenes/pierre.tscn +++ b/Towers/Scenes/pierre.tscn @@ -9,8 +9,8 @@ [sub_resource type="Resource" id="Resource_r52mr"] script = ExtResource("3_5tgsk") -speed = 20 -damage = 5 +speed = 15 +damage = 2 maxTargets = 1 type = 0 allowedTargets = 1 @@ -18,7 +18,7 @@ sprite = ExtResource("4_r52mr") metadata/_custom_type_script = "uid://ddgbr0n8kic3y" [sub_resource type="SphereShape3D" id="SphereShape3D_c55ds"] -radius = 5.0 +radius = 2.0 [sub_resource type="Resource" id="Resource_yyqap"] script = ExtResource("5_wvh05") @@ -84,7 +84,7 @@ icone = ExtResource("2_lcjqw") projectileRessource = SubResource("Resource_r52mr") towerRange = SubResource("SphereShape3D_c55ds") action_cooldown = 1.0 -max_energy = 50.0 +max_energy = 25.0 energy_regen = 5.0 energy_cost = 2.0 upgrades = Array[ExtResource("5_wvh05")]([SubResource("Resource_yyqap"), SubResource("Resource_556ww"), SubResource("Resource_wvh05"), SubResource("Resource_wnw3f")]) @@ -93,4 +93,4 @@ upgrades = Array[ExtResource("5_wvh05")]([SubResource("Resource_yyqap"), SubReso texture = SubResource("ViewportTexture_r52mr") [node name="EnergyBar2D" parent="EnergyBar3D/SubViewport" index="0"] -max_value = 50.0 +max_value = 25.0 diff --git a/UI/defeat_screen.gd b/UI/defeat_screen.gd index f8a7743..a7f89ce 100644 --- a/UI/defeat_screen.gd +++ b/UI/defeat_screen.gd @@ -2,4 +2,4 @@ extends Control class_name DefeatScreen func _on_timer_timeout() -> void: - get_tree().change_scene_to_file("res://UI/start_menu.tscn") + Transition.goto("res://UI/start_menu.tscn") diff --git a/UI/win_screen.gd b/UI/win_screen.gd index 212c688..d17960a 100644 --- a/UI/win_screen.gd +++ b/UI/win_screen.gd @@ -2,4 +2,4 @@ extends Control class_name WinScreen func _on_timer_timeout() -> void: - get_tree().change_scene_to_file("res://UI/start_menu.tscn") + Transition.goto("res://UI/start_menu.tscn") diff --git a/project.godot b/project.godot index 0a07402..659aa07 100644 --- a/project.godot +++ b/project.godot @@ -8,6 +8,19 @@ config_version=5 +[addons] + +resources_spreadsheet_view/array_color_tint=100.0 +resources_spreadsheet_view/color_rows=true +resources_spreadsheet_view/array_min_width=128.0 +resources_spreadsheet_view/resource_preview_size=32.0 +resources_spreadsheet_view/clip_headers=false +resources_spreadsheet_view/dupe_arrays=true +resources_spreadsheet_view/context_menu_on_leftclick=false +resources_spreadsheet_view/fold_docks=true +resources_spreadsheet_view/resource_cell_label_mode=1 +resources_spreadsheet_view/freeze_first_column=true + [application] config/name="Pole Pixel Defense Force"