Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 95616f61fc | |||
| b15a4fef95 | |||
| 14d29d68bb | |||
| 9d612682ec | |||
| 9bfe37af62 | |||
| 55eba7fcc8 | |||
| 7a3e61b86f | |||
| 8153ec07e7 | |||
| ddc85655be | |||
| c92eb19a1c | |||
| 290f79afd4 | |||
| 5408f455af |
@@ -83,6 +83,8 @@ jobs:
|
|||||||
|
|
||||||
Export:
|
Export:
|
||||||
runs-on: godot
|
runs-on: godot
|
||||||
|
env:
|
||||||
|
RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
|
||||||
needs:
|
needs:
|
||||||
- BumpTag
|
- BumpTag
|
||||||
|
|
||||||
|
|||||||
@@ -125,25 +125,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="addons\" />
|
<Folder Include="addons\" />
|
||||||
|
<Folder Include="tests\" />
|
||||||
|
<Folder Include="tools\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="RustyOptions" Version="0.10.1" />
|
<PackageReference Include="RustyOptions" Version="0.10.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="addons/forge/Forge.props" />
|
<Import Project="addons/forge/Forge.props" />
|
||||||
|
|
||||||
<!-- XUnit -->
|
|
||||||
<ItemGroup>
|
|
||||||
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Using Include="Xunit" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<!-- gdUnit4 package dependencies -->
|
<!-- gdUnit4 package dependencies -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
|
||||||
@@ -154,5 +143,4 @@
|
|||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -13,15 +13,10 @@ public partial class ForgeManager : Node
|
|||||||
"class.warrior",
|
"class.warrior",
|
||||||
"status.stunned",
|
"status.stunned",
|
||||||
"status.burning",
|
"status.burning",
|
||||||
"status.enraged",
|
|
||||||
"status.immune.fire",
|
"status.immune.fire",
|
||||||
"cues.damage.fire",
|
"cues.damage.fire",
|
||||||
"events.combat.damage",
|
"events.combat.damage",
|
||||||
"events.combat.hit",
|
"events.combat.hit",
|
||||||
"cooldown.fireball"
|
"cooldown.empoweredAction",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
public ForgeManager()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
78
forge/abilities/REmpoweredAction.cs
Normal file
78
forge/abilities/REmpoweredAction.cs
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
using Gamesmiths.Forge.Abilities;
|
||||||
|
using Gamesmiths.Forge.Effects;
|
||||||
|
using Gamesmiths.Forge.Effects.Components;
|
||||||
|
using Gamesmiths.Forge.Effects.Duration;
|
||||||
|
using Gamesmiths.Forge.Effects.Magnitudes;
|
||||||
|
using Gamesmiths.Forge.Effects.Modifiers;
|
||||||
|
using Gamesmiths.Forge.Tags;
|
||||||
|
using Godot;
|
||||||
|
|
||||||
|
namespace Movementtests.forge.abilities;
|
||||||
|
|
||||||
|
[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_animation.png")]
|
||||||
|
public partial class REmpoweredAction(float cost, float cooldown, float manaRegenPause) : Resource
|
||||||
|
{
|
||||||
|
[Export(PropertyHint.Range, "0,100,1,or_greater")]
|
||||||
|
public float Cost { get; set; } = cost;
|
||||||
|
|
||||||
|
[Export(PropertyHint.Range, "0,10,0.1,or_greater")]
|
||||||
|
public float Cooldown { get; set; } = cooldown;
|
||||||
|
|
||||||
|
[Export(PropertyHint.Range, "0,10,0.1,or_greater")]
|
||||||
|
public float ManaRegenPause { get; set; } = manaRegenPause;
|
||||||
|
|
||||||
|
public REmpoweredAction() : this(20.0f, 1.0f, 3.0f)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public EffectData CostEffect()
|
||||||
|
{
|
||||||
|
return new(
|
||||||
|
"Empowered Action Mana Cost",
|
||||||
|
new DurationData(DurationType.Instant),
|
||||||
|
new[]
|
||||||
|
{
|
||||||
|
new Modifier(
|
||||||
|
"PlayerAttributeSet.Mana",
|
||||||
|
ModifierOperation.FlatBonus,
|
||||||
|
new ModifierMagnitude(
|
||||||
|
MagnitudeCalculationType.ScalableFloat,
|
||||||
|
new ScalableFloat(-Cost)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public EffectData CooldownEffect(TagsManager tagsManager)
|
||||||
|
{
|
||||||
|
return new(
|
||||||
|
"Empowered Action Cooldown",
|
||||||
|
new DurationData(
|
||||||
|
DurationType.HasDuration,
|
||||||
|
new ModifierMagnitude(
|
||||||
|
MagnitudeCalculationType.ScalableFloat,
|
||||||
|
new ScalableFloat(Cooldown))),
|
||||||
|
effectComponents: new[]
|
||||||
|
{
|
||||||
|
new ModifierTagsEffectComponent(
|
||||||
|
tagsManager.RequestTagContainer(new[] { "cooldown.empoweredAction" })
|
||||||
|
)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public class EmpoweredActionBehavior : IAbilityBehavior
|
||||||
|
{
|
||||||
|
public void OnStarted(AbilityBehaviorContext context)
|
||||||
|
{
|
||||||
|
// Apply costs and cooldowns
|
||||||
|
context.AbilityHandle.CommitAbility();
|
||||||
|
context.InstanceHandle.End();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnEnded(AbilityBehaviorContext context)
|
||||||
|
{
|
||||||
|
// Do any necessary cleanups
|
||||||
|
}
|
||||||
|
}
|
||||||
1
forge/abilities/REmpoweredAction.cs.uid
Normal file
1
forge/abilities/REmpoweredAction.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://d0l07gcx1ef18
|
||||||
46
forge/effects/RManaRegen.cs
Normal file
46
forge/effects/RManaRegen.cs
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
using Gamesmiths.Forge.Effects;
|
||||||
|
using Gamesmiths.Forge.Effects.Duration;
|
||||||
|
using Gamesmiths.Forge.Effects.Magnitudes;
|
||||||
|
using Gamesmiths.Forge.Effects.Modifiers;
|
||||||
|
using Gamesmiths.Forge.Effects.Periodic;
|
||||||
|
using Godot;
|
||||||
|
|
||||||
|
namespace Movementtests.tools.effects;
|
||||||
|
|
||||||
|
[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_liquid.png")]
|
||||||
|
public partial class RManaRegen(float manaRegenRate, float frequency) : Resource
|
||||||
|
{
|
||||||
|
[Export(PropertyHint.Range, "0,100,0.1,or_greater")]
|
||||||
|
public float ManaRegenRate { get; set; } = manaRegenRate;
|
||||||
|
|
||||||
|
[Export(PropertyHint.Range, "0.01,1,0.1,or_greater")]
|
||||||
|
public float Frequency { get; set; } = frequency;
|
||||||
|
|
||||||
|
public RManaRegen() : this(1.0f, 0.1f)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public EffectData ManaRegen()
|
||||||
|
{
|
||||||
|
return new EffectData(
|
||||||
|
"Mana Regen",
|
||||||
|
durationData: new DurationData(
|
||||||
|
DurationType.Infinite
|
||||||
|
),
|
||||||
|
modifiers: [
|
||||||
|
new Modifier(
|
||||||
|
"PlayerAttributeSet.Mana",
|
||||||
|
ModifierOperation.FlatBonus,
|
||||||
|
new ModifierMagnitude(
|
||||||
|
MagnitudeCalculationType.ScalableFloat,
|
||||||
|
new ScalableFloat(ManaRegenRate * Frequency))
|
||||||
|
)
|
||||||
|
],
|
||||||
|
periodicData: new PeriodicData(
|
||||||
|
Period: new ScalableFloat(Frequency),
|
||||||
|
ExecuteOnApplication: true,
|
||||||
|
PeriodInhibitionRemovedPolicy: PeriodInhibitionRemovedPolicy.ResetPeriod
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
1
forge/effects/RManaRegen.cs.uid
Normal file
1
forge/effects/RManaRegen.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://di04jvuqp0h7m
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"test": {
|
|
||||||
"runner": "Microsoft.Testing.Platform"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -770,3 +770,10 @@ transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.5, 0, 0)
|
|||||||
|
|
||||||
[node name="PlayerFellRespawn" parent="." index="10" unique_id=479136076]
|
[node name="PlayerFellRespawn" parent="." index="10" unique_id=479136076]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 1.5, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 1.5, 0)
|
||||||
|
|
||||||
|
[node name="OmniLight3D" type="OmniLight3D" parent="." index="13" unique_id=702421172]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 25, 4)
|
||||||
|
|
||||||
|
[node name="OmniLight3D2" type="OmniLight3D" parent="." index="14" unique_id=2016820716]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 25, -9.5)
|
||||||
|
omni_range = 12.0
|
||||||
|
|||||||
@@ -3,14 +3,10 @@ using System;
|
|||||||
using Movementtests.interfaces;
|
using Movementtests.interfaces;
|
||||||
|
|
||||||
[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_heart.png")]
|
[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_heart.png")]
|
||||||
public partial class RHealth : Resource
|
public partial class RHealth(float startingHealth) : Resource
|
||||||
{
|
{
|
||||||
[Export]
|
[Export]
|
||||||
public float StartingHealth { get; set;}
|
public float StartingHealth { get; set;} = startingHealth;
|
||||||
|
|
||||||
public RHealth() : this(100.0f) {}
|
public RHealth() : this(100.0f) {}
|
||||||
public RHealth(float startingHealth)
|
|
||||||
{
|
|
||||||
StartingHealth = startingHealth;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,14 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using Gamesmiths.Forge.Core;
|
||||||
|
using Gamesmiths.Forge.Effects;
|
||||||
|
using Gamesmiths.Forge.Events;
|
||||||
|
using Gamesmiths.Forge.Tags;
|
||||||
using Godot;
|
using Godot;
|
||||||
using Movementtests.interfaces;
|
using Movementtests.interfaces;
|
||||||
|
using Movementtests.scenes.enemies;
|
||||||
|
using Movementtests.scenes.player_controller.scripts;
|
||||||
using Movementtests.systems;
|
using Movementtests.systems;
|
||||||
|
using Movementtests.tools;
|
||||||
|
|
||||||
[GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_beetle.png")]
|
[GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_beetle.png")]
|
||||||
public partial class Enemy : CharacterBody3D,
|
public partial class Enemy : CharacterBody3D,
|
||||||
@@ -13,7 +20,8 @@ public partial class Enemy : CharacterBody3D,
|
|||||||
ISpawnable,
|
ISpawnable,
|
||||||
IKnockbackable,
|
IKnockbackable,
|
||||||
ITargetable,
|
ITargetable,
|
||||||
IStunnable
|
IStunnable,
|
||||||
|
IForgeEntity
|
||||||
{
|
{
|
||||||
// Signals and events
|
// Signals and events
|
||||||
public event Action<IDamageable, DamageRecord> DamageTaken = null!;
|
public event Action<IDamageable, DamageRecord> DamageTaken = null!;
|
||||||
@@ -55,6 +63,12 @@ public partial class Enemy : CharacterBody3D,
|
|||||||
set => CHealth.CurrentHealth = value;
|
set => CHealth.CurrentHealth = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public EntityAttributes Attributes { get; set; } = null!;
|
||||||
|
public EntityTags Tags { get; set; } = null!;
|
||||||
|
public EffectsManager EffectsManager { get; set; } = null!;
|
||||||
|
public EntityAbilities Abilities { get; set; } = null!;
|
||||||
|
public EventManager Events { get; set; } = null!;
|
||||||
|
|
||||||
// Private stuff
|
// Private stuff
|
||||||
private Area3D _damageBox = null!;
|
private Area3D _damageBox = null!;
|
||||||
internal Node3D _target = null!;
|
internal Node3D _target = null!;
|
||||||
@@ -71,6 +85,21 @@ public partial class Enemy : CharacterBody3D,
|
|||||||
_damageBox = GetNode<Area3D>("DamageBox");
|
_damageBox = GetNode<Area3D>("DamageBox");
|
||||||
_target = GetNode<Node3D>("CTarget");
|
_target = GetNode<Node3D>("CTarget");
|
||||||
|
|
||||||
|
// Forge stuff
|
||||||
|
var forgeManager = GetTree().Root.GetNode<ForgeManager>("ForgeManager")!;
|
||||||
|
var baseTags = new TagContainer(
|
||||||
|
forgeManager.TagsManager,
|
||||||
|
[
|
||||||
|
Tag.RequestTag(forgeManager.TagsManager, "character.player"),
|
||||||
|
Tag.RequestTag(forgeManager.TagsManager, "class.warrior")
|
||||||
|
]);
|
||||||
|
|
||||||
|
Attributes = new EntityAttributes(new EnemyAttributeSet());
|
||||||
|
Tags = new EntityTags(baseTags);
|
||||||
|
EffectsManager = new EffectsManager(this, forgeManager.CuesManager);
|
||||||
|
Abilities = new(this);
|
||||||
|
Events = new();
|
||||||
|
|
||||||
CDamageable = (GetNode<Node>("CDamageable") as IDamageable)!;
|
CDamageable = (GetNode<Node>("CDamageable") as IDamageable)!;
|
||||||
CMovement = (GetNode<Node>("CMovement") as IMoveable)!;
|
CMovement = (GetNode<Node>("CMovement") as IMoveable)!;
|
||||||
CHealth = (GetNode<Node>("CHealth") as IHealthable)!;
|
CHealth = (GetNode<Node>("CHealth") as IHealthable)!;
|
||||||
|
|||||||
16
scenes/enemies/EnemyAttributeSet.cs
Normal file
16
scenes/enemies/EnemyAttributeSet.cs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
using Gamesmiths.Forge.Attributes;
|
||||||
|
namespace Movementtests.scenes.enemies;
|
||||||
|
|
||||||
|
public class EnemyAttributeSet : AttributeSet
|
||||||
|
{
|
||||||
|
public EntityAttribute Health { get; }
|
||||||
|
public EntityAttribute Strength { get; }
|
||||||
|
public EntityAttribute Speed { get; }
|
||||||
|
|
||||||
|
public EnemyAttributeSet()
|
||||||
|
{
|
||||||
|
Health = InitializeAttribute(nameof(Health), 100, 0, 150);
|
||||||
|
Strength = InitializeAttribute(nameof(Strength), 10, 0, 99);
|
||||||
|
Speed = InitializeAttribute(nameof(Speed), 5, 0, 10);
|
||||||
|
}
|
||||||
|
}
|
||||||
1
scenes/enemies/EnemyAttributeSet.cs.uid
Normal file
1
scenes/enemies/EnemyAttributeSet.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://nqxdkkg3l7go
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://scenes/components/damage/RDamage.cs" id="2_x835q"]
|
[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://scenes/components/damage/RDamage.cs" id="2_x835q"]
|
||||||
[ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://scenes/components/knockback/RKnockback.cs" id="3_cb2lu"]
|
[ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://scenes/components/knockback/RKnockback.cs" id="3_cb2lu"]
|
||||||
[ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://inputs/base_mode/base_mode.tres" id="3_cresl"]
|
[ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://inputs/base_mode/base_mode.tres" id="3_cresl"]
|
||||||
|
[ext_resource type="Resource" uid="uid://dtmhtlix2amme" path="res://scenes/player_controller/resources/player_mana_regen.tres" id="3_n24vh"]
|
||||||
[ext_resource type="PackedScene" uid="uid://c4ikbhojckpnc" path="res://scenes/components/health/CHealth.tscn" id="3_q7bng"]
|
[ext_resource type="PackedScene" uid="uid://c4ikbhojckpnc" path="res://scenes/components/health/CHealth.tscn" id="3_q7bng"]
|
||||||
[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://scenes/components/health/RHealth.cs" id="4_abfq8"]
|
[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://scenes/components/health/RHealth.cs" id="4_abfq8"]
|
||||||
[ext_resource type="Resource" uid="uid://bjyd801wvverk" path="res://scenes/player_controller/resources/player_health.tres" id="4_m8gvy"]
|
[ext_resource type="Resource" uid="uid://bjyd801wvverk" path="res://scenes/player_controller/resources/player_health.tres" id="4_m8gvy"]
|
||||||
@@ -17,6 +18,7 @@
|
|||||||
[ext_resource type="Resource" uid="uid://t612lts1wi1s" path="res://inputs/base_mode/move_right.tres" id="6_q7bng"]
|
[ext_resource type="Resource" uid="uid://t612lts1wi1s" path="res://inputs/base_mode/move_right.tres" id="6_q7bng"]
|
||||||
[ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://scenes/player_controller/scripts/StairsSystem.cs" id="7_bmt5a"]
|
[ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://scenes/player_controller/scripts/StairsSystem.cs" id="7_bmt5a"]
|
||||||
[ext_resource type="Resource" uid="uid://brswsknpgwal2" path="res://inputs/base_mode/move_front.tres" id="7_m8gvy"]
|
[ext_resource type="Resource" uid="uid://brswsknpgwal2" path="res://inputs/base_mode/move_front.tres" id="7_m8gvy"]
|
||||||
|
[ext_resource type="Resource" uid="uid://7dpkk5rk3di5" path="res://scenes/player_controller/resources/forge_empowered_action.tres" id="7_qheee"]
|
||||||
[ext_resource type="PackedScene" uid="uid://bctpe34ddamg5" path="res://scenes/components/knockback/CKnockback.tscn" id="7_x835q"]
|
[ext_resource type="PackedScene" uid="uid://bctpe34ddamg5" path="res://scenes/components/knockback/CKnockback.tscn" id="7_x835q"]
|
||||||
[ext_resource type="Resource" uid="uid://s1l0n1iitc6m" path="res://inputs/base_mode/move_back.tres" id="8_jb43f"]
|
[ext_resource type="Resource" uid="uid://s1l0n1iitc6m" path="res://inputs/base_mode/move_back.tres" id="8_jb43f"]
|
||||||
[ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://inputs/base_mode/aim_release.tres" id="8_lhb11"]
|
[ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://inputs/base_mode/aim_release.tres" id="8_lhb11"]
|
||||||
@@ -112,6 +114,8 @@ blend_mode = 1
|
|||||||
[node name="Player" type="CharacterBody3D" unique_id=709076448]
|
[node name="Player" type="CharacterBody3D" unique_id=709076448]
|
||||||
collision_mask = 272
|
collision_mask = 272
|
||||||
script = ExtResource("1_poq2x")
|
script = ExtResource("1_poq2x")
|
||||||
|
EmpoweredAction = ExtResource("7_qheee")
|
||||||
|
ManaRegen = ExtResource("3_n24vh")
|
||||||
AimAssistStrength = 0.3
|
AimAssistStrength = 0.3
|
||||||
AimAssistReductionWhenCloseToTarget = 0.1
|
AimAssistReductionWhenCloseToTarget = 0.1
|
||||||
AimAssistReductionStartDistance = 8.0
|
AimAssistReductionStartDistance = 8.0
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
[gd_resource type="Resource" script_class="REmpoweredAction" format=3 uid="uid://7dpkk5rk3di5"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://d0l07gcx1ef18" path="res://forge/abilities/REmpoweredAction.cs" id="1_1rxoq"]
|
||||||
|
|
||||||
|
[resource]
|
||||||
|
script = ExtResource("1_1rxoq")
|
||||||
|
Cost = 50.0
|
||||||
|
Cooldown = 1.0
|
||||||
|
ManaRegenPause = 3.0
|
||||||
|
metadata/_custom_type_script = "uid://d0l07gcx1ef18"
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
[gd_resource type="Resource" script_class="RManaRegen" format=3 uid="uid://dtmhtlix2amme"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://di04jvuqp0h7m" path="res://forge/effects/RManaRegen.cs" id="1_ecb1p"]
|
||||||
|
|
||||||
|
[resource]
|
||||||
|
script = ExtResource("1_ecb1p")
|
||||||
|
ManaRegenRate = 20.0
|
||||||
|
Frequency = 0.1
|
||||||
|
metadata/_custom_type_script = "uid://di04jvuqp0h7m"
|
||||||
@@ -11,7 +11,6 @@ public class PlayerAttributeSet : AttributeSet
|
|||||||
|
|
||||||
public PlayerAttributeSet()
|
public PlayerAttributeSet()
|
||||||
{
|
{
|
||||||
// Initialize the attributes with the current, min and max values.
|
|
||||||
Health = InitializeAttribute(nameof(Health), 100, 0, 150);
|
Health = InitializeAttribute(nameof(Health), 100, 0, 150);
|
||||||
Mana = InitializeAttribute(nameof(Mana), 100, 0, 100);
|
Mana = InitializeAttribute(nameof(Mana), 100, 0, 100);
|
||||||
Strength = InitializeAttribute(nameof(Strength), 10, 0, 99);
|
Strength = InitializeAttribute(nameof(Strength), 10, 0, 99);
|
||||||
|
|||||||
@@ -1,17 +1,22 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Gamesmiths.Forge.Abilities;
|
||||||
using Gamesmiths.Forge.Core;
|
using Gamesmiths.Forge.Core;
|
||||||
using Gamesmiths.Forge.Effects;
|
using Gamesmiths.Forge.Effects;
|
||||||
using Gamesmiths.Forge.Events;
|
using Gamesmiths.Forge.Events;
|
||||||
using Gamesmiths.Forge.Tags;
|
using Gamesmiths.Forge.Tags;
|
||||||
|
|
||||||
using Godot;
|
using Godot;
|
||||||
using GodotStateCharts;
|
using GodotStateCharts;
|
||||||
|
|
||||||
using Movementtests.addons.godot_state_charts.csharp;
|
using Movementtests.addons.godot_state_charts.csharp;
|
||||||
using Movementtests.interfaces;
|
using Movementtests.interfaces;
|
||||||
using Movementtests.systems;
|
using Movementtests.systems;
|
||||||
using Movementtests.player_controller.Scripts;
|
using Movementtests.player_controller.Scripts;
|
||||||
using Movementtests.scenes.player_controller.scripts;
|
using Movementtests.scenes.player_controller.scripts;
|
||||||
using Movementtests.tools;
|
using Movementtests.tools;
|
||||||
|
using Movementtests.forge.abilities;
|
||||||
|
using Movementtests.tools.effects;
|
||||||
using RustyOptions;
|
using RustyOptions;
|
||||||
|
|
||||||
[GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_character.png")]
|
[GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_character.png")]
|
||||||
@@ -92,6 +97,12 @@ public partial class PlayerController : CharacterBody3D,
|
|||||||
[Export] public bool HasSword { get; set; } = true;
|
[Export] public bool HasSword { get; set; } = true;
|
||||||
[Export] public bool HasParry { get; set; } = true;
|
[Export] public bool HasParry { get; set; } = true;
|
||||||
|
|
||||||
|
// Forge stuff
|
||||||
|
[ExportCategory("Forge")]
|
||||||
|
[ExportGroup("General")]
|
||||||
|
[Export] public REmpoweredAction EmpoweredAction = null!;
|
||||||
|
[Export] public RManaRegen ManaRegen = null!;
|
||||||
|
|
||||||
// Combat stuff
|
// Combat stuff
|
||||||
[ExportCategory("Combat")]
|
[ExportCategory("Combat")]
|
||||||
[ExportGroup("General")]
|
[ExportGroup("General")]
|
||||||
@@ -399,6 +410,9 @@ public partial class PlayerController : CharacterBody3D,
|
|||||||
private RayCast3D _aimAssisRayCast = null!;
|
private RayCast3D _aimAssisRayCast = null!;
|
||||||
private Camera3D _camera = null!;
|
private Camera3D _camera = null!;
|
||||||
|
|
||||||
|
private AbilityHandle? _empoweredActionHandle;
|
||||||
|
private ActiveEffectHandle? _manaRegenEffectHandle;
|
||||||
|
|
||||||
public override void _Ready()
|
public override void _Ready()
|
||||||
{
|
{
|
||||||
LoadSettings();
|
LoadSettings();
|
||||||
@@ -429,11 +443,27 @@ public partial class PlayerController : CharacterBody3D,
|
|||||||
Abilities = new(this);
|
Abilities = new(this);
|
||||||
Events = new();
|
Events = new();
|
||||||
|
|
||||||
|
var empoweredActionData = new AbilityData(
|
||||||
|
name: "Empowered Action",
|
||||||
|
costEffect: EmpoweredAction.CostEffect(),
|
||||||
|
cooldownEffects: [EmpoweredAction.CooldownEffect(forgeManager.TagsManager)],
|
||||||
|
instancingPolicy: AbilityInstancingPolicy.PerEntity,
|
||||||
|
behaviorFactory: () => new EmpoweredActionBehavior());
|
||||||
|
|
||||||
|
// Grant permanently
|
||||||
|
_empoweredActionHandle = Abilities.GrantAbilityPermanently(
|
||||||
|
empoweredActionData,
|
||||||
|
abilityLevel: 1,
|
||||||
|
levelOverridePolicy: LevelComparison.None,
|
||||||
|
sourceEntity: this);
|
||||||
|
|
||||||
|
var manaRegenEffect = new Effect(ManaRegen.ManaRegen(), new EffectOwnership(this, this));
|
||||||
|
_manaRegenEffectHandle = EffectsManager.ApplyEffect(manaRegenEffect);
|
||||||
|
|
||||||
var health = Attributes["PlayerAttributeSet.Health"].CurrentValue; // 100
|
var health = Attributes["PlayerAttributeSet.Health"].CurrentValue; // 100
|
||||||
var mana = Attributes["PlayerAttributeSet.Mana"].CurrentValue; // 100
|
var mana = Attributes["PlayerAttributeSet.Mana"].CurrentValue; // 100
|
||||||
var strength = Attributes["PlayerAttributeSet.Strength"].CurrentValue; // 10
|
var strength = Attributes["PlayerAttributeSet.Strength"].CurrentValue; // 10
|
||||||
var speed = Attributes["PlayerAttributeSet.Speed"].CurrentValue; // 5
|
var speed = Attributes["PlayerAttributeSet.Speed"].CurrentValue; // 5
|
||||||
GD.Print(health, mana, strength, speed);
|
|
||||||
|
|
||||||
// DashIndicator = GetNode<TextureRect>("%DashIndicator");
|
// DashIndicator = GetNode<TextureRect>("%DashIndicator");
|
||||||
PowerCooldownIndicator = GetNode<ColorRect>("%DashCooldownIndicator");
|
PowerCooldownIndicator = GetNode<ColorRect>("%DashCooldownIndicator");
|
||||||
@@ -1913,10 +1943,53 @@ public partial class PlayerController : CharacterBody3D,
|
|||||||
|
|
||||||
public bool CanPerformEmpoweredAction()
|
public bool CanPerformEmpoweredAction()
|
||||||
{
|
{
|
||||||
|
if(_empoweredActionHandle == null) return false;
|
||||||
|
var cooldowns = _empoweredActionHandle.GetCooldownData();
|
||||||
|
foreach (var cd in cooldowns)
|
||||||
|
{
|
||||||
|
//GD.Print($"Cooldown remaining: {cd.RemainingTime}");
|
||||||
|
}
|
||||||
|
var costs = _empoweredActionHandle.GetCostData();
|
||||||
|
foreach (var cost in costs)
|
||||||
|
{
|
||||||
|
// Assuming you want to check Mana costs
|
||||||
|
if (cost.Attribute == "PlayerAttributeSet.Mana")
|
||||||
|
{
|
||||||
|
//GD.Print($"Mana Cost: {cost.Cost}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var canActivate = _empoweredActionHandle.CanActivate(out var failures);
|
||||||
|
if (!canActivate)
|
||||||
|
{
|
||||||
|
GD.PrintErr($"Cannot activate empowered action: {failures}");
|
||||||
|
if (failures.HasFlag(AbilityActivationFailures.Cooldown)) GD.PrintErr("In Cooldown");
|
||||||
|
if (failures.HasFlag(AbilityActivationFailures.InsufficientResources)) GD.PrintErr("Not Enough Mana");
|
||||||
|
}
|
||||||
|
return canActivate;
|
||||||
return EmpoweredActionsLeft > 0 && TutorialDone;
|
return EmpoweredActionsLeft > 0 && TutorialDone;
|
||||||
}
|
}
|
||||||
public void PerformEmpoweredAction()
|
public void PerformEmpoweredAction()
|
||||||
{
|
{
|
||||||
|
if(_empoweredActionHandle == null) return;
|
||||||
|
|
||||||
|
var canActivate = _empoweredActionHandle.Activate(out var failures);
|
||||||
|
if (!canActivate)
|
||||||
|
{
|
||||||
|
GD.PrintErr($"Cannot activate empowered action: {failures}");
|
||||||
|
if (failures.HasFlag(AbilityActivationFailures.Cooldown)) GD.PrintErr("In Cooldown");
|
||||||
|
if (failures.HasFlag(AbilityActivationFailures.InsufficientResources)) GD.PrintErr("Not Enough Mana");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GD.Print($"Remaining mana: {Attributes["PlayerAttributeSet.Mana"].CurrentValue}");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Inhibit Mana Regeneration for a while after using an empowered action
|
||||||
|
// TODO: Use Forge events instead of relying on direct referencing
|
||||||
|
_manaRegenEffectHandle!.SetInhibit(true);
|
||||||
|
GetTree().CreateTimer(EmpoweredAction.ManaRegenPause).Timeout += () => {_manaRegenEffectHandle!.SetInhibit(false);};
|
||||||
|
|
||||||
_isWallJumpAvailable = true;
|
_isWallJumpAvailable = true;
|
||||||
_canDashAirborne = true;
|
_canDashAirborne = true;
|
||||||
EmpoweredActionsLeft--;
|
EmpoweredActionsLeft--;
|
||||||
@@ -2223,14 +2296,10 @@ public partial class PlayerController : CharacterBody3D,
|
|||||||
_spaceState = GetWorld3D().DirectSpaceState;
|
_spaceState = GetWorld3D().DirectSpaceState;
|
||||||
|
|
||||||
if (_currentInputBufferFrames > 0) _currentInputBufferFrames -= 1;
|
if (_currentInputBufferFrames > 0) _currentInputBufferFrames -= 1;
|
||||||
|
|
||||||
// Limit maximum speed
|
// Limit maximum speed
|
||||||
if (Velocity.Length() > AbsoluteMaxSpeed)
|
if (Velocity.Length() > AbsoluteMaxSpeed)
|
||||||
Velocity = Velocity.Normalized() * AbsoluteMaxSpeed;
|
Velocity = Velocity.Normalized() * AbsoluteMaxSpeed;
|
||||||
|
|
||||||
// Manage head and camera movement
|
|
||||||
LookAround(delta);
|
|
||||||
|
|
||||||
// Manage general movement
|
// Manage general movement
|
||||||
Velocity += ComputeKnockback();
|
Velocity += ComputeKnockback();
|
||||||
MoveSlideAndHandleStairs((float) delta);
|
MoveSlideAndHandleStairs((float) delta);
|
||||||
@@ -2238,19 +2307,15 @@ public partial class PlayerController : CharacterBody3D,
|
|||||||
// Manage gameplay systems
|
// Manage gameplay systems
|
||||||
MantleSystem.ProcessMantle(_grounded.Active);
|
MantleSystem.ProcessMantle(_grounded.Active);
|
||||||
HandleEnemyTargeting();
|
HandleEnemyTargeting();
|
||||||
|
}
|
||||||
|
|
||||||
// Manage dash target and tutorial specific stuff
|
public override void _Process(double delta)
|
||||||
// if (WeaponSystem.InHandState.Active && !_aiming.Active && TutorialDone)
|
{
|
||||||
// {
|
// Manage head and camera movement
|
||||||
// DashIndicatorMesh.Visible = false;
|
LookAround(delta);
|
||||||
// }
|
|
||||||
// if (!WeaponSystem.InHandState.Active && TutorialDone)
|
EffectsManager.UpdateEffects(delta);
|
||||||
// {
|
GD.Print(Attributes["PlayerAttributeSet.Mana"].CurrentValue);
|
||||||
// DashIndicatorMesh.Visible = true;
|
|
||||||
//
|
|
||||||
// DashIndicatorMeshCylinder.Height = WeaponSystem.GlobalPosition.DistanceTo(GlobalPosition) * 2;
|
|
||||||
// DashIndicatorNode.LookAt(WeaponSystem.GlobalPosition);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////////////
|
///////////////////////////
|
||||||
|
|||||||
101
tests/components/DamageComponentUnitTest.cs
Normal file
101
tests/components/DamageComponentUnitTest.cs
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.interfaces;
|
||||||
|
using Movementtests.systems.damage;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class DamageComponentUnitTest
|
||||||
|
{
|
||||||
|
[TestCase]
|
||||||
|
public void DamageModifierAppliesWhenTypeMatches()
|
||||||
|
{
|
||||||
|
var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
|
||||||
|
var modifier = new RDamageModifier(EDamageTypes.Normal, 2.0f);
|
||||||
|
var signalTriggered = false;
|
||||||
|
modifier.DamageTaken += (_, _) => signalTriggered = true;
|
||||||
|
|
||||||
|
var result = modifier.TakeDamage(input);
|
||||||
|
|
||||||
|
AssertFloat(result.Damage.DamageDealt).IsEqual(20.0f);
|
||||||
|
AssertBool(signalTriggered).IsTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void DamageModifierIgnoresWhenTypeDifferent()
|
||||||
|
{
|
||||||
|
var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
|
||||||
|
var modifier = new RDamageModifier(EDamageTypes.Fire, 3.0f);
|
||||||
|
var signalTriggered = false;
|
||||||
|
modifier.DamageTaken += (_, _) => signalTriggered = true;
|
||||||
|
|
||||||
|
var result = modifier.TakeDamage(input);
|
||||||
|
|
||||||
|
AssertFloat(result.Damage.DamageDealt).IsEqual(0.0f);
|
||||||
|
AssertBool(signalTriggered).IsFalse(); // No damage actually taken
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void DamageableSumsAllModifiers()
|
||||||
|
{
|
||||||
|
var mod1 = new RDamageModifier(EDamageTypes.Normal, 1.0f);
|
||||||
|
var mod2 = new RDamageModifier(EDamageTypes.Normal, 0.5f);
|
||||||
|
|
||||||
|
var damageable = new CDamageable();
|
||||||
|
damageable.DamageModifiers = new[] { mod1, mod2 };
|
||||||
|
var signalTriggered = false;
|
||||||
|
damageable.DamageTaken += (_, _) => signalTriggered = true;
|
||||||
|
|
||||||
|
var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
|
||||||
|
var result = damageable.TakeDamage(input);
|
||||||
|
|
||||||
|
AssertFloat(result.Damage.DamageDealt).IsEqual(15.0f);
|
||||||
|
AssertBool(signalTriggered).IsTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void ComputeDamageModifierAppliesWhenTypeMatches()
|
||||||
|
{
|
||||||
|
var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
|
||||||
|
var modifier = new RDamageModifier(EDamageTypes.Normal, 2.0f);
|
||||||
|
var signalTriggered = false;
|
||||||
|
modifier.DamageTaken += (_, _) => signalTriggered = true;
|
||||||
|
|
||||||
|
var result = modifier.ComputeDamage(input);
|
||||||
|
|
||||||
|
AssertFloat(result.Damage.DamageDealt).IsEqual(20.0f);
|
||||||
|
AssertBool(signalTriggered).IsFalse();
|
||||||
|
}
|
||||||
|
[TestCase]
|
||||||
|
public void ComputeDamageModifierIgnoresWhenTypeDifferent()
|
||||||
|
{
|
||||||
|
var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
|
||||||
|
var modifier = new RDamageModifier(EDamageTypes.Fire, 3.0f);
|
||||||
|
var signalTriggered = false;
|
||||||
|
modifier.DamageTaken += (_, _) => signalTriggered = true;
|
||||||
|
|
||||||
|
var result = modifier.ComputeDamage(input);
|
||||||
|
|
||||||
|
AssertFloat(result.Damage.DamageDealt).IsEqual(0.0f);
|
||||||
|
AssertBool(signalTriggered).IsFalse();
|
||||||
|
}
|
||||||
|
[TestCase]
|
||||||
|
public void ComputeDamageableSumsAllModifiers()
|
||||||
|
{
|
||||||
|
var mod1 = new RDamageModifier(EDamageTypes.Normal, 1.0f);
|
||||||
|
var mod2 = new RDamageModifier(EDamageTypes.Normal, 0.5f);
|
||||||
|
|
||||||
|
var cDamageable = new CDamageable();
|
||||||
|
cDamageable.DamageModifiers = new[] { mod1, mod2 };
|
||||||
|
var signalTriggered = false;
|
||||||
|
cDamageable.DamageTaken += (_, _) => signalTriggered = true;
|
||||||
|
|
||||||
|
var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
|
||||||
|
var result = cDamageable.ComputeDamage(input);
|
||||||
|
|
||||||
|
AssertFloat(result.Damage.DamageDealt).IsEqual(15.0f);
|
||||||
|
AssertBool(signalTriggered).IsFalse();
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/components/DamageComponentUnitTest.cs.uid
Normal file
1
tests/components/DamageComponentUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://db6rva7uccppc
|
||||||
55
tests/components/HealthComponentUnitTest.cs
Normal file
55
tests/components/HealthComponentUnitTest.cs
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.interfaces;
|
||||||
|
using Movementtests.systems.damage;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class HealthComponentUnitTest
|
||||||
|
{
|
||||||
|
[TestCase]
|
||||||
|
public void ReadyInitializesCurrentHealth()
|
||||||
|
{
|
||||||
|
var cHealth = new CHealth();
|
||||||
|
cHealth.RHealth = new RHealth(150.0f);
|
||||||
|
cHealth._Ready();
|
||||||
|
AssertFloat(cHealth.CurrentHealth).IsEqual(150.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void ReduceHealthDecreasesAndDoesNotDeplete()
|
||||||
|
{
|
||||||
|
var cHealth = new CHealth();
|
||||||
|
cHealth.RHealth = new RHealth(100.0f);
|
||||||
|
cHealth.CurrentHealth = 100.0f;
|
||||||
|
|
||||||
|
var damage = new DamageRecord(Vector3.Zero, new RDamage(25.0f, EDamageTypes.Normal));
|
||||||
|
var record = cHealth.ReduceHealth(source: null!, damageRecord: damage);
|
||||||
|
|
||||||
|
AssertFloat(cHealth.CurrentHealth).IsEqual(75.0f);
|
||||||
|
AssertFloat(record.CurrentHealth).IsEqual(75.0f);
|
||||||
|
AssertFloat(record.PreviousHealth).IsEqual(100.0f);
|
||||||
|
AssertFloat(record.MaxHealth).IsEqual(100.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void ReduceHealthTriggersDepletionToZero()
|
||||||
|
{
|
||||||
|
var cHealth = new CHealth();
|
||||||
|
cHealth.RHealth = new RHealth(50.0f);
|
||||||
|
cHealth.CurrentHealth = 50.0f;
|
||||||
|
|
||||||
|
bool depleted = false;
|
||||||
|
cHealth.HealthDepleted += _ => depleted = true;
|
||||||
|
|
||||||
|
var damage = new DamageRecord(Vector3.Zero, new RDamage(100.0f, EDamageTypes.Normal));
|
||||||
|
var record = cHealth.ReduceHealth(source: null!, damageRecord: damage);
|
||||||
|
|
||||||
|
AssertBool(depleted).IsTrue();
|
||||||
|
AssertFloat(cHealth.CurrentHealth).IsEqual(0.0f);
|
||||||
|
AssertFloat(record.CurrentHealth).IsEqual(-50.0f);
|
||||||
|
AssertFloat(record.MaxHealth).IsEqual(50.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/components/HealthComponentUnitTest.cs.uid
Normal file
1
tests/components/HealthComponentUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://bd52i51hncgmf
|
||||||
32
tests/components/KnockbackComponentUnitTest.cs
Normal file
32
tests/components/KnockbackComponentUnitTest.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.interfaces;
|
||||||
|
using Movementtests.systems.damage;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class KnockbackComponentUnitTest
|
||||||
|
{
|
||||||
|
[TestCase]
|
||||||
|
public void RegisterAndComputeKnockback()
|
||||||
|
{
|
||||||
|
var cKnock = new CKnockback();
|
||||||
|
cKnock.RKnockback = new RKnockback(2.0f);
|
||||||
|
cKnock.GlobalPosition = Vector3.Zero;
|
||||||
|
|
||||||
|
var damage = new DamageRecord(new Vector3(10, 0, 0), new RDamage(0, EDamageTypes.Normal));
|
||||||
|
var record = new KnockbackRecord(damage, 1.5f);
|
||||||
|
|
||||||
|
cKnock.RegisterKnockback(record);
|
||||||
|
var force = cKnock.ComputeKnockback();
|
||||||
|
|
||||||
|
// Direction from source(10,0,0) to target(0,0,0) is (-1,0,0), scaled by modifier(2) and multiplier(1.5) => (-3,0,0)
|
||||||
|
AssertVector(force).IsEqual(new Vector3(-3, 0, 0));
|
||||||
|
|
||||||
|
// Second call returns zero since internal state resets
|
||||||
|
var second = cKnock.ComputeKnockback();
|
||||||
|
AssertVector(second).IsEqual(Vector3.Zero);
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/components/KnockbackComponentUnitTest.cs.uid
Normal file
1
tests/components/KnockbackComponentUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://bv0eionbgbig5
|
||||||
32
tests/components/MovementSystemUnitTest.cs
Normal file
32
tests/components/MovementSystemUnitTest.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.interfaces;
|
||||||
|
using Movementtests.scenes.movement;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class MovementSystemUnitTest
|
||||||
|
{
|
||||||
|
[TestCase]
|
||||||
|
public void GroundedMovementAcceleratesAndAppliesGravity()
|
||||||
|
{
|
||||||
|
var move = new CGroundedMovement();
|
||||||
|
move.RMovement = new RMovement(speed: 10.0f, acceleration: 1.0f, gravityModifier: 0.5f, targetHeight: 0.0f);
|
||||||
|
move.WallInFrontRayCast = new RayCast3D();
|
||||||
|
//move.GlobalPosition = Vector3.Zero;
|
||||||
|
|
||||||
|
var inputs = new MovementInputs(
|
||||||
|
Velocity: Vector3.Zero,
|
||||||
|
TargetLocation: new Vector3(10, 0, 0),
|
||||||
|
isOnFloor: false,
|
||||||
|
gravity: Vector3.Down * 9.8f,
|
||||||
|
delta: 1.0
|
||||||
|
);
|
||||||
|
|
||||||
|
var v = move.ComputeVelocity(inputs);
|
||||||
|
|
||||||
|
AssertVector(v).IsEqualApprox(new Vector3(10, -4.9f, 0), new Vector3(0.001f, 0.001f, 0.001f));
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/components/MovementSystemUnitTest.cs.uid
Normal file
1
tests/components/MovementSystemUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://cofj5s4x74ay
|
||||||
30
tests/enemies/EnemyUnitTest.cs
Normal file
30
tests/enemies/EnemyUnitTest.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.interfaces;
|
||||||
|
using Movementtests.systems.damage;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class EnemyUnitTest
|
||||||
|
{
|
||||||
|
[TestCase]
|
||||||
|
public void ComputeDamageNoComponent()
|
||||||
|
{
|
||||||
|
var enemy = new Enemy();
|
||||||
|
var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
|
||||||
|
|
||||||
|
var result = enemy.ComputeDamage(input);
|
||||||
|
AssertFloat(result.Damage.DamageDealt).IsEqual(0.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void Unstun()
|
||||||
|
{
|
||||||
|
var enemy = new Enemy();
|
||||||
|
enemy.IsStunned = true;
|
||||||
|
enemy.Unstun();
|
||||||
|
AssertBool(enemy.IsStunned).IsFalse();
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/enemies/EnemyUnitTest.cs.uid
Normal file
1
tests/enemies/EnemyUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://cojxgcs6xqqoq
|
||||||
55
tests/player/DashSystemUnitTest.cs
Normal file
55
tests/player/DashSystemUnitTest.cs
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.systems;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class DashSystemUnitTest
|
||||||
|
{
|
||||||
|
private DashSystem _dashSystem;
|
||||||
|
|
||||||
|
[BeforeTest]
|
||||||
|
public void SetupTest()
|
||||||
|
{
|
||||||
|
_dashSystem = new DashSystem();
|
||||||
|
|
||||||
|
_dashSystem.DashCast3D = new ShapeCast3D();
|
||||||
|
_dashSystem.AddChild(_dashSystem.DashCast3D);
|
||||||
|
|
||||||
|
_dashSystem.DashCastDrop = new ShapeCast3D();
|
||||||
|
_dashSystem.AddChild(_dashSystem.DashCastDrop);
|
||||||
|
|
||||||
|
_dashSystem.DashTarget = new MeshInstance3D();
|
||||||
|
_dashSystem.AddChild(_dashSystem.DashTarget);
|
||||||
|
|
||||||
|
_dashSystem.DashDropIndicator = new MeshInstance3D();
|
||||||
|
_dashSystem.AddChild(_dashSystem.DashDropIndicator);
|
||||||
|
|
||||||
|
_dashSystem.DashDropLocationIndicator = new MeshInstance3D();
|
||||||
|
_dashSystem.AddChild(_dashSystem.DashDropLocationIndicator);
|
||||||
|
}
|
||||||
|
|
||||||
|
[AfterTest]
|
||||||
|
public void CleanupTest()
|
||||||
|
{
|
||||||
|
_dashSystem?.Free();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestStopPreparingDash()
|
||||||
|
{
|
||||||
|
_dashSystem.CanDashThroughTarget = true;
|
||||||
|
_dashSystem.DashTarget.Visible = true;
|
||||||
|
_dashSystem.DashDropIndicator.Visible = true;
|
||||||
|
_dashSystem.DashDropLocationIndicator.Visible = true;
|
||||||
|
|
||||||
|
_dashSystem.StopPreparingDash();
|
||||||
|
|
||||||
|
AssertBool(_dashSystem.CanDashThroughTarget).IsFalse();
|
||||||
|
AssertBool(_dashSystem.DashTarget.Visible).IsFalse();
|
||||||
|
AssertBool(_dashSystem.DashDropIndicator.Visible).IsFalse();
|
||||||
|
AssertBool(_dashSystem.DashDropLocationIndicator.Visible).IsFalse();
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/player/DashSystemUnitTest.cs.uid
Normal file
1
tests/player/DashSystemUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://pv570go4cxws
|
||||||
91
tests/player/HeadSystemUnitTest.cs
Normal file
91
tests/player/HeadSystemUnitTest.cs
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.systems;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class HeadSystemUnitTest
|
||||||
|
{
|
||||||
|
private HeadSystem _head;
|
||||||
|
|
||||||
|
[BeforeTest]
|
||||||
|
public void SetupTest()
|
||||||
|
{
|
||||||
|
_head = new HeadSystem();
|
||||||
|
_head._camera = new Camera3D();
|
||||||
|
_head.AddChild(_head._camera);
|
||||||
|
|
||||||
|
_head._cameraAnchor = new Marker3D();
|
||||||
|
_head.AddChild(_head._cameraAnchor);
|
||||||
|
|
||||||
|
_head._fpRig = new Node3D();
|
||||||
|
_head.AddChild(_head._fpRig);
|
||||||
|
|
||||||
|
_head._fpDisplacedRig = new Node3D();
|
||||||
|
_head.AddChild(_head._fpDisplacedRig);
|
||||||
|
}
|
||||||
|
|
||||||
|
[AfterTest]
|
||||||
|
public void CleanupTest()
|
||||||
|
{
|
||||||
|
_head?.Free();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestResetHeadBobbing()
|
||||||
|
{
|
||||||
|
_head._bobbingAccumulator = 10.0f;
|
||||||
|
_head.ResetHeadBobbing();
|
||||||
|
AssertFloat(_head._bobbingAccumulator).IsEqual(0.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestComputeHowMuchInputForward()
|
||||||
|
{
|
||||||
|
Vector3 forwardInput = new Vector3(0, 0, -1);
|
||||||
|
AssertFloat(_head.ComputeHowMuchInputForward(forwardInput)).IsEqual(1.0f);
|
||||||
|
|
||||||
|
Vector3 backwardInput = new Vector3(0, 0, 1);
|
||||||
|
AssertFloat(_head.ComputeHowMuchInputForward(backwardInput)).IsEqual(-1.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestComputeHowMuchInputSideways()
|
||||||
|
{
|
||||||
|
Vector3 rightInput = new Vector3(1, 0, 0);
|
||||||
|
AssertFloat(_head.ComputeHowMuchInputSideways(rightInput)).IsEqual(1.0f);
|
||||||
|
|
||||||
|
Vector3 leftInput = new Vector3(-1, 0, 0);
|
||||||
|
AssertFloat(_head.ComputeHowMuchInputSideways(leftInput)).IsEqual(-1.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestGetForwardHorizontalVector()
|
||||||
|
{
|
||||||
|
Vector3 forward = _head.GetForwardHorizontalVector();
|
||||||
|
AssertVector(forward).IsEqualApprox(Vector3.Back, new Vector3(0.001f, 0.001f, 0.001f));
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestLookAroundRotation()
|
||||||
|
{
|
||||||
|
var inputs = new HeadSystem.CameraParameters(
|
||||||
|
Delta: 0.016,
|
||||||
|
LookDir: new Vector2(1, 0),
|
||||||
|
PlayerInput: Vector3.Zero,
|
||||||
|
PlayerVelocity: Vector3.Zero,
|
||||||
|
WallContactPoint: Vector3.Zero,
|
||||||
|
SensitivitMultiplier: 1.0f,
|
||||||
|
WithCameraJitter: false,
|
||||||
|
WithCameraBobbing: false,
|
||||||
|
BobbingMultiplier: 1.0f,
|
||||||
|
FovMultiplier: 1.0f
|
||||||
|
);
|
||||||
|
|
||||||
|
float initialY = _head.Rotation.Y;
|
||||||
|
_head.LookAround(inputs);
|
||||||
|
AssertFloat(_head.Rotation.Y).IsEqual(initialY + 1.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/player/HeadSystemUnitTest.cs.uid
Normal file
1
tests/player/HeadSystemUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://bp0xn8k3dmfkg
|
||||||
149
tests/player/PlayerControllerUnitTest.cs
Normal file
149
tests/player/PlayerControllerUnitTest.cs
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.interfaces;
|
||||||
|
using Movementtests.systems.damage;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class PlayerControllerUnitTest
|
||||||
|
{
|
||||||
|
private PlayerController _player;
|
||||||
|
|
||||||
|
[BeforeTest]
|
||||||
|
public void SetupTest()
|
||||||
|
{
|
||||||
|
_player = new PlayerController();
|
||||||
|
_player.TargetSpeed = 7.0f;
|
||||||
|
_player.Gravity = 9.8f;
|
||||||
|
|
||||||
|
var rHealth = new RHealth(100.0f);
|
||||||
|
_player.RHealth = rHealth;
|
||||||
|
_player.CHealth = new CHealth { RHealth = rHealth, CurrentHealth = 100.0f };
|
||||||
|
}
|
||||||
|
|
||||||
|
[AfterTest]
|
||||||
|
public void CleanupTest()
|
||||||
|
{
|
||||||
|
_player?.Free();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestCalculateGravityForce()
|
||||||
|
{
|
||||||
|
_player.Weight = 3.0f;
|
||||||
|
// gravity is 9.8f
|
||||||
|
AssertFloat(_player.CalculateGravityForce()).IsEqualApprox(29.4f, 0.001f);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestIsPlayerInputtingForward()
|
||||||
|
{
|
||||||
|
// Test Keyboard Input
|
||||||
|
_player.InputDeviceChanged(false);
|
||||||
|
_player.OnInputMoveKeyboard(Vector3.Forward);
|
||||||
|
AssertBool(_player.IsPlayerInputtingForward()).IsTrue();
|
||||||
|
|
||||||
|
_player.OnInputMoveKeyboard(Vector3.Back);
|
||||||
|
AssertBool(_player.IsPlayerInputtingForward()).IsFalse();
|
||||||
|
|
||||||
|
// Test Gamepad Input
|
||||||
|
_player.InputDeviceChanged(true);
|
||||||
|
_player.OnInputMove(new Vector3(0, 0, -1));
|
||||||
|
AssertBool(_player.IsPlayerInputtingForward()).IsTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestSetVerticalVelocity()
|
||||||
|
{
|
||||||
|
_player.Velocity = new Vector3(1, 0, 2);
|
||||||
|
_player.SetVerticalVelocity(5.0f);
|
||||||
|
AssertVector(_player.Velocity).IsEqual(new Vector3(1, 5, 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestComputeHVelocityGround()
|
||||||
|
{
|
||||||
|
_player.Velocity = Vector3.Zero;
|
||||||
|
_player.AccelerationFloor = 10.0f;
|
||||||
|
|
||||||
|
float delta = 0.1f;
|
||||||
|
Vector3 newVelocity = _player.ComputeHVelocity(delta, _player.AccelerationFloor, _player.DecelerationFloor, Vector3.Forward);
|
||||||
|
AssertVector(newVelocity).IsEqual(new Vector3(0, 0, -7.0f));
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestComputeHVelocityAir()
|
||||||
|
{
|
||||||
|
_player.Velocity = new Vector3(5, 0, 0);
|
||||||
|
_player.AccelerationAir = 2.0f;
|
||||||
|
_player.DecelerationAir = 2.0f;
|
||||||
|
|
||||||
|
float delta = 0.5f;
|
||||||
|
Vector3 newVelocity = _player.ComputeHVelocity(delta, _player.AccelerationAir, _player.DecelerationAir, Vector3.Zero);
|
||||||
|
|
||||||
|
AssertVector(newVelocity).IsEqual(Vector3.Zero);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestReduceHealth()
|
||||||
|
{
|
||||||
|
var damageRecord = new DamageRecord(Vector3.Zero, new RDamage(25.0f, EDamageTypes.Normal));
|
||||||
|
_player.ReduceHealth(_player, damageRecord);
|
||||||
|
AssertFloat(_player.CHealth.CurrentHealth).IsEqual(75.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestEmpoweredActionsLeft()
|
||||||
|
{
|
||||||
|
var mockUi = new PlayerUi();
|
||||||
|
var dashIcons = new TextureRect[3] { new TextureRect(), new TextureRect(), new TextureRect() };
|
||||||
|
mockUi._dashIcons = dashIcons;
|
||||||
|
|
||||||
|
_player.PlayerUi = mockUi;
|
||||||
|
|
||||||
|
_player.EmpoweredActionsLeft = 2;
|
||||||
|
AssertInt(_player.EmpoweredActionsLeft).IsEqual(2);
|
||||||
|
AssertBool(dashIcons[0].Visible).IsTrue();
|
||||||
|
AssertBool(dashIcons[1].Visible).IsTrue();
|
||||||
|
AssertBool(dashIcons[2].Visible).IsFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestDashCooldownTimeout()
|
||||||
|
{
|
||||||
|
_player.CanDash = false;
|
||||||
|
_player.DashCooldownTimeout();
|
||||||
|
AssertBool(_player.CanDash).IsTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestGetInputLocalHDirection()
|
||||||
|
{
|
||||||
|
_player.InputDeviceChanged(false);
|
||||||
|
_player.OnInputMoveKeyboard(new Vector3(1, 0, 1));
|
||||||
|
|
||||||
|
Vector3 expected = new Vector3(1, 0, 1).Normalized();
|
||||||
|
AssertVector(_player.GetInputLocalHDirection()).IsEqualApprox(expected, new Vector3(0.001f, 0.001f, 0.001f));
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestComputeKnockback()
|
||||||
|
{
|
||||||
|
var cKnockback = new CKnockback();
|
||||||
|
cKnockback.RKnockback = new RKnockback(10.0f);
|
||||||
|
_player.CKnockback = cKnockback;
|
||||||
|
|
||||||
|
var damageRecord = new DamageRecord(new Vector3(10, 0, 0), new RDamage(0, EDamageTypes.Normal));
|
||||||
|
var knockbackRecord = new KnockbackRecord(damageRecord, 1.0f);
|
||||||
|
|
||||||
|
_player.GlobalPosition = Vector3.Zero;
|
||||||
|
cKnockback.GlobalPosition = Vector3.Zero;
|
||||||
|
|
||||||
|
_player.RegisterKnockback(knockbackRecord);
|
||||||
|
|
||||||
|
Vector3 knockback = cKnockback.ComputeKnockback();
|
||||||
|
AssertVector(knockback).IsEqual(new Vector3(-10, 0, 0));
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/player/PlayerControllerUnitTest.cs.uid
Normal file
1
tests/player/PlayerControllerUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://kmphtu0ovixi
|
||||||
51
tests/player/WeaponSystemUnitTest.cs
Normal file
51
tests/player/WeaponSystemUnitTest.cs
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
using Godot;
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
using Movementtests.systems;
|
||||||
|
using Movementtests.systems.damage;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class WeaponSystemUnitTest
|
||||||
|
{
|
||||||
|
private WeaponSystem _weapon;
|
||||||
|
|
||||||
|
[BeforeTest]
|
||||||
|
public void SetupTest()
|
||||||
|
{
|
||||||
|
_weapon = new WeaponSystem();
|
||||||
|
_weapon.RDamage = new RDamage(5.0f, EDamageTypes.Normal);
|
||||||
|
|
||||||
|
_weapon.WeaponMesh = new MeshInstance3D();
|
||||||
|
_weapon.AddChild(_weapon.WeaponMesh);
|
||||||
|
_weapon.WeaponLocationIndicator = new MeshInstance3D();
|
||||||
|
_weapon.AddChild(_weapon.WeaponLocationIndicator);
|
||||||
|
}
|
||||||
|
|
||||||
|
[AfterTest]
|
||||||
|
public void CleanupTest()
|
||||||
|
{
|
||||||
|
_weapon?.Free();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestWeaponLeftAndBackVisibility()
|
||||||
|
{
|
||||||
|
_weapon.Visible = false;
|
||||||
|
|
||||||
|
_weapon.WeaponLeft();
|
||||||
|
AssertBool(_weapon.Visible).IsTrue();
|
||||||
|
|
||||||
|
_weapon.WeaponBack();
|
||||||
|
AssertBool(_weapon.Visible).IsFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase]
|
||||||
|
public void TestThrowWeaponOnCurveSetsUnfrozen()
|
||||||
|
{
|
||||||
|
_weapon.Freeze = true;
|
||||||
|
_weapon.ThrowWeaponOnCurve();
|
||||||
|
AssertBool(_weapon.Freeze).IsFalse();
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/player/WeaponSystemUnitTest.cs.uid
Normal file
1
tests/player/WeaponSystemUnitTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://vkv8aderakcb
|
||||||
50
tests/player/interactions/PlayerInteractionsTest.cs
Normal file
50
tests/player/interactions/PlayerInteractionsTest.cs
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
using System.Threading.Tasks;
|
||||||
|
using Godot;
|
||||||
|
using GodotStateCharts;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class PlayerInteractionsTest
|
||||||
|
{
|
||||||
|
private ISceneRunner _runner;
|
||||||
|
private Node _scene;
|
||||||
|
private PlayerController _player;
|
||||||
|
|
||||||
|
private readonly float _tolerance = 0.01f;
|
||||||
|
private readonly Vector3 _vectorTolerance = new Vector3(0.01f, 0.01f, 0.01f);
|
||||||
|
|
||||||
|
[BeforeTest]
|
||||||
|
public void SetupTest()
|
||||||
|
{
|
||||||
|
_runner = ISceneRunner.Load("res://tests/player/interactions/player_interactions_scene.tscn");
|
||||||
|
|
||||||
|
_scene = _runner.Scene()!;
|
||||||
|
var player = _scene.FindChild("Player") as PlayerController;
|
||||||
|
_player = player!;
|
||||||
|
}
|
||||||
|
[AfterTest]
|
||||||
|
public void CleanupTest() {}
|
||||||
|
|
||||||
|
[TestCase("BaseLocation")]
|
||||||
|
public async Task PlayerMoveForward(string markerName)
|
||||||
|
{
|
||||||
|
var marker = _scene.FindChild(markerName) as Marker3D;
|
||||||
|
AssertObject(marker).IsNotNull();
|
||||||
|
_player.GlobalPosition = marker!.GlobalPosition;
|
||||||
|
await _runner.AwaitIdleFrame();
|
||||||
|
|
||||||
|
var startPos = _player.GlobalPosition;
|
||||||
|
|
||||||
|
_runner.SimulateKeyPress(Key.W);
|
||||||
|
await _runner.AwaitMillis(300);
|
||||||
|
_runner.SimulateKeyRelease(Key.W);
|
||||||
|
|
||||||
|
var endPos = _player.GlobalPosition;
|
||||||
|
var direction = startPos.DirectionTo(endPos);
|
||||||
|
AssertVector(direction).IsEqualApprox(Vector3.Forward, _vectorTolerance);
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/player/interactions/PlayerInteractionsTest.cs.uid
Normal file
1
tests/player/interactions/PlayerInteractionsTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://denedm5b8rmhh
|
||||||
35
tests/player/interactions/player_interactions_scene.tscn
Normal file
35
tests/player/interactions/player_interactions_scene.tscn
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
[gd_scene format=3 uid="uid://l0lflvsjbyvs"]
|
||||||
|
|
||||||
|
[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/materials/greybox/m_greybox.tres" id="1_dv0re"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://scenes/player_controller/PlayerController.tscn" id="2_52d52"]
|
||||||
|
|
||||||
|
[node name="PlayerMovementScene" type="Node3D" unique_id=231040688]
|
||||||
|
|
||||||
|
[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=241909240]
|
||||||
|
use_collision = true
|
||||||
|
collision_layer = 256
|
||||||
|
collision_mask = 65553
|
||||||
|
|
||||||
|
[node name="Ground" type="CSGBox3D" parent="CSGCombiner3D" unique_id=432200143]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, -0.5, -3.25)
|
||||||
|
use_collision = true
|
||||||
|
collision_layer = 256
|
||||||
|
collision_mask = 65553
|
||||||
|
size = Vector3(1000, 1, 1000)
|
||||||
|
material = ExtResource("1_dv0re")
|
||||||
|
|
||||||
|
[node name="Ground2" type="CSGBox3D" parent="CSGCombiner3D" unique_id=854660236]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.75, 0.5, -1.75)
|
||||||
|
use_collision = true
|
||||||
|
collision_layer = 256
|
||||||
|
collision_mask = 65553
|
||||||
|
size = Vector3(1.5, 1, 1.5)
|
||||||
|
material = ExtResource("1_dv0re")
|
||||||
|
|
||||||
|
[node name="Player" parent="." unique_id=709076448 instance=ExtResource("2_52d52")]
|
||||||
|
TutorialDone = true
|
||||||
|
|
||||||
|
[node name="BaseLocation" type="Marker3D" parent="." unique_id=1793710692]
|
||||||
|
|
||||||
|
[node name="MantleLocation1" type="Marker3D" parent="." unique_id=550080845]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.75, 0, 0)
|
||||||
109
tests/player/movement/PlayerMovementTest.cs
Normal file
109
tests/player/movement/PlayerMovementTest.cs
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
using System.Threading.Tasks;
|
||||||
|
using Godot;
|
||||||
|
using GodotStateCharts;
|
||||||
|
|
||||||
|
namespace Movementtests.tests;
|
||||||
|
|
||||||
|
using GdUnit4;
|
||||||
|
using static GdUnit4.Assertions;
|
||||||
|
|
||||||
|
[TestSuite, RequireGodotRuntime]
|
||||||
|
public class PlayerMovementTest
|
||||||
|
{
|
||||||
|
private ISceneRunner _runner;
|
||||||
|
private Node _scene;
|
||||||
|
private PlayerController _player;
|
||||||
|
|
||||||
|
private readonly float _tolerance = 0.01f;
|
||||||
|
private readonly Vector3 _vectorTolerance = new Vector3(0.01f, 0.01f, 0.01f);
|
||||||
|
|
||||||
|
[Before]
|
||||||
|
public void Setup() {}
|
||||||
|
[After]
|
||||||
|
public void Cleanup() {}
|
||||||
|
|
||||||
|
[BeforeTest]
|
||||||
|
public void SetupTest()
|
||||||
|
{
|
||||||
|
_runner = ISceneRunner.Load("res://tests/player/movement/player_movement_scene.tscn");
|
||||||
|
|
||||||
|
_scene = _runner.Scene()!;
|
||||||
|
var player = _scene.FindChild("Player") as PlayerController;
|
||||||
|
_player = player!;
|
||||||
|
}
|
||||||
|
[AfterTest]
|
||||||
|
public void CleanupTest() {}
|
||||||
|
|
||||||
|
[TestCase("BaseLocation")]
|
||||||
|
public async Task PlayerMoveForward(string markerName)
|
||||||
|
{
|
||||||
|
var marker = _scene.FindChild(markerName) as Marker3D;
|
||||||
|
AssertObject(marker).IsNotNull();
|
||||||
|
_player.GlobalPosition = marker!.GlobalPosition;
|
||||||
|
await _runner.AwaitIdleFrame();
|
||||||
|
|
||||||
|
var startPos = _player.GlobalPosition;
|
||||||
|
|
||||||
|
_runner.SimulateKeyPress(Key.W);
|
||||||
|
await _runner.AwaitMillis(100);
|
||||||
|
_runner.SimulateKeyRelease(Key.W);
|
||||||
|
|
||||||
|
var endPos = _player.GlobalPosition;
|
||||||
|
var direction = startPos.DirectionTo(endPos);
|
||||||
|
AssertVector(direction).IsEqualApprox(Vector3.Forward, _vectorTolerance);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase("BaseLocation")]
|
||||||
|
public async Task PlayerJump(string markerName)
|
||||||
|
{
|
||||||
|
var marker = _scene.FindChild(markerName) as Marker3D;
|
||||||
|
AssertObject(marker).IsNotNull();
|
||||||
|
_player.GlobalPosition = marker!.GlobalPosition;
|
||||||
|
await _runner.AwaitIdleFrame();
|
||||||
|
|
||||||
|
var startPos = _player.GlobalPosition;
|
||||||
|
|
||||||
|
_runner.SimulateKeyPress(Key.Space);
|
||||||
|
await _runner.AwaitIdleFrame();
|
||||||
|
|
||||||
|
var jumping = StateChartState.Of(_player.GetNode("StateChart/Root/Movement/Jump"));
|
||||||
|
AssertBool(jumping.Active).IsTrue();
|
||||||
|
|
||||||
|
_runner.SimulateKeyRelease(Key.Space);
|
||||||
|
await _runner.AwaitIdleFrame();
|
||||||
|
var endPos = _player.GlobalPosition;
|
||||||
|
var direction = startPos.DirectionTo(endPos);
|
||||||
|
AssertVector(direction).IsEqualApprox(Vector3.Up, _vectorTolerance);
|
||||||
|
AssertVector(_player.Velocity.Normalized()).IsEqualApprox(Vector3.Up, _vectorTolerance);
|
||||||
|
|
||||||
|
await _runner.AwaitMillis(600);
|
||||||
|
endPos = _player.GlobalPosition;
|
||||||
|
AssertVector(endPos - startPos).IsEqualApprox(Vector3.Zero, _vectorTolerance);
|
||||||
|
|
||||||
|
var grounded = StateChartState.Of(_player.GetNode("StateChart/Root/Movement/Grounded"));
|
||||||
|
AssertBool(grounded.Active).IsTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase("MantleLocation1")]
|
||||||
|
public async Task PlayerMantle(string markerName)
|
||||||
|
{
|
||||||
|
var marker = _scene.FindChild(markerName) as Marker3D;
|
||||||
|
AssertObject(marker).IsNotNull();
|
||||||
|
_player.GlobalPosition = marker!.GlobalPosition;
|
||||||
|
await _runner.AwaitMillis(100);
|
||||||
|
|
||||||
|
var startPos = _player.GlobalPosition;
|
||||||
|
|
||||||
|
_runner.SimulateKeyPress(Key.Space);
|
||||||
|
await _runner.AwaitMillis(100);
|
||||||
|
var mantling = StateChartState.Of(_player.GetNode("StateChart/Root/Movement/Mantling"));
|
||||||
|
AssertBool(mantling.Active).IsTrue();
|
||||||
|
|
||||||
|
_runner.SimulateKeyRelease(Key.Space);
|
||||||
|
await _runner.AwaitMillis(500);
|
||||||
|
|
||||||
|
var endPos = _player.GlobalPosition;
|
||||||
|
AssertFloat((endPos - startPos).Length()).IsGreater(_tolerance);
|
||||||
|
AssertFloat(endPos.Y).IsEqualApprox(1.0f, _tolerance);
|
||||||
|
}
|
||||||
|
}
|
||||||
1
tests/player/movement/PlayerMovementTest.cs.uid
Normal file
1
tests/player/movement/PlayerMovementTest.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://x5pj2ymam2gg
|
||||||
35
tests/player/movement/player_movement_scene.tscn
Normal file
35
tests/player/movement/player_movement_scene.tscn
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
[gd_scene format=3 uid="uid://i8kb38q7bdfk"]
|
||||||
|
|
||||||
|
[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/materials/greybox/m_greybox.tres" id="1_bdfhg"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://scenes/player_controller/PlayerController.tscn" id="1_hg1sy"]
|
||||||
|
|
||||||
|
[node name="PlayerMovementScene" type="Node3D" unique_id=231040688]
|
||||||
|
|
||||||
|
[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=241909240]
|
||||||
|
use_collision = true
|
||||||
|
collision_layer = 256
|
||||||
|
collision_mask = 65553
|
||||||
|
|
||||||
|
[node name="Ground" type="CSGBox3D" parent="CSGCombiner3D" unique_id=432200143]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, -0.5, -3.25)
|
||||||
|
use_collision = true
|
||||||
|
collision_layer = 256
|
||||||
|
collision_mask = 65553
|
||||||
|
size = Vector3(1000, 1, 1000)
|
||||||
|
material = ExtResource("1_bdfhg")
|
||||||
|
|
||||||
|
[node name="Ground2" type="CSGBox3D" parent="CSGCombiner3D" unique_id=854660236]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.75, 0.5, -1.75)
|
||||||
|
use_collision = true
|
||||||
|
collision_layer = 256
|
||||||
|
collision_mask = 65553
|
||||||
|
size = Vector3(1.5, 1, 1.5)
|
||||||
|
material = ExtResource("1_bdfhg")
|
||||||
|
|
||||||
|
[node name="Player" parent="." unique_id=709076448 instance=ExtResource("1_hg1sy")]
|
||||||
|
TutorialDone = true
|
||||||
|
|
||||||
|
[node name="BaseLocation" type="Marker3D" parent="." unique_id=1793710692]
|
||||||
|
|
||||||
|
[node name="MantleLocation1" type="Marker3D" parent="." unique_id=550080845]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.75, 0, 0)
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://xunit.net/schema/current/xunit.runner.schema.json"
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user