Keeper317/open-conflict
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

https://differentdirection.youtrack.cloud/issue/OC-3/Replication-Projectiles complete #3

Merged
Keeper317 merged 26 commits from projectilebase into main 2026-01-03 06:14:31 +00:00
Conversation 0 Commits 26 Files Changed 348 +6 -5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89de109296 - Show all commits

BIN
Content/ProofOfConcept/DDICharacter_BP.uasset
View File

Binary file not shown.

11
Source/OpenConflict/PlayerCharacter/Components/DDIHealth.cpp
View File

@@ -12,8 +12,8 @@ UDDIHealth::UDDIHealth()
MaxHealth = 0; MaxHealth = 0;
CurrentHealth = 0; CurrentHealth = 0;
ClassName = ClassNames::Scout; ClassName = ClassNames::Scout;
HealTickTime = 0.2f; HealTickTime = 1.f;
HealDelayTime = 1.5f; HealDelayTime = 2.f;
} }
@@ -70,7 +70,7 @@ void UDDIHealth::Heal()
if (CurrentHealth >= MaxHealth) if (CurrentHealth >= MaxHealth)
{ {
CurrentHealth = MaxHealth; CurrentHealth = MaxHealth;
HealTimer.Invalidate(); GetWorld()->GetTimerManager().ClearTimer(HealTimer);
return; return;
} }
@@ -81,8 +81,9 @@ void UDDIHealth::Heal()
// Called to cause damage // Called to cause damage
void UDDIHealth::TakeDamage(int DamageValue) void UDDIHealth::TakeDamage(int DamageValue)
{ {
if (HealTimer.IsValid()) // if (HealTimer.IsValid())
HealTimer.Invalidate(); // HealTimer.Invalidate();
GetWorld()->GetTimerManager().ClearTimer(HealTimer);
CurrentHealth -= DamageValue; CurrentHealth -= DamageValue;