added fixed dash targets and can dash towards enemies to hit them, get a knockback or dash through if killed
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 22s
Create tag and build when new code gets to main / Export (push) Failing after 1m51s

This commit is contained in:
2026-01-21 16:46:20 +01:00
parent fb78add739
commit db49703326
19 changed files with 370 additions and 60 deletions

View File

@@ -0,0 +1,31 @@
using Godot;
using System;
using Movementtests.interfaces;
[GlobalClass]
public partial class FixedDashthroughTarget : AnimatableBody3D, ITargetable, IStunnable
{
public Vector3 GetTargetGlobalPosition()
{
return GlobalPosition;
}
private uint _defaultCollisionMask;
public override void _Ready()
{
_defaultCollisionMask = CollisionMask;
}
public bool IsStunned { get; set; }
public float StunDuration { get; set; } = 0.1f;
public void Stun()
{
_defaultCollisionMask = 0;
GetTree().CreateTimer(StunDuration).Timeout += Unstun;
}
public void Unstun()
{
_defaultCollisionMask = CollisionMask;
}
}

View File

@@ -0,0 +1 @@
uid://c10qfkvmrm6uq

View File

@@ -0,0 +1,30 @@
[gd_scene load_steps=5 format=3 uid="uid://qup00a7x2sji"]
[ext_resource type="Script" uid="uid://c10qfkvmrm6uq" path="res://scenes/FixedDashTarget/FixedDashthroughTarget.cs" id="1_r0j7a"]
[sub_resource type="SphereShape3D" id="SphereShape3D_nkm8n"]
radius = 1.0
[sub_resource type="SphereMesh" id="SphereMesh_r0j7a"]
radius = 1.0
height = 2.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kgb3i"]
albedo_color = Color(5.1018596e-06, 0.6818665, 0.7627612, 1)
metallic = 0.8
metallic_specular = 0.6
roughness = 0.1
emission_enabled = true
emission = Color(0, 0.68968636, 0.7473501, 1)
[node name="FixedDashthroughTarget" type="AnimatableBody3D"]
collision_layer = 288
collision_mask = 0
script = ExtResource("1_r0j7a")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("SphereShape3D_nkm8n")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
mesh = SubResource("SphereMesh_r0j7a")
surface_material_override/0 = SubResource("StandardMaterial3D_kgb3i")

View File

@@ -11,7 +11,8 @@ public partial class Enemy : CharacterBody3D,
IMoveable,
ISpawnable,
IKnockbackable,
ITargetable
ITargetable,
IStunnable
{
// Signals and events
public event Action<IDamageable, DamageRecord> DamageTaken;
@@ -44,10 +45,15 @@ public partial class Enemy : CharacterBody3D,
public IMoveable CMovement { get; set; }
// Public stuff
public float CurrentHealth { get; set; }
public float CurrentHealth
{
get => CHealth.CurrentHealth;
set => CHealth.CurrentHealth = value;
}
// Private stuff
private Area3D _damageBox;
private Node3D _target;
public override void _Ready()
{
@@ -58,6 +64,7 @@ public partial class Enemy : CharacterBody3D,
public void Initialize()
{
_damageBox = GetNode<Area3D>("DamageBox");
_target = GetNode<Node3D>("CTarget");
CDamageable = GetNode<Node>("CDamageable") as IDamageable;
CMovement = GetNode<Node>("CMovement") as IMoveable;
@@ -106,6 +113,8 @@ public partial class Enemy : CharacterBody3D,
public void ProcessGameplay(double delta)
{
if (IsStunned) return;
var bodies = _damageBox.GetOverlappingBodies();
foreach (var body in bodies)
{
@@ -130,6 +139,14 @@ public partial class Enemy : CharacterBody3D,
return finalDamage;
}
public DamageRecord ComputeDamage(DamageRecord damageRecord)
{
if (CDamageable is null)
return damageRecord with { Damage = new RDamage(0, damageRecord.Damage.DamageType) };
return CDamageable.ComputeDamage(damageRecord);
}
public void ReduceHealth(IDamageable source, DamageRecord damageRecord)
{
if (CHealth is null) return;
@@ -160,8 +177,22 @@ public partial class Enemy : CharacterBody3D,
public Vector3 GetTargetGlobalPosition()
{
var target = GetNode<Node3D>("CTarget");
if (target is null) return GlobalPosition;
return target.GlobalPosition;
if (_target is null) return GlobalPosition;
return _target.GlobalPosition;
}
// Stun management
public bool IsStunned { get; set; } = false;
[Export(PropertyHint.Range, "0.1, 2, 0.1, or_greater")]
public float StunDuration { get; set; } = 1f;
public void Stun()
{
IsStunned = true;
GetTree().CreateTimer(StunDuration).Timeout += Unstun;
}
public void Unstun()
{
IsStunned = false;
}
}

View File

@@ -42,19 +42,15 @@ albedo_color = Color(0.06469653, 0.06469653, 0.06469653, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_4yfjf"]
[node name="FlyingEnemy" type="CharacterBody3D" node_paths=PackedStringArray("CHealth", "CDamage", "CKnockback", "CMovement")]
[node name="FlyingEnemy" type="CharacterBody3D"]
collision_layer = 16
collision_mask = 273
motion_mode = 1
script = ExtResource("1_q8l7o")
CHealth = NodePath("CHealth")
RHealth = ExtResource("2_ma2bq")
DeathEffects = Array[Object]([])
CDamage = NodePath("CDamageable")
RDamage = ExtResource("2_on7rt")
CKnockback = NodePath("CKnockback")
RKnockback = ExtResource("11_mpa2u")
CMovement = NodePath("CMovement")
RMovement = ExtResource("4_dejyg")
[node name="CHealth" type="Node" parent="."]
@@ -74,6 +70,8 @@ TerrainCollision = 256
[node name="CKnockback" parent="." instance=ExtResource("10_dejyg")]
RKnockback = ExtResource("11_mpa2u")
[node name="CTarget" type="Marker3D" parent="."]
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("SphereShape3D_b46rq")

View File

@@ -14,7 +14,7 @@
[sub_resource type="Resource" id="Resource_qj0ob"]
script = ExtResource("2_r3cnf")
Modifier = 3.0
Modifier = 1.0
metadata/_custom_type_script = "uid://b6y3ugfydvch0"
[sub_resource type="Resource" id="Resource_6d4gl"]

View File

@@ -4,4 +4,5 @@
[resource]
script = ExtResource("1_h6jgd")
StartingHealth = 10.0
metadata/_custom_type_script = "uid://baiapod3csndf"