fixed resources constructors
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 24s
Create tag and build when new code gets to main / Export (push) Successful in 15m37s

This commit is contained in:
2026-01-21 10:13:00 +01:00
parent 494f0cb9ca
commit fa029b9e53
12 changed files with 83 additions and 72 deletions

View File

@@ -6,16 +6,12 @@ using Movementtests.systems.damage;
public partial class RDamage : Resource
{
[Export(PropertyHint.Range, "0,10,0.1,or_greater")]
public float DamageDealt = 1.0f;
public float DamageDealt { get; set;}
[Export]
public EDamageTypes DamageType = EDamageTypes.Normal;
public EDamageTypes DamageType { get; set;}
public RDamage()
{
DamageDealt = 1.0f;
DamageType = EDamageTypes.Normal;
}
public RDamage() : this(1.0f, EDamageTypes.Normal) {}
public RDamage(float damageDealt, EDamageTypes damageType)
{
DamageDealt = damageDealt;

View File

@@ -9,15 +9,11 @@ public partial class RDamageModifier : Resource, IDamageable
public event Action<IDamageable, DamageRecord> DamageTaken;
[Export]
public EDamageTypes DamageType = EDamageTypes.Normal;
public EDamageTypes DamageType { get; set;}
[Export]
public float Modifier = 1.0f;
public float Modifier { get; set;}
public RDamageModifier()
{
Modifier = 1.0f;
DamageType = EDamageTypes.Normal;
}
public RDamageModifier() : this(EDamageTypes.Normal, 1.0f) {}
public RDamageModifier(EDamageTypes damageType, float modifier)
{
Modifier = modifier;

View File

@@ -6,13 +6,9 @@ using Movementtests.interfaces;
public partial class RHealth : Resource
{
[Export]
public float StartingHealth = 100.0f;
public RHealth()
{
StartingHealth = 100.0f;
}
public float StartingHealth { get; set;}
public RHealth() : this(100.0f) {}
public RHealth(float startingHealth)
{
StartingHealth = startingHealth;

View File

@@ -6,12 +6,9 @@ using Movementtests.interfaces;
public partial class RKnockback : Resource
{
[Export]
public float Modifier = 1.0f;
public float Modifier { get; set;}
public RKnockback()
{
Modifier = 1.0f;
}
public RKnockback() : this(1.0f) {}
public RKnockback(float modifier)
{
Modifier = modifier;

View File

@@ -14,13 +14,7 @@ public partial class RMovement : Resource
[Export(PropertyHint.Range, "0,20,1,or_greater")]
public float TargetHeight { get; set;}
public RMovement()
{
Speed = 3.0f;
Acceleration = 1.0f;
GravityModifier = 1.0f;
TargetHeight = 10.0f;
}
public RMovement() : this(1.0f, 0.0f, 0.0f, 0.0f) {}
public RMovement(float speed, float acceleration, float gravityModifier, float targetHeight)
{
Speed = speed;