minimata/MovementTests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed damage composition issue

Browse Source
This commit is contained in:
Alexandre Serex
2026-01-17 17:47:14 +01:00
parent 4ccdbc0ee6
commit 0dcf4a3f99
12 changed files with 92 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scenes/enemies/FirstEnemy.cs
View File

@@ -14,11 +14,11 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IDamageMaker, IH
[Export]
public RDamage GetDamageDealt { get; set; }
[Export]
public RDamageModifier[] DamageModifiers { get; set; }
[Export]
public CHealth Health { get; set; }
public CHealth CHealth { get; set; }
[Export]
public CDamageable CDamage { get; set; }
[Export]
public RDeathEffect[] DeathEffects { get; set; }
@@ -33,19 +33,12 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IDamageMaker, IH
_damageBox.BodyEntered += OnDamageBoxTriggered;
foreach (var damageable in DamageModifiers)
damageable.DamageTaken += ReduceHealth;
Health.Dead += Kill;
CDamage.DamageTaken += ReduceHealth;
CHealth.Dead += Kill;
}
public override void _PhysicsProcess(double delta)
{
if (Engine.IsEditorHint())
{
return;
}
var target = Target.GlobalPosition;
var direction = (target - GlobalPosition).Normalized();
@@ -70,26 +63,20 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IDamageMaker, IH
if(body is IDamageable damageable) damageable.TakeDamage(GetDamageDealt);
}
public event Action<float> DamageTaken;
public float TakeDamage(RDamage damage)
{
var finalDamage = 0f;
foreach (var damageable in DamageModifiers.ToIDamageables())
finalDamage += damageable.TakeDamage(damage);
DamageTaken?.Invoke(finalDamage);
return finalDamage;
return CDamage.TakeDamage(damage);
}
public float CurrentHealth
{
get => Health.CurrentHealth;
set => Health.CurrentHealth = value;
get => CHealth.CurrentHealth;
set => CHealth.CurrentHealth = value;
}
public void ReduceHealth(float amount)
{
Health.ReduceHealth(amount);
CHealth.ReduceHealth(amount);
}
public void Kill()

23
scenes/enemies/FlyingEnemy.cs
View File

@@ -13,12 +13,12 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IHealthable, IK
[Export]
public RDamage GetDamageDealt { get; set; }
[Export]
public RDamageModifier[] DamageModifiers { get; set; }
[Export]
public CHealth Health { get; set; }
public CHealth CHealth { get; set; }
[Export]
public CDamageable CDamage { get; set; }
[Export]
public RDeathEffect[] DeathEffects { get; set; }
@@ -38,9 +38,8 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IHealthable, IK
_randomDirection = new Vector3(GD.RandRange(-1, 1), 1, GD.RandRange(-1, 1)).Normalized();
foreach (var damageable in DamageModifiers)
damageable.DamageTaken += ReduceHealth;
Health.Dead += Kill;
CDamage.DamageTaken += ReduceHealth;
CHealth.Dead += Kill;
}
public override void _PhysicsProcess(double delta)
@@ -95,19 +94,15 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IHealthable, IK
public event Action<float> DamageTaken;
public float TakeDamage(RDamage damage)
{
var finalDamage = 0f;
foreach (var damageable in DamageModifiers.ToIDamageables())
finalDamage += damageable.TakeDamage(damage);
DamageTaken?.Invoke(finalDamage);
return finalDamage;
return CDamage.TakeDamage(damage);
}
public void ReduceHealth(float amount)
{
GD.Print("Reducing health by " + amount);
Health.ReduceHealth(amount);
CHealth.ReduceHealth(amount);
}
public void Kill()

