diff --git a/Content/ProofOfConcept/DDICharacter_BP.uasset b/Content/ProofOfConcept/DDICharacter_BP.uasset index 526b8e2..6e2c703 100644 Binary files a/Content/ProofOfConcept/DDICharacter_BP.uasset and b/Content/ProofOfConcept/DDICharacter_BP.uasset differ diff --git a/Source/OpenConflict/PlayerCharacter/Components/DDIHealth.cpp b/Source/OpenConflict/PlayerCharacter/Components/DDIHealth.cpp index d928746..b9fa2bd 100644 --- a/Source/OpenConflict/PlayerCharacter/Components/DDIHealth.cpp +++ b/Source/OpenConflict/PlayerCharacter/Components/DDIHealth.cpp @@ -12,8 +12,8 @@ UDDIHealth::UDDIHealth() MaxHealth = 0; CurrentHealth = 0; ClassName = ClassNames::Scout; - HealTickTime = 0.2f; - HealDelayTime = 1.5f; + HealTickTime = 1.f; + HealDelayTime = 2.f; } @@ -70,7 +70,7 @@ void UDDIHealth::Heal() if (CurrentHealth >= MaxHealth) { CurrentHealth = MaxHealth; - HealTimer.Invalidate(); + GetWorld()->GetTimerManager().ClearTimer(HealTimer); return; } @@ -81,8 +81,9 @@ void UDDIHealth::Heal() // Called to cause damage void UDDIHealth::TakeDamage(int DamageValue) { - if (HealTimer.IsValid()) - HealTimer.Invalidate(); + // if (HealTimer.IsValid()) + // HealTimer.Invalidate(); + GetWorld()->GetTimerManager().ClearTimer(HealTimer); CurrentHealth -= DamageValue;