From 740d979efa7fcd0686380e37aad3a971b20064bb Mon Sep 17 00:00:00 2001
From: Varylios <marcelly1225@gmail.com>
Date: Sun, 31 Aug 2025 23:07:55 +0200
Subject: [PATCH] add resource for projectile

---
 Levels/level_2.tres                   | 28 +++--------------
 Levels/world.gd                       |  5 +++
 Levels/world.tscn                     |  6 +---
 Projectiles/Projectile.gd             | 44 +++++++++++++--------------
 Projectiles/ProjectileResource.gd     | 10 ++++++
 Projectiles/ProjectileResource.gd.uid |  1 +
 Projectiles/projectile.tscn           |  6 ++--
 Scripts/PlayerManager.gd              |  2 +-
 Towers/Aline/aline.tscn               | 22 ++++++++++++--
 Towers/Evan/evan.tscn                 | 15 +++++++--
 Towers/Pierre/pierre.tscn             | 14 ++++++++-
 Towers/tower.gd                       | 12 +++-----
 Towers/tower.tscn                     |  2 +-
 UI/gui.gd                             |  4 +--
 bullet_container.gd                   |  8 -----
 bullet_container.gd.uid               |  1 -
 16 files changed, 98 insertions(+), 82 deletions(-)
 create mode 100644 Projectiles/ProjectileResource.gd
 create mode 100644 Projectiles/ProjectileResource.gd.uid
 delete mode 100644 bullet_container.gd
 delete mode 100644 bullet_container.gd.uid

diff --git a/Levels/level_2.tres b/Levels/level_2.tres
index 9483d64..4a24e54 100644
--- a/Levels/level_2.tres
+++ b/Levels/level_2.tres
@@ -1,30 +1,10 @@
 [gd_resource type="Resource" script_class="Level" load_steps=3 format=3 uid="uid://hlv6kd67wipi"]
 
-[sub_resource type="GDScript" id="GDScript_5jnuq"]
-script/source = "@tool
-extends Resource
-class_name Level
-
-@export var waves : Array[Wave]
-@export var auto_start : bool = false
-@export var allowedTowers : Array[Tower.TYPES] : set = allowedTowersHasChanged
-
-
-func allowedTowersHasChanged(value) -> void:
-	allowedTowers = value
-	if Engine.is_editor_hint():
-		EventBus.allowedTowerHasChange.emit(allowedTowers)
-"
-
-[sub_resource type="GDScript" id="GDScript_h3rs5"]
-script/source = "extends Resource
-class_name Wave
-
-@export var troops : Array[Troop]
-"
+[ext_resource type="Script" uid="uid://cuhq6u67cbbqm" path="res://Scripts/Level/Level.gd" id="1_e3k30"]
+[ext_resource type="Script" uid="uid://chu8s12rtdeqx" path="res://Scripts/Level/Wave.gd" id="2_8ao5l"]
 
 [resource]
-script = SubResource("GDScript_5jnuq")
-waves = Array[SubResource("GDScript_h3rs5")]([])
+script = ExtResource("1_e3k30")
+waves = Array[ExtResource("2_8ao5l")]([])
 auto_start = false
 allowedTowers = Array[int]([])
diff --git a/Levels/world.gd b/Levels/world.gd
index 2a0f3ae..2f1d5c7 100644
--- a/Levels/world.gd
+++ b/Levels/world.gd
@@ -4,3 +4,8 @@ var selected_collider : CollisionObject3D
 
 func _ready() -> void:
 	$WaveManager.spawn_next_wave()
+	EventBus.projectile_shooted.connect(onProjectileShooted)
+
+
+func onProjectileShooted(projectile : Projectile) -> void:
+	add_child(projectile)
diff --git a/Levels/world.tscn b/Levels/world.tscn
index c3c1a83..8d64030 100644
--- a/Levels/world.tscn
+++ b/Levels/world.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://ky0uewndeuwv"]
+[gd_scene load_steps=13 format=3 uid="uid://ky0uewndeuwv"]
 
 [ext_resource type="Script" uid="uid://qqid42jkpkmv" path="res://Levels/world.gd" id="1_fj7yv"]
 [ext_resource type="Texture2D" uid="uid://o83munu8dibp" path="res://Assets/Icones/kenney_game_icons_vector.svg" id="3_ikoig"]