38
scenes/enemies/first_enemy.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=21 format=3 uid="uid://dxt0e2ugmttqq"]
[gd_scene load_steps=19 format=3 uid="uid://dxt0e2ugmttqq"]
[ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/FirstEnemy.cs" id="1_4yfjf"]
[ext_resource type="Script" uid="uid://b2vdwkiqauhk3" path="res://scenes/enemies/EnemyInitInputs.cs" id="2_42xu3"]
@@ -7,6 +7,7 @@
[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="3_1tw73"]
[ext_resource type="Script" uid="uid://b4cwruitopcee" path="res://resource_definitions/RDeathEffect.cs" id="3_onjoj"]
[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="3_pvbr4"]
[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="7_1tw73"]
[sub_resource type="Resource" id="Resource_66m7n"]
script = ExtResource("2_42xu3")
@@ -17,26 +18,6 @@ metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
script = ExtResource("3_1tw73")
metadata/_custom_type_script = "uid://jitubgv6judn"
[sub_resource type="Resource" id="Resource_42xu3"]
script = ExtResource("2_r3cnf")
metadata/_custom_type_script = "uid://b6y3ugfydvch0"
[sub_resource type="Resource" id="Resource_1tw73"]
script = ExtResource("2_r3cnf")
DamageType = 1
metadata/_custom_type_script = "uid://b6y3ugfydvch0"
[sub_resource type="Resource" id="Resource_qj0ob"]
script = ExtResource("2_r3cnf")
DamageType = 2
metadata/_custom_type_script = "uid://b6y3ugfydvch0"
[sub_resource type="Resource" id="Resource_d7vrc"]
script = ExtResource("2_r3cnf")
DamageType = 3
Modifier = 2.0
metadata/_custom_type_script = "uid://b6y3ugfydvch0"
[sub_resource type="Resource" id="Resource_7gyf3"]
script = ExtResource("3_onjoj")
metadata/_custom_type_script = "uid://b4cwruitopcee"
@@ -45,6 +26,10 @@ metadata/_custom_type_script = "uid://b4cwruitopcee"
script = ExtResource("3_pvbr4")
metadata/_custom_type_script = "uid://baiapod3csndf"
[sub_resource type="Resource" id="Resource_qj0ob"]
script = ExtResource("2_r3cnf")
metadata/_custom_type_script = "uid://b6y3ugfydvch0"
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_62kkh"]
[sub_resource type="CapsuleMesh" id="CapsuleMesh_3uydm"]
@@ -61,14 +46,14 @@ albedo_color = Color(0.06469653, 0.06469653, 0.06469653, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_4yfjf"]
size = Vector3(1, 2, 2)
[node name="FirstEnemy" type="CharacterBody3D" node_paths=PackedStringArray("Health")]
[node name="FirstEnemy" type="CharacterBody3D" node_paths=PackedStringArray("CHealth", "CDamage")]
collision_layer = 16
collision_mask = 273
script = ExtResource("1_4yfjf")
Inputs = SubResource("Resource_66m7n")
GetDamageDealt = SubResource("Resource_a6xb8")
DamageModifiers = Array[Object]([SubResource("Resource_42xu3"), SubResource("Resource_1tw73"), SubResource("Resource_qj0ob"), SubResource("Resource_d7vrc")])
Health = NodePath("CHealth")
CHealth = NodePath("CHealth")
CDamage = NodePath("CDamageable")
DeathEffects = Array[Object]([SubResource("Resource_7gyf3")])
[node name="CHealth" type="Node" parent="."]
@@ -76,6 +61,11 @@ script = ExtResource("2_gsmti")
HealthResource = SubResource("Resource_r3cnf")
metadata/_custom_type_script = "uid://bjwrpv3jpsc1e"
[node name="CDamageable" type="Node" parent="."]
script = ExtResource("7_1tw73")
DamageModifiers = Array[Object]([SubResource("Resource_qj0ob")])
metadata/_custom_type_script = "uid://b0u23nkpaimyc"
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
shape = SubResource("CapsuleShape3D_62kkh")

22
scenes/enemies/flying_enemy.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=21 format=3 uid="uid://cmlud1hwkd6sv"]
[gd_scene load_steps=24 format=3 uid="uid://cmlud1hwkd6sv"]
[ext_resource type="Script" uid="uid://cmvep0qi7qlvf" path="res://scenes/enemies/FlyingEnemy.cs" id="1_b46rq"]
[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_1bsgx"]
@@ -7,6 +7,7 @@
[ext_resource type="Script" uid="uid://b4cwruitopcee" path="res://resource_definitions/RDeathEffect.cs" id="4_12h4s"]
[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="4_ys4jv"]
[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="5_irbqc"]
[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="8_uotso"]
[sub_resource type="Resource" id="Resource_7nxyi"]
script = ExtResource("2_aarbi")
@@ -50,6 +51,15 @@ script = ExtResource("5_irbqc")
StartingHealth = 50.0
metadata/_custom_type_script = "uid://baiapod3csndf"
[sub_resource type="Resource" id="Resource_jnv07"]
script = ExtResource("2_1bsgx")
metadata/_custom_type_script = "uid://b6y3ugfydvch0"
[sub_resource type="Resource" id="Resource_53j1c"]
script = ExtResource("2_1bsgx")
DamageType = 1
metadata/_custom_type_script = "uid://b6y3ugfydvch0"
[sub_resource type="SphereShape3D" id="SphereShape3D_b46rq"]
[sub_resource type="SphereMesh" id="SphereMesh_1bsgx"]
@@ -66,7 +76,7 @@ albedo_color = Color(0.06469653, 0.06469653, 0.06469653, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_4yfjf"]
size = Vector3(1, 1, 1.5)
[node name="FlyingEnemy" type="CharacterBody3D" node_paths=PackedStringArray("Health")]
[node name="FlyingEnemy" type="CharacterBody3D" node_paths=PackedStringArray("CHealth", "CDamage")]
collision_layer = 16
collision_mask = 273
motion_mode = 1
@@ -74,7 +84,8 @@ script = ExtResource("1_b46rq")
Inputs = SubResource("Resource_7nxyi")
GetDamageDealt = SubResource("Resource_o3msb")
DamageModifiers = Array[Object]([SubResource("Resource_2pnje"), SubResource("Resource_1bsgx"), SubResource("Resource_irbqc"), SubResource("Resource_uotso")])
Health = NodePath("CHealth")
CHealth = NodePath("CHealth")
CDamage = NodePath("CDamageable")
DeathEffects = Array[Object]([SubResource("Resource_ys4jv")])
[node name="CHealth" type="Node" parent="."]
@@ -82,6 +93,11 @@ script = ExtResource("4_ys4jv")
HealthResource = SubResource("Resource_aarbi")
metadata/_custom_type_script = "uid://bjwrpv3jpsc1e"
[node name="CDamageable" type="Node" parent="."]
script = ExtResource("8_uotso")
DamageModifiers = Array[Object]([SubResource("Resource_jnv07"), SubResource("Resource_53j1c")])
metadata/_custom_type_script = "uid://b0u23nkpaimyc"
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("SphereShape3D_b46rq")