first version of enitites damageables weapons item and effects workflow

2025-03-09 23:56:19 +01:00
parent b90e0369bf
commit cb65c3a266
42 changed files with 263 additions and 180 deletions
--- a/scripts/resources/Effects/Effect.gd
+++ b/scripts/resources/Effects/Effect.gd
@@ -2,5 +2,5 @@ extends Resource

 class_name Effect

-func apply_effect (character: Character)-> void:
+func apply_effect (orign_entity: Entity, target_entity: Entity)-> void:
 	assert(false)
--- a/scripts/resources/Effects/HealEffect.gd
+++ b/scripts/resources/Effects/HealEffect.gd
@@ -0,0 +1,6 @@
+class_name HealEffect extends Effect
+
+@export var heal_amount: int
+
+func apply_effect (orign_entity: Entity, target_entity: Entity)-> void:
+	target_entity.increase_health(heal_amount)
--- a/scripts/resources/Effects/RefillHpEffect.gd
+++ b/scripts/resources/Effects/RefillHpEffect.gd
@@ -1,4 +0,0 @@
-extends Effect
-
-func apply_effect (character: Character)-> void:
-	character.stats.health.value = character.stats.max_health.value
--- a/scripts/resources/Entity/EntityResource.gd
+++ b/scripts/resources/Entity/EntityResource.gd
@@ -2,7 +2,7 @@ extends Resource

 class_name EntityResource

-@export var entity_stats: entityStats
+@export var entity_stats: EntityStats
@export var entity_scene: PackedScene


--- a/scripts/resources/Entity/EntityStats.gd
+++ b/scripts/resources/Entity/EntityStats.gd
@@ -2,8 +2,9 @@ extends Resource

 class_name EntityStats

-@export var max_health: MaxHealth
-@export var health: Health
-@export var armor: Armor
-@export var shield: Shield
-@export var movementSpeed: MovementSpeed
+@export var max_health: MaxHealthStat
+@export var health: HealthStat
+@export var armor: ArmorStat
+@export var shield: ShieldStat
+@export var max_shield: MaxShieldStat
+@export var movementSpeed: MovementSpeedStat
--- a/scripts/resources/Equipment/EquipmentStats.gd
+++ b/scripts/resources/Equipment/EquipmentStats.gd
@@ -2,8 +2,8 @@ extends Resource

 class_name EquipmentStats

-@export var max_health: MaxHealth
-@export var armor: Armor
-@export var shield: Shield
-@export var movementSpeed: MovementSpeed
-@export var damage: Damage
+@export var max_health: MaxHealthStat
+@export var armor: ArmorStat
+@export var max_shield: MaxShieldStat
+@export var movementSpeed: MovementSpeedStat
+@export var damage: DamageStat
--- a/scripts/resources/Equipment/MechParts/ArmsResource.gd
+++ b/scripts/resources/Equipment/MechParts/ArmsResource.gd
@@ -1,3 +1,3 @@
 extends MechPartResource

-class_name Arms
+class_name ArmsResource
--- a/scripts/resources/Equipment/MechParts/BootsResource.gd
+++ b/scripts/resources/Equipment/MechParts/BootsResource.gd
@@ -1,3 +1,3 @@
 extends MechPartResource

-class_name Boots
+class_name BootsResource
--- a/scripts/resources/Equipment/MechParts/Hydraulics.gd
+++ b/scripts/resources/Equipment/MechParts/Hydraulics.gd
@@ -1,3 +0,0 @@
-extends MechPartResource
-
-class_name Hydraulics
--- a/scripts/resources/Equipment/MechParts/HydraulicsResource.gd
+++ b/scripts/resources/Equipment/MechParts/HydraulicsResource.gd
@@ -0,0 +1,3 @@
+extends MechPartResource
+
+class_name HydraulicsResource
--- a/scripts/resources/Stats/ArmorStat.gd
+++ b/scripts/resources/Stats/ArmorStat.gd
@@ -1,6 +1,6 @@
 extends Resource

-class_name Armor
+class_name ArmorStat

 signal value_changed_signal(currentArmor: int)

--- a/scripts/resources/Stats/DamageStat.gd
+++ b/scripts/resources/Stats/DamageStat.gd
@@ -1,6 +1,6 @@
 extends Resource

-class_name Damage
+class_name DamageStat

 signal value_changed_signal(currentDamage: int)

--- a/scripts/resources/Stats/Effects/HitEffectsStat.gd
+++ b/scripts/resources/Stats/Effects/HitEffectsStat.gd
@@ -0,0 +1,13 @@
+extends Resource
+
+class_name HitEffectStat
+
+signal value_changed_signal(effects: Array[Effect])
+
+@export var _value: Array[Effect]
+var value: Array[Effect]:
+	get:
+		return _value
+	set(new_value):
+		value = new_value;
+		value_changed_signal.emit(_value)
--- a/scripts/resources/Stats/FireRateStat.gd
+++ b/scripts/resources/Stats/FireRateStat.gd
@@ -1,6 +1,6 @@
 extends Resource

-class_name FireRate
+class_name FireRateStat

 signal value_changed_signal(currentFireRate: int)

--- a/scripts/resources/Stats/HealthStat.gd
+++ b/scripts/resources/Stats/HealthStat.gd
@@ -1,6 +1,6 @@
 extends Resource

-class_name Health
+class_name HealthStat

 signal value_changed_signal(currentHealth: int)

--- a/scripts/resources/Stats/MaxHealthStat.gd
+++ b/scripts/resources/Stats/MaxHealthStat.gd
@@ -1,6 +1,6 @@
 extends Resource

-class_name MaxHealth
+class_name MaxHealthStat

 signal value_changed_signal(currentMaxHealth: int)

--- a/scripts/resources/Stats/MaxShieldStat.gd
+++ b/scripts/resources/Stats/MaxShieldStat.gd
@@ -0,0 +1,13 @@
+extends Resource
+
+class_name MaxShieldStat
+
+signal value_changed_signal(currentMaxShield: int)
+
+@export var _value: int
+var value: int:
+	get:
+		return _value
+	set(new_value):
+		value = new_value;
+		value_changed_signal.emit(_value)
--- a/scripts/resources/Stats/MovementSpeedStat.gd
+++ b/scripts/resources/Stats/MovementSpeedStat.gd
@@ -1,6 +1,6 @@
 extends Resource

-class_name MovementSpeed
+class_name MovementSpeedStat

 signal value_changed_signal(currentMovementSpeed: int)

--- a/scripts/resources/Stats/ShieldStat.gd
+++ b/scripts/resources/Stats/ShieldStat.gd
@@ -1,6 +1,6 @@
 extends Resource

-class_name Shield
+class_name ShieldStat

 signal value_changed_signal(currentShield: int)

--- a/scripts/resources/Weapons/Attachments/AttachmentStats.gd
+++ b/scripts/resources/Weapons/Attachments/AttachmentStats.gd
@@ -2,5 +2,6 @@ extends Resource

 class_name AttachmentStats

-@export var damage: Damage
-@export var fire_rate: FireRate
+@export var damage: DamageStat
+@export var fire_rate: FireRateStat
+@export var hit_effects: HitEffectStat
--- a/scripts/resources/Weapons/WeaponStats.gd
+++ b/scripts/resources/Weapons/WeaponStats.gd
@@ -3,5 +3,6 @@ extends Resource
 class_name WeaponStats


-@export var damage: Damage
-@export var fire_rate: FireRate
+@export var damage: DamageStat
+@export var fire_rate: FireRateStat
+@export var hit_effects: HitEffectStat