diff --git a/Enemies/Scenes/boss-james.tscn b/Enemies/Scenes/boss-james.tscn index 3372013..7b63895 100644 --- a/Enemies/Scenes/boss-james.tscn +++ b/Enemies/Scenes/boss-james.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://dg8bjkjuddnhg" path="res://Enemies/enemy.tscn" id="1_ohyx6"] [ext_resource type="Script" uid="uid://dw53e0rr7qc02" path="res://Enemies/boss.gd" id="2_vnmiq"] [ext_resource type="Texture2D" uid="uid://d38rvmky1mr5f" path="res://Assets/Characters/72 Character Free/Char 5/Character 5.png" id="3_831fr"] -[ext_resource type="PackedScene" uid="uid://c6i3437fhurkh" path="res://Towers/Projectiles/Scenes/projectile-James.tscn" id="3_vnmiq"] +[ext_resource type="PackedScene" uid="uid://c6i3437fhurkh" path="res://Projectiles/Scenes/projectile-James.tscn" id="3_vnmiq"] [sub_resource type="ViewportTexture" id="ViewportTexture_mw235"] viewport_path = NodePath("Enemy/HealthBar3D/SubViewport") diff --git a/Towers/Projectiles/Draft/ImpactPierre.tscn b/Projectiles/Draft/ImpactPierre.tscn similarity index 97% rename from Towers/Projectiles/Draft/ImpactPierre.tscn rename to Projectiles/Draft/ImpactPierre.tscn index 91fc57a..75a9404 100644 --- a/Towers/Projectiles/Draft/ImpactPierre.tscn +++ b/Projectiles/Draft/ImpactPierre.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=10 format=3 uid="uid://c5rx5scnkh3fb"] [ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="1_3pqxv"] -[ext_resource type="Script" uid="uid://6xiqssgmiurt" path="res://Towers/Projectiles/impact_pierre.gd" id="2_ymm3v"] +[ext_resource type="Script" uid="uid://6xiqssgmiurt" path="res://Projectiles/Draft/impact_pierre.gd" id="2_ymm3v"] [sub_resource type="Curve" id="Curve_ymm3v"] _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.499044, 1), 0.0, 0.0, 0, 0, Vector2(0.745698, 0.50142), -0.0206361, -0.0206361, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] diff --git a/Towers/Projectiles/Draft/ProjectilePierre.tscn b/Projectiles/Draft/ProjectilePierre.tscn similarity index 97% rename from Towers/Projectiles/Draft/ProjectilePierre.tscn rename to Projectiles/Draft/ProjectilePierre.tscn index 570a0de..2233c95 100644 --- a/Towers/Projectiles/Draft/ProjectilePierre.tscn +++ b/Projectiles/Draft/ProjectilePierre.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=3 uid="uid://dsv2untvmg8q"] [ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="1_lcll5"] -[ext_resource type="Script" uid="uid://bpy86kcsjgx0e" path="res://Towers/Projectiles/projectile_pierre.gd" id="2_i2vf7"] +[ext_resource type="Script" uid="uid://bpy86kcsjgx0e" path="res://Projectiles/Draft/projectile_pierre.gd" id="2_i2vf7"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qaid5"] transparency = 1 diff --git a/Towers/Projectiles/Draft/impact_pierre.gd b/Projectiles/Draft/impact_pierre.gd similarity index 100% rename from Towers/Projectiles/Draft/impact_pierre.gd rename to Projectiles/Draft/impact_pierre.gd diff --git a/Towers/Projectiles/Draft/impact_pierre.gd.uid b/Projectiles/Draft/impact_pierre.gd.uid similarity index 100% rename from Towers/Projectiles/Draft/impact_pierre.gd.uid rename to Projectiles/Draft/impact_pierre.gd.uid diff --git a/Towers/Projectiles/Draft/projectile_pierre.gd b/Projectiles/Draft/projectile_pierre.gd similarity index 100% rename from Towers/Projectiles/Draft/projectile_pierre.gd rename to Projectiles/Draft/projectile_pierre.gd diff --git a/Towers/Projectiles/Draft/projectile_pierre.gd.uid b/Projectiles/Draft/projectile_pierre.gd.uid similarity index 100% rename from Towers/Projectiles/Draft/projectile_pierre.gd.uid rename to Projectiles/Draft/projectile_pierre.gd.uid diff --git a/Towers/Projectiles/Projectile.gd b/Projectiles/Projectile.gd similarity index 99% rename from Towers/Projectiles/Projectile.gd rename to Projectiles/Projectile.gd index 0a51792..8d84a73 100644 --- a/Towers/Projectiles/Projectile.gd +++ b/Projectiles/Projectile.gd @@ -100,7 +100,6 @@ func resolveContact() -> void: resolveEffect(_body) TYPE.BOUNCING: - print(bodiesInRange) target = null if bodiesInRange.is_empty() else bodiesInRange[0] diff --git a/Towers/Projectiles/Projectile.gd.uid b/Projectiles/Projectile.gd.uid similarity index 100% rename from Towers/Projectiles/Projectile.gd.uid rename to Projectiles/Projectile.gd.uid diff --git a/Towers/Projectiles/Scenes/projectile-Aline.tscn b/Projectiles/Scenes/projectile-Aline.tscn similarity index 90% rename from Towers/Projectiles/Scenes/projectile-Aline.tscn rename to Projectiles/Scenes/projectile-Aline.tscn index 55f013c..d68c3ab 100644 --- a/Towers/Projectiles/Scenes/projectile-Aline.tscn +++ b/Projectiles/Scenes/projectile-Aline.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://dcnm6rjht0rew"] -[ext_resource type="PackedScene" uid="uid://oykrff3g74eo" path="res://Towers/Projectiles/projectile.tscn" id="1_4tmpc"] +[ext_resource type="PackedScene" uid="uid://oykrff3g74eo" path="res://Projectiles/projectile.tscn" id="1_4tmpc"] [sub_resource type="SphereShape3D" id="SphereShape3D_k24mn"] radius = 0.3 diff --git a/Towers/Projectiles/Scenes/projectile-James.tscn b/Projectiles/Scenes/projectile-James.tscn similarity index 91% rename from Towers/Projectiles/Scenes/projectile-James.tscn rename to Projectiles/Scenes/projectile-James.tscn index cae25ab..06e8c6e 100644 --- a/Towers/Projectiles/Scenes/projectile-James.tscn +++ b/Projectiles/Scenes/projectile-James.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://c6i3437fhurkh"] -[ext_resource type="PackedScene" uid="uid://oykrff3g74eo" path="res://Towers/Projectiles/projectile.tscn" id="1_do0ca"] +[ext_resource type="PackedScene" uid="uid://oykrff3g74eo" path="res://Projectiles/projectile.tscn" id="1_do0ca"] [ext_resource type="Texture2D" uid="uid://b7jiyk3w5tl02" path="res://Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png" id="2_ckawd"] [node name="Projectile" instance=ExtResource("1_do0ca")] diff --git a/Towers/Projectiles/Scenes/projectile-Pierre.tscn b/Projectiles/Scenes/projectile-Pierre.tscn similarity index 82% rename from Towers/Projectiles/Scenes/projectile-Pierre.tscn rename to Projectiles/Scenes/projectile-Pierre.tscn index dffdf83..d9c0126 100644 --- a/Towers/Projectiles/Scenes/projectile-Pierre.tscn +++ b/Projectiles/Scenes/projectile-Pierre.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dy755v20lqu7q"] -[ext_resource type="PackedScene" uid="uid://oykrff3g74eo" path="res://Towers/Projectiles/projectile.tscn" id="1_d01p1"] +[ext_resource type="PackedScene" uid="uid://oykrff3g74eo" path="res://Projectiles/projectile.tscn" id="1_d01p1"] [node name="Projectile" instance=ExtResource("1_d01p1")] speed = 15 diff --git a/Towers/Projectiles/Scenes/projectile-Victoria.tscn b/Projectiles/Scenes/projectile-Victoria.tscn similarity index 90% rename from Towers/Projectiles/Scenes/projectile-Victoria.tscn rename to Projectiles/Scenes/projectile-Victoria.tscn index 6720a02..4ff674b 100644 --- a/Towers/Projectiles/Scenes/projectile-Victoria.tscn +++ b/Projectiles/Scenes/projectile-Victoria.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://df8u7dogl4wi0"] -[ext_resource type="PackedScene" uid="uid://oykrff3g74eo" path="res://Towers/Projectiles/projectile.tscn" id="1_suva6"] +[ext_resource type="PackedScene" uid="uid://oykrff3g74eo" path="res://Projectiles/projectile.tscn" id="1_suva6"] [sub_resource type="SphereShape3D" id="SphereShape3D_k24mn"] radius = 1.5 diff --git a/Towers/Projectiles/projectile.tscn b/Projectiles/projectile.tscn similarity index 96% rename from Towers/Projectiles/projectile.tscn rename to Projectiles/projectile.tscn index 3c9310b..ce80754 100644 --- a/Towers/Projectiles/projectile.tscn +++ b/Projectiles/projectile.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://oykrff3g74eo"] -[ext_resource type="Script" uid="uid://b788twwo1o6l2" path="res://Towers/Projectiles/Projectile.gd" id="1_ggq0q"] +[ext_resource type="Script" uid="uid://b788twwo1o6l2" path="res://Projectiles/Projectile.gd" id="1_ggq0q"] [ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="2_08w86"] [sub_resource type="SphereShape3D" id="SphereShape3D_r5o86"] diff --git a/Towers/Scenes/aline.tscn b/Towers/Scenes/aline.tscn index bcfb979..9c76f05 100644 --- a/Towers/Scenes/aline.tscn +++ b/Towers/Scenes/aline.tscn @@ -2,7 +2,7 @@ [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="PackedScene" uid="uid://dcnm6rjht0rew" path="res://Towers/Projectiles/Scenes/projectile-Aline.tscn" id="5_6bcjo"] +[ext_resource type="PackedScene" uid="uid://dcnm6rjht0rew" path="res://Projectiles/Scenes/projectile-Aline.tscn" id="5_6bcjo"] [ext_resource type="Texture2D" uid="uid://315k07rsgf6t" path="res://Assets/Characters/Female1.png" id="5_l514g"] [sub_resource type="SphereShape3D" id="SphereShape3D_6bcjo"] diff --git a/Towers/Scenes/pierre.tscn b/Towers/Scenes/pierre.tscn index c917ac7..fa35a0e 100644 --- a/Towers/Scenes/pierre.tscn +++ b/Towers/Scenes/pierre.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://trg7ag3dqr2l" path="res://Towers/tower.tscn" id="1_s6dfo"] [ext_resource type="Texture2D" uid="uid://bb4wihq1n1wm7" path="res://Assets/Icones/labrador-head.svg" id="2_lcjqw"] -[ext_resource type="PackedScene" uid="uid://dy755v20lqu7q" path="res://Towers/Projectiles/Scenes/projectile-Pierre.tscn" id="5_wnw3f"] +[ext_resource type="PackedScene" uid="uid://dy755v20lqu7q" path="res://Projectiles/Scenes/projectile-Pierre.tscn" id="5_wnw3f"] [ext_resource type="Script" uid="uid://bg0x4egeu17qb" path="res://Upgrades/TowerUpgrade.gd" id="5_wvh05"] [ext_resource type="Texture2D" uid="uid://dqvou7t7o1t5d" path="res://Assets/Icones/medal2.png" id="6_wnw3f"] diff --git a/Towers/Scenes/victoria.tscn b/Towers/Scenes/victoria.tscn index 4ef9582..86f9ae9 100644 --- a/Towers/Scenes/victoria.tscn +++ b/Towers/Scenes/victoria.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://trg7ag3dqr2l" path="res://Towers/tower.tscn" id="1_ki73m"] [ext_resource type="Texture2D" uid="uid://m6jwakrus50v" path="res://Assets/Icones/sea-star.svg" id="2_n34tq"] -[ext_resource type="PackedScene" uid="uid://df8u7dogl4wi0" path="res://Towers/Projectiles/Scenes/projectile-Victoria.tscn" id="4_sf52i"] +[ext_resource type="PackedScene" uid="uid://df8u7dogl4wi0" path="res://Projectiles/Scenes/projectile-Victoria.tscn" id="4_sf52i"] [ext_resource type="Texture2D" uid="uid://315k07rsgf6t" path="res://Assets/Characters/Female1.png" id="5_2rqsg"] [sub_resource type="SphereShape3D" id="SphereShape3D_sf52i"] diff --git a/project.godot b/project.godot index 19fa344..26ef7df 100644 --- a/project.godot +++ b/project.godot @@ -58,9 +58,10 @@ folder_colors={ "res://Globals/": "blue", "res://Levels/": "yellow", "res://Levels/Scripts/": "blue", +"res://Projectiles/": "purple", +"res://Projectiles/Scenes/": "pink", "res://Tiles/": "yellow", "res://Towers/": "orange", -"res://Towers/Projectiles/": "orange", "res://Towers/Scenes": "pink", "res://Towers/Scenes/": "pink", "res://UI/": "green",