reorganizing stuff

2026-01-18 17:04:28 +01:00
parent eb1c7f78fa
commit 98ed361546
40 changed files with 32 additions and 32 deletions
--- a/scenes/damage/CDamageable.cs
+++ b/scenes/damage/CDamageable.cs
@@ -1,23 +0,0 @@
-using Godot;
-using System;
-using Movementtests.interfaces;
-
-[GlobalClass]
-public partial class CDamageable : Node, IDamageable
-{
-    public event Action<IDamageable, DamageRecord> DamageTaken;
-    
-    [Export]
-    public RDamageModifier[] DamageModifiers { get; set; }
-
-
-    public DamageRecord TakeDamage(DamageRecord damageRecord)
-    {
-        var finalDamage = 0f;
-        foreach (var damageable in DamageModifiers.ToIDamageables())
-            finalDamage += damageable.TakeDamage(damageRecord).Damage.DamageDealt;
-        var finalDamageRecord = damageRecord with { Damage = new RDamage(finalDamage, damageRecord.Damage.DamageType) };
-        DamageTaken?.Invoke(this, finalDamageRecord);
-        return finalDamageRecord;
-    }
-}
--- a/scenes/damage/CDamageable.cs.uid
+++ b/scenes/damage/CDamageable.cs.uid
@@ -1 +0,0 @@
-uid://b0u23nkpaimyc
--- a/scenes/damage/CDamageable.tscn
+++ b/scenes/damage/CDamageable.tscn
@@ -1,6 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://hpsg4fqwrx1u"]
-
-[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="1_qp8bd"]
-
-[node name="CDamageable" type="Node"]
-script = ExtResource("1_qp8bd")
--- a/scenes/enemies/flying_enemy/flying_enemy.tscn
+++ b/scenes/enemies/flying_enemy/flying_enemy.tscn
@@ -1,15 +1,15 @@
 [gd_scene load_steps=20 format=3 uid="uid://cmlud1hwkd6sv"]

 [ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/Enemy.cs" id="1_q8l7o"]
-[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_1bsgx"]
+[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://components/damage/RDamageModifier.cs" id="2_1bsgx"]
 [ext_resource type="Resource" uid="uid://dg1xbjhyhgnnk" path="res://scenes/enemies/flying_enemy/flying_enemy_health.tres" id="2_ma2bq"]
 [ext_resource type="Resource" uid="uid://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy/flying_enemy_damage.tres" id="2_on7rt"]
 [ext_resource type="Resource" uid="uid://bwqjaom4k7rc3" path="res://scenes/enemies/flying_enemy/flying_enemy_movement.tres" id="4_dejyg"]
-[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="4_ys4jv"]
-[ext_resource type="PackedScene" uid="uid://dmw5ibwrb483f" path="res://scenes/movement/CFlyingMovement.tscn" id="7_vaeds"]
-[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="8_on7rt"]
-[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="8_uotso"]
-[ext_resource type="PackedScene" uid="uid://bctpe34ddamg5" path="res://scenes/knockback/CKnockback.tscn" id="10_dejyg"]
+[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://components/health/CHealth.cs" id="4_ys4jv"]
+[ext_resource type="PackedScene" uid="uid://dmw5ibwrb483f" path="res://components/movement/CFlyingMovement.tscn" id="7_vaeds"]
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://components/movement/RMovement.cs" id="8_on7rt"]
+[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://components/damage/CDamageable.cs" id="8_uotso"]
+[ext_resource type="PackedScene" uid="uid://bctpe34ddamg5" path="res://components/knockback/CKnockback.tscn" id="10_dejyg"]
 [ext_resource type="Resource" uid="uid://dt7a1io5o0b8s" path="res://scenes/enemies/flying_enemy/flying_enemy_knockback.tres" id="11_mpa2u"]

 [sub_resource type="Resource" id="Resource_jnv07"]
--- a/scenes/enemies/flying_enemy/flying_enemy_damage.tres
+++ b/scenes/enemies/flying_enemy/flying_enemy_damage.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="RDamage" load_steps=2 format=3 uid="uid://dgo65k2ceqfvy"]

-[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="1_h6law"]
+[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://components/damage/RDamage.cs" id="1_h6law"]

 [resource]
 script = ExtResource("1_h6law")
--- a/scenes/enemies/flying_enemy/flying_enemy_health.tres
+++ b/scenes/enemies/flying_enemy/flying_enemy_health.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="RHealth" load_steps=2 format=3 uid="uid://dg1xbjhyhgnnk"]

-[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="1_jht15"]
+[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://components/health/RHealth.cs" id="1_jht15"]

 [resource]
 script = ExtResource("1_jht15")
--- a/scenes/enemies/flying_enemy/flying_enemy_knockback.tres
+++ b/scenes/enemies/flying_enemy/flying_enemy_knockback.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="RKnockback" load_steps=2 format=3 uid="uid://dt7a1io5o0b8s"]

-[ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://resource_definitions/RKnockback.cs" id="1_yq03x"]
+[ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://components/knockback/RKnockback.cs" id="1_yq03x"]

 [resource]
 script = ExtResource("1_yq03x")
--- a/scenes/enemies/flying_enemy/flying_enemy_movement.tres
+++ b/scenes/enemies/flying_enemy/flying_enemy_movement.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="RMovement" load_steps=2 format=3 uid="uid://bwqjaom4k7rc3"]

-[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="1_3yq0a"]
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://components/movement/RMovement.cs" id="1_3yq0a"]

 [resource]
 script = ExtResource("1_3yq0a")
--- a/scenes/enemies/grounded_enemy/grounded_enemy.tscn
+++ b/scenes/enemies/grounded_enemy/grounded_enemy.tscn
@@ -2,14 +2,14 @@

 [ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/Enemy.cs" id="1_r6506"]
 [ext_resource type="Resource" uid="uid://otfc2snh8umc" path="res://scenes/enemies/grounded_enemy/grounded_enemy_damage.tres" id="2_bn56u"]
-[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="2_gsmti"]
-[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_r3cnf"]
+[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://components/health/CHealth.cs" id="2_gsmti"]
+[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://components/damage/RDamageModifier.cs" id="2_r3cnf"]
 [ext_resource type="Resource" uid="uid://bohbojc68j7y1" path="res://scenes/enemies/grounded_enemy/grounded_enemy_health.tres" id="2_w4lm8"]
 [ext_resource type="Resource" uid="uid://bqq6uukbdfysr" path="res://scenes/enemies/grounded_enemy/grounded_enemy_movement.tres" id="4_na24f"]
-[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="7_1tw73"]
-[ext_resource type="PackedScene" uid="uid://dbr7ioio158ew" path="res://scenes/movement/CGroundedMovement.tscn" id="7_qyswd"]
-[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="8_6d4gl"]
-[ext_resource type="PackedScene" uid="uid://bctpe34ddamg5" path="res://scenes/knockback/CKnockback.tscn" id="10_jqqi6"]
+[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://components/damage/CDamageable.cs" id="7_1tw73"]
+[ext_resource type="PackedScene" uid="uid://dbr7ioio158ew" path="res://components/movement/CGroundedMovement.tscn" id="7_qyswd"]
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://components/movement/RMovement.cs" id="8_6d4gl"]
+[ext_resource type="PackedScene" uid="uid://bctpe34ddamg5" path="res://components/knockback/CKnockback.tscn" id="10_jqqi6"]
 [ext_resource type="Resource" uid="uid://cektf6waf4s04" path="res://scenes/enemies/grounded_enemy/grounded_enemy_knockback.tres" id="11_8k3xb"]

 [sub_resource type="Resource" id="Resource_qj0ob"]
--- a/scenes/enemies/grounded_enemy/grounded_enemy_damage.tres
+++ b/scenes/enemies/grounded_enemy/grounded_enemy_damage.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="RDamage" load_steps=2 format=3 uid="uid://otfc2snh8umc"]

-[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="1_y415a"]
+[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://components/damage/RDamage.cs" id="1_y415a"]

 [resource]
 script = ExtResource("1_y415a")
--- a/scenes/enemies/grounded_enemy/grounded_enemy_health.tres
+++ b/scenes/enemies/grounded_enemy/grounded_enemy_health.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="RHealth" load_steps=2 format=3 uid="uid://bohbojc68j7y1"]

-[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="1_h6jgd"]
+[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://components/health/RHealth.cs" id="1_h6jgd"]

 [resource]
 script = ExtResource("1_h6jgd")
--- a/scenes/enemies/grounded_enemy/grounded_enemy_knockback.tres
+++ b/scenes/enemies/grounded_enemy/grounded_enemy_knockback.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="RKnockback" load_steps=2 format=3 uid="uid://cektf6waf4s04"]

-[ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://resource_definitions/RKnockback.cs" id="1_vdia8"]
+[ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://components/knockback/RKnockback.cs" id="1_vdia8"]

 [resource]
 script = ExtResource("1_vdia8")
--- a/scenes/enemies/grounded_enemy/grounded_enemy_movement.tres
+++ b/scenes/enemies/grounded_enemy/grounded_enemy_movement.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="RMovement" load_steps=2 format=3 uid="uid://bqq6uukbdfysr"]

-[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="1_hsy8g"]
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://components/movement/RMovement.cs" id="1_hsy8g"]

 [resource]
 script = ExtResource("1_hsy8g")
--- a/scenes/health/CHealth.cs
+++ b/scenes/health/CHealth.cs
@@ -1,33 +0,0 @@
-using Godot;
-using System;
-using Movementtests.interfaces;
-
-[GlobalClass]
-public partial class CHealth : Node, IHealthable
-{
-    public event Action<IHealthable, float> HealthChanged;
-    public event Action<IHealthable> HealthDepleted;
-    
-    [Export]
-    public RHealth RHealth { get; set; }
-    
-    public float CurrentHealth { get; set; }
-
-    public override void _Ready()
-    {
-        CurrentHealth = RHealth.StartingHealth;
-    }
-
-    public void ReduceHealth(IDamageable source, DamageRecord damageRecord)
-    {
-        GD.Print(CurrentHealth);
-        CurrentHealth -= damageRecord.Damage.DamageDealt;
-        HealthChanged?.Invoke(this, CurrentHealth);
-
-        if (CurrentHealth <= 0)
-        {
-            CurrentHealth = 0;
-            HealthDepleted?.Invoke(this);
-        }
-    }
-}
--- a/scenes/health/CHealth.cs.uid
+++ b/scenes/health/CHealth.cs.uid
@@ -1 +0,0 @@
-uid://bjwrpv3jpsc1e
--- a/scenes/health/CHealth.tscn
+++ b/scenes/health/CHealth.tscn
@@ -1,6 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://c4ikbhojckpnc"]
-
-[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="1_75uyt"]
-
-[node name="CHealth" type="Node"]
-script = ExtResource("1_75uyt")
--- a/scenes/knockback/CKnockback.cs
+++ b/scenes/knockback/CKnockback.cs
@@ -1,25 +0,0 @@
-using Godot;
-using System;
-using Movementtests.interfaces;
-
-[GlobalClass]
-public partial class CKnockback : Node3D, IKnockbackable
-{
-    [Export] public RKnockback RKnockback { get; set;}
-    
-    private DamageRecord _damageRecord = null;
-    
-    public void RegisterKnockback(IDamageable source, DamageRecord damageRecord)
-    {
-        _damageRecord = damageRecord;
-    }
-
-    public Vector3 ComputeKnockback()
-    {
-        if (_damageRecord == null) return Vector3.Zero;
-        
-        var knockbackDirection = GlobalPosition - _damageRecord.Source.GlobalPosition;
-        _damageRecord = null;
-        return knockbackDirection.Normalized() * RKnockback.Modifier;
-    }
-}
--- a/scenes/knockback/CKnockback.cs.uid
+++ b/scenes/knockback/CKnockback.cs.uid
@@ -1 +0,0 @@
-uid://b8dprpcjeac7e
--- a/scenes/knockback/CKnockback.tscn
+++ b/scenes/knockback/CKnockback.tscn
@@ -1,12 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://bctpe34ddamg5"]
-
-[ext_resource type="Script" uid="uid://b8dprpcjeac7e" path="res://scenes/knockback/CKnockback.cs" id="1_ix2yg"]
-[ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://resource_definitions/RKnockback.cs" id="2_uqiml"]
-
-[sub_resource type="Resource" id="Resource_gbu2d"]
-script = ExtResource("2_uqiml")
-metadata/_custom_type_script = "uid://b44cse62qru7j"
-
-[node name="CKnockback" type="Node3D"]
-script = ExtResource("1_ix2yg")
-RKnockback = SubResource("Resource_gbu2d")
--- a/scenes/movement/CFlyingMovement.cs
+++ b/scenes/movement/CFlyingMovement.cs
@@ -1,61 +0,0 @@
-using Godot;
-using Movementtests.interfaces;
-
-namespace Movementtests.scenes.movement;
-
-public partial class CFlyingMovement : Node3D, IMoveable
-{
-    [Export] public RMovement RMovement { get; set; }
-
-    [Export(PropertyHint.Layers3DPhysics)]
-    public uint TerrainCollision { get; set; } = 1;
-    
-    private bool _movingToDesiredHeight = true;
-    private Vector3 _randomDirection;
-
-    public override void _Ready()
-    {
-        _randomDirection = new Vector3(GD.RandRange(-1, 1), 1, GD.RandRange(-1, 1)).Normalized();
-    }
-
-    public Vector3 ComputeVelocity(MovementInputs inputs)
-    {
-        var velocity = inputs.Velocity;
-        var spaceState = GetWorld3D().DirectSpaceState;
-        var target = inputs.TargetLocation;
-        var direction = (target - GlobalPosition).Normalized();
-        // Check if we have a direct line of sight to the player
-        if (!_movingToDesiredHeight)
-        {
-            velocity = velocity.Lerp(direction * RMovement.Speed, (float) inputs.delta * RMovement.Acceleration);
-			
-            var query = PhysicsRayQueryParameters3D.Create(GlobalPosition, target, TerrainCollision);
-            var result = spaceState.IntersectRay(query);
-            if (result.Count > 0)
-            {
-                _movingToDesiredHeight = true;
-                _randomDirection = new Vector3(GD.RandRange(-1, 1), 1, GD.RandRange(-1, 1)).Normalized();
-            }
-        }
-        else
-        {
-            velocity = velocity.Lerp(_randomDirection * RMovement.Speed, (float) inputs.delta * RMovement.Acceleration);
-			
-            var groundQuery = PhysicsRayQueryParameters3D.Create(GlobalPosition, GlobalPosition+Vector3.Down*RMovement.TargetHeight, TerrainCollision);
-            var groundResult = spaceState.IntersectRay(groundQuery);
-            if (groundResult.Count == 0)
-            {
-                velocity.Y = 0;
-			
-                var query = PhysicsRayQueryParameters3D.Create(GlobalPosition, target, TerrainCollision);
-                var result = spaceState.IntersectRay(query);
-                if (result.Count == 0)
-                {
-                    _movingToDesiredHeight = false;
-                }
-            }
-        }
-
-        return velocity;
-    }
-}
--- a/scenes/movement/CFlyingMovement.cs.uid
+++ b/scenes/movement/CFlyingMovement.cs.uid
@@ -1 +0,0 @@
-uid://cps1rbkxs3nvq
--- a/scenes/movement/CFlyingMovement.tscn
+++ b/scenes/movement/CFlyingMovement.tscn
@@ -1,7 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://dmw5ibwrb483f"]
-
-[ext_resource type="Script" uid="uid://cps1rbkxs3nvq" path="res://scenes/movement/CFlyingMovement.cs" id="1_i26q2"]
-
-[node name="CFlyingMovement" type="Node3D"]
-script = ExtResource("1_i26q2")
-CollisionMask = 256
--- a/scenes/movement/CGroundedMovement.cs
+++ b/scenes/movement/CGroundedMovement.cs
@@ -1,34 +0,0 @@
-using Godot;
-using Movementtests.interfaces;
-
-namespace Movementtests.scenes.movement;
-
-public partial class CGroundedMovement : Node3D, IMoveable
-{
-    [Export] public RMovement RMovement { get; set; }
-
-    [Export]
-    public RayCast3D WallInFrontRayCast { get; set; }
-    
-    
-    public Vector3 ComputeVelocity(MovementInputs inputs)
-    {
-        var velocity = inputs.Velocity;
-        var target = inputs.TargetLocation;
-        var direction = (target - GlobalPosition).Normalized();
-
-        var targetPlane = new Vector3(target.X, GlobalPosition.Y, target.Z);
-        LookAt(targetPlane);
-        float xAcc = (float) Mathf.Lerp(velocity.X, direction.X * RMovement.Speed, inputs.delta * RMovement.Acceleration);
-        float zAcc = (float) Mathf.Lerp(velocity.Z, direction.Z * RMovement.Speed, inputs.delta * RMovement.Acceleration);
-        velocity.X = xAcc;
-        velocity.Z = zAcc;
-
-        if (WallInFrontRayCast.IsColliding())
-            velocity.Y = RMovement.Speed;
-        else if (!inputs.isOnFloor)
-            velocity += inputs.gravity * (float)inputs.delta * RMovement.GravityModifier;
-
-        return velocity;
-    }
-}
--- a/scenes/movement/CGroundedMovement.cs.uid
+++ b/scenes/movement/CGroundedMovement.cs.uid
@@ -1 +0,0 @@
-uid://bdag2eeixw2lt
--- a/scenes/movement/CGroundedMovement.tscn
+++ b/scenes/movement/CGroundedMovement.tscn
@@ -1,6 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://dbr7ioio158ew"]
-
-[ext_resource type="Script" uid="uid://bdag2eeixw2lt" path="res://scenes/movement/CGroundedMovement.cs" id="1_e0agf"]
-
-[node name="CGroundedMovement" type="Node3D"]
-script = ExtResource("1_e0agf")