From dac2f1f7081fdeba9437ac28cd333fa59c5c7ab3 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 9 Nov 2023 12:53:33 +0000 Subject: [PATCH] Add Health Bar for Placeholder Information --- .../Content/FirstPerson/Blueprints/RedFillUI.uasset | 3 +++ .../Content/FirstPerson/Blueprints/WBP_Crosshair.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Pine.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Walnut.uasset | 4 ++-- .../Source/EndlessVendetta/EndlessVendettaCharacter.cpp | 6 ++++++ 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/RedFillUI.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/RedFillUI.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/RedFillUI.uasset new file mode 100644 index 00000000..bd06db0b --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/RedFillUI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2b3c6a8f4b81b88ba4ac004383fcc8da39ccf9fe5993da8e2a5c51846aec321 +size 8594 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset index c0e2f9a3..a0727e89 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a73836ba37a3d00b9b90d475bdbcc89abc0c6abb736aea9c7d6423a9afea108 -size 24631 +oid sha256:deaa5ca564990b06d573f4a3bb575a3f2a439d3b7516e30b5b389d5a82f80ad0 +size 61358 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index eafee70c..6719d427 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 -size 31142 +oid sha256:41bfb48c7a239c34eb153525ca3d75153a3ece4f998ce436719ee09cf78517d2 +size 31309 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 2e926194..2ba242c0 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 -size 20495 +oid sha256:7490d679035d0f517908112f047e9db2dd7243b56f40d6957089d95d49c912ba +size 20635 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 773f26bb..1c677f82 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -198,8 +198,14 @@ float AEndlessVendettaCharacter::TakeDamage(const float DamageAmount, FDamageEve if (CurrentHealth <= 0) { CurrentHealth = 0; + if (!GetWorld()->GetTimerManager().IsTimerActive(RegenHealthTimerHandle)) + { + GetWorld()->GetTimerManager().ClearTimer(RegenHealthTimerHandle); + } UE_LOG(LogTemp, Warning, TEXT("Player is dead")); UGameplayStatics::OpenLevel(this, FName(*GetWorld()->GetName()), false); + + return Super::TakeDamage(DamageAmount, DamageEvent, EventInstigator, DamageCauser); } if (!GetWorld()->GetTimerManager().IsTimerActive(RegenHealthTimerHandle)) {