@@ -7,7 +7,6 @@
 [ext_resource type="Resource" uid="uid://ob41fnhkjr3o" path="res://Levels/level_1.tres" id="8_44brb"]
 [ext_resource type="PackedScene" uid="uid://gp46cl8euhyf" path="res://Levels/map_1.tscn" id="8_rljl1"]
 [ext_resource type="PackedScene" uid="uid://p6a6rb7sgeqd" path="res://UI/gui.tscn" id="12_ikoig"]
-[ext_resource type="Script" uid="uid://xkk2pxkrwsq8" path="res://bullet_container.gd" id="12_k3n1d"]
 
 [sub_resource type="Animation" id="Animation_oyb16"]
 length = 0.001
@@ -114,9 +113,6 @@ light_energy = 0.0
 
 [node name="GUI" parent="CanvasLayer" instance=ExtResource("12_ikoig")]
 
-[node name="BulletContainer" type="Node3D" parent="."]
-script = ExtResource("12_k3n1d")
-
 [node name="Towers" type="Node3D" parent="."]
 
 [node name="Map1" parent="." instance=ExtResource("8_rljl1")]
diff --git a/Projectiles/Projectile.gd b/Projectiles/Projectile.gd
index cac978d..c7b9e2a 100644
--- a/Projectiles/Projectile.gd
+++ b/Projectiles/Projectile.gd
@@ -1,32 +1,20 @@
 extends CharacterBody3D
 class_name Projectile
 
-const ENEMY : int = 1
-const ALLY : int = 2
+const TARGET_ENEMY : int = 1 ## Flag to target enemy
+const TARGET_ALLY : int = 2 ## Flag to target ally
 
 const MINIMUN_AREA : float = .1
 
-@export var speed : int = 20
-@export_range(MINIMUN_AREA, 1000) var radius : float = MINIMUN_AREA
-@export var isAOE := false
-@export_flags("Enemies", "Alliés") var allowedTargets : int = ENEMY
-
-
-@onready var projectileArea : CollisionShape3D = $Impact/ProjectileArea
-@onready var projectileSize : CollisionShape3D = $Impact/ProjectileSize
-
-
+var speed : int = 20
+var isAOE : bool = false
+var allowedTargets : int = TARGET_ENEMY
 var target : PhysicsBody3D
 var damage : int = 1
-var bodiesInRange : Array[Node3D]
 var enemiesInRange : Array[Enemy]
 var allyInRange : Array[Tower]
 
 
-func _ready() -> void:
-	enemiesInRange.append(target)
-
-
 func _physics_process(delta: float) -> void:
 	if is_instance_valid(target):
 		velocity = global_position.direction_to(target.global_position) * speed
@@ -38,7 +26,6 @@ func _physics_process(delta: float) -> void:
 
 
 func onBodyEnteredDamageArea(body: Node3D) -> void:
-	print(body.get_class())
 	if isAOE && targetable(body):
 		if body is Enemy:
 			enemiesInRange.append(body)
@@ -46,29 +33,40 @@ func onBodyEnteredDamageArea(body: Node3D) -> void:
 			allyInRange.append(body)
 
 
-func OnBodyExitedDamageArea(body: Node3D) -> void:
+func onBodyExitedDamageArea(body: Node3D) -> void:
 	if body is Enemy:
 		enemiesInRange.erase(body)
 	if body is Tower:
 		allyInRange.erase(body)
 
 
-func onBodyCollideWithProjectile(body : Node3D) -> void:
+func onBodyCollideWithProjectile(body: Node3D) -> void:
 	if body == target:
 		resolveDamages()
 
 
 func targetable(body: Node3D) -> bool:
 	if body is Enemy:
-		return ENEMY & allowedTargets
+		return TARGET_ENEMY & allowedTargets
 	if body is Tower:
-		return ALLY & allowedTargets
+		return TARGET_ALLY & allowedTargets
 
 	return false
 
 
 func resolveDamages() -> void:
-	print(enemiesInRange)
 	for enemy in enemiesInRange:
 		enemy.take_damage(damage)
 		queue_free()
+
+
+func loadProjectile(resource : ProjectileResource, startPosition: Vector3, _target: PhysicsBody3D) -> void:
+	target = _target
+	enemiesInRange.append(target)
+	global_position = startPosition
+	speed = resource.speed
+	isAOE = resource.isAOE
+	allowedTargets = resource.allowedTargets
+	$Sprite3D.texture = resource.sprite
+	if isAOE && resource.damageArea:
+		$DamageArea/ProjectileArea.shape = resource.damageArea
diff --git a/Projectiles/ProjectileResource.gd b/Projectiles/ProjectileResource.gd
new file mode 100644
index 0000000..71a0b71
--- /dev/null
+++ b/Projectiles/ProjectileResource.gd
@@ -0,0 +1,10 @@
+extends Resource
+class_name ProjectileResource
+
+
+@export var speed : int = 20
+@export var damage : int = 1
+@export var isAOE : bool = false
+@export_flags("Enemies", "Alliés") var allowedTargets : int = 1
+@export var damageArea : Shape3D
+@export var sprite : Texture2D
diff --git a/Projectiles/ProjectileResource.gd.uid b/Projectiles/ProjectileResource.gd.uid
new file mode 100644
index 0000000..eac2883
--- /dev/null
+++ b/Projectiles/ProjectileResource.gd.uid
@@ -0,0 +1 @@
+uid://ddgbr0n8kic3y
diff --git a/Projectiles/projectile.tscn b/Projectiles/projectile.tscn
index c4dde35..1233ee7 100644
--- a/Projectiles/projectile.tscn
+++ b/Projectiles/projectile.tscn
@@ -7,11 +7,10 @@
 radius = 0.1
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_dsts2"]
-radius = 1.5
+radius = 0.1
 
 [node name="Projectile" type="CharacterBody3D"]
 script = ExtResource("1_ggq0q")
-speed = 10
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 shape = SubResource("SphereShape3D_r5o86")
@@ -34,9 +33,8 @@ collision_layer = 4
 collision_mask = 4
 
 [node name="ProjectileArea" type="CollisionShape3D" parent="DamageArea"]
-shape = SubResource("SphereShape3D_dsts2")
 debug_color = Color(0.926858, 0.237749, 0.335021, 0.42)
 
 [connection signal="body_entered" from="HitBox" to="." method="onBodyCollideWithProjectile" flags=3]
 [connection signal="body_entered" from="DamageArea" to="." method="onBodyEnteredDamageArea"]
-[connection signal="body_exited" from="DamageArea" to="." method="OnBodyExitedDamageArea"]
+[connection signal="body_exited" from="DamageArea" to="." method="onBodyExitedDamageArea"]
diff --git a/Scripts/PlayerManager.gd b/Scripts/PlayerManager.gd
index b442d11..4ab549f 100644
--- a/Scripts/PlayerManager.gd
+++ b/Scripts/PlayerManager.gd
@@ -10,7 +10,7 @@ var _state := STATE.IDLE
 var selected_tower_type : Tower.TYPE = Tower.TYPE.NONE
 
 @onready var cam : Camera3D = $"../Camera3D"
-@onready var the_cube : TheCube = %TheCube
+@onready var the_cube : TheCube = $"../Map1/TheCube"
 @onready var selection_icon : Sprite3D = $Sprite3DSelection
 
 var towers : Dictionary
diff --git a/Towers/Aline/aline.tscn b/Towers/Aline/aline.tscn
index 332b1d9..89bb3c4 100644
--- a/Towers/Aline/aline.tscn
+++ b/Towers/Aline/aline.tscn
@@ -1,10 +1,25 @@
-[gd_scene load_steps=6 format=3 uid="uid://ck1qryleu80s"]
+[gd_scene load_steps=10 format=3 uid="uid://ck1qryleu80s"]
 
 [ext_resource type="PackedScene" uid="uid://trg7ag3dqr2l" path="res://Towers/tower.tscn" id="1_gvvig"]
 [ext_resource type="Script" uid="uid://16hafh01iv" path="res://Towers/Aline/aline.gd" id="2_6sjqq"]
 [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://Scripts/Upgrades/TowerUpgrade.gd" id="3_p2nb1"]
+[ext_resource type="Script" uid="uid://ddgbr0n8kic3y" path="res://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"]
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_lhd8w"]
+radius = 0.6
+
+[sub_resource type="Resource" id="Resource_lhd8w"]
+script = ExtResource("4_ck6a3")
+speed = 20
+damage = 10
+isAOE = true
+allowedTargets = 1
+damageArea = SubResource("SphereShape3D_lhd8w")
+sprite = ExtResource("5_lhd8w")
+metadata/_custom_type_script = "uid://ddgbr0n8kic3y"
 
 [node name="Aline" instance=ExtResource("1_gvvig")]
 script = ExtResource("2_6sjqq")
@@ -13,10 +28,11 @@ tower_type = 2
 icone = ExtResource("3_6h033")
 bio = ""
 price = 150
-bullet_damage = 10
+projectileRessource = SubResource("Resource_lhd8w")
+action_cooldown = 2.5
 energy_cost = 25.0
 tower_shop = Array[ExtResource("3_p2nb1")]([])
 
-[node name="Sprite3D" parent="." index="6"]
+[node name="Sprite3D" parent="." index="5"]
 texture = ExtResource("5_l514g")
 frame = 10
diff --git a/Towers/Evan/evan.tscn b/Towers/Evan/evan.tscn
index 7a89eaa..74a6d10 100644
--- a/Towers/Evan/evan.tscn
+++ b/Towers/Evan/evan.tscn
@@ -1,9 +1,20 @@
-[gd_scene load_steps=5 format=3 uid="uid://c4ta0aynybpis"]
+[gd_scene load_steps=8 format=3 uid="uid://c4ta0aynybpis"]
 
 [ext_resource type="PackedScene" uid="uid://trg7ag3dqr2l" path="res://Towers/tower.tscn" id="1_yctfx"]
 [ext_resource type="Script" uid="uid://cyxxauybvvfyj" path="res://Towers/Evan/evan.gd" id="2_fuecn"]
 [ext_resource type="Texture2D" uid="uid://dwwgho6f8f4kj" path="res://Assets/Icones/penguin.svg" id="3_nvfjk"]
+[ext_resource type="Script" uid="uid://ddgbr0n8kic3y" path="res://Projectiles/ProjectileResource.gd" id="4_el20i"]
 [ext_resource type="Script" uid="uid://bg0x4egeu17qb" path="res://Scripts/Upgrades/TowerUpgrade.gd" id="4_v32j5"]
+[ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="5_el20i"]
+
+[sub_resource type="Resource" id="Resource_ykufo"]
+script = ExtResource("4_el20i")
+speed = 20
+damage = 1
+isAOE = false
+allowedTargets = 1
+sprite = ExtResource("5_el20i")
+metadata/_custom_type_script = "uid://ddgbr0n8kic3y"
 
 [node name="Evan" instance=ExtResource("1_yctfx")]
 script = ExtResource("2_fuecn")
@@ -11,5 +22,5 @@ tower_name = "Evan"
 tower_type = 5
 icone = ExtResource("3_nvfjk")
 bio = ""
-bullet_damage = 1
+projectileRessource = SubResource("Resource_ykufo")
 tower_shop = Array[ExtResource("4_v32j5")]([])
diff --git a/Towers/Pierre/pierre.tscn b/Towers/Pierre/pierre.tscn
index 8d09d62..d933294 100644
--- a/Towers/Pierre/pierre.tscn
+++ b/Towers/Pierre/pierre.tscn
@@ -1,8 +1,19 @@
-[gd_scene load_steps=4 format=3 uid="uid://bj6srer7ghf7p"]
+[gd_scene load_steps=7 format=3 uid="uid://bj6srer7ghf7p"]
 
 [ext_resource type="PackedScene" uid="uid://trg7ag3dqr2l" path="res://Towers/tower.tscn" id="1_7f7qx"]
 [ext_resource type="Script" uid="uid://q4o384wv3ijj" path="res://Towers/Pierre/pierre.gd" id="1_v16mf"]
 [ext_resource type="Texture2D" uid="uid://bb4wihq1n1wm7" path="res://Assets/Icones/labrador-head.svg" id="3_odfqx"]
+[ext_resource type="Script" uid="uid://ddgbr0n8kic3y" path="res://Projectiles/ProjectileResource.gd" id="4_3juah"]
+[ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="5_p33h4"]
+
+[sub_resource type="Resource" id="Resource_3ht5a"]
+script = ExtResource("4_3juah")
+speed = 20
+damage = 5
+isAOE = false
+allowedTargets = 1
+sprite = ExtResource("5_p33h4")
+metadata/_custom_type_script = "uid://ddgbr0n8kic3y"
 
 [node name="Pierre" instance=ExtResource("1_7f7qx")]
 script = ExtResource("1_v16mf")
@@ -10,6 +21,7 @@ tower_name = "Pierre"
 tower_type = 1
 icone = ExtResource("3_odfqx")
 bio = null
+projectileRessource = SubResource("Resource_3ht5a")
 action_cooldown = 1.0
 max_energy = 50.0
 energy_regen = 5.0
diff --git a/Towers/tower.gd b/Towers/tower.gd
index d7ddd74..36d33e5 100644
--- a/Towers/tower.gd
+++ b/Towers/tower.gd
@@ -5,16 +5,16 @@ class_name Tower
 # DANGER "NONE" Should always be first
 enum TYPE { NONE, PIERRE, ALINE, MAXENCE, VICTORIA, EVAN, ALEX, GERALDINE }
 
-var projectile : PackedScene = preload("res://Projectiles/projectile.tscn")
+var projectileScene : PackedScene = preload("res://Projectiles/projectile.tscn")
+
 @export var tower_name : String = "None"
 @export var tower_type : TYPE
 @export var icone : Texture2D
 @export var bio : String
-
 @export var price : int = 100
 
 @export_group("Attack")
-@export var projectile_damage : int = 1
+@export var projectileRessource : ProjectileResource
 @export var action_cooldown : float = 1.5:
 	set(value):
 		action_cooldown = clamp(value, 0.3, 999)
@@ -103,10 +103,8 @@ func _process(delta: float) -> void:
 func shoot() -> void:
 	energy -= energy_cost
 
-	var projectile : Projectile = projectile.instantiate()
-	projectile.target = current
-	projectile.damage = projectile_damage
-	projectile.global_position = $Aim.global_position
+	var projectile : Projectile = projectileScene.instantiate()
+	projectile.loadProjectile(projectileRessource, $Aim.global_position, current)
 	EventBus.projectile_shooted.emit(projectile)
 
 
diff --git a/Towers/tower.tscn b/Towers/tower.tscn
index ddca15d..56002ff 100644
--- a/Towers/tower.tscn
+++ b/Towers/tower.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=10 format=3 uid="uid://trg7ag3dqr2l"]
 
-[ext_resource type="Script" uid="uid://8kpvuurr5h5n" path="res://Towers/tower.gd" id="1_egfuc"]
+[ext_resource type="Script" uid="uid://8kpvuurr5h5n" path="res://Towers/Tower.gd" id="1_egfuc"]
 [ext_resource type="Texture2D" uid="uid://bn6ikwol6x8r0" path="res://Assets/Characters/Male1.png" id="2_egfuc"]
 [ext_resource type="Texture2D" uid="uid://uptdcefxlv4c" path="res://Assets/Icones/ppdf_bio_image_placeholder_2.png" id="2_mnaic"]
 [ext_resource type="Script" uid="uid://bg0x4egeu17qb" path="res://Scripts/Upgrades/TowerUpgrade.gd" id="3_5dr1v"]
diff --git a/UI/gui.gd b/UI/gui.gd
index ec84c0c..a5d1678 100644
--- a/UI/gui.gd
+++ b/UI/gui.gd
@@ -30,8 +30,8 @@ func _on_button_quit_game_pressed() -> void:
 	get_tree().quit()
 
 
-func allowedTowerHasChange(allowedTowers : Array[Tower.TYPE]) -> void:
-	self.allowedTowers = allowedTowers
+func allowedTowerHasChange(_allowedTowers : Array[Tower.TYPE]) -> void:
+	allowedTowers = _allowedTowers
 	if is_node_ready():
 		addTowerButtonNodes()
 
diff --git a/bullet_container.gd b/bullet_container.gd
deleted file mode 100644
index d233cb9..0000000
--- a/bullet_container.gd
+++ /dev/null
@@ -1,8 +0,0 @@
-extends Node3D
-
-func _ready() -> void:
-	EventBus.projectile_shooted.connect(_on_EventBus_projectile_shooted)
-
-
-func _on_EventBus_projectile_shooted(projectile : Projectile) -> void:
-	add_child(projectile)
diff --git a/bullet_container.gd.uid b/bullet_container.gd.uid
deleted file mode 100644
index 7de4c9b..0000000
--- a/bullet_container.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://xkk2pxkrwsq